In this master thesis problems in a small market-driven software development company are discussed. Problems such as fast changes in the company are a result of the constantly changing market. The fast changes must be managed within the company with tailored process covering the needs like short time-to-market. Misunderstandings when managing ideas from marketing and challenging issues such as communication gaps between marketing staff and developers are discussed. These problem areas are identified by the case study through interviews of selected staff. The problems adhere from fast changes and lack of processes and structures. This paper has recommended several points influenced by agile software development with Scrum and XP. The recommendations are chosen to fit the problem areas identified by the interviews. They will work as a starting point for the company to improve the situation and to use XP and Scrum for further improvements.