The department of computer science offers an appreciated course on software development in teams (EDAF45) that for scheduling reasons currently can’t be offered beyond the D programme. To address this issue, the department is developing a new course on agile software development (EDAG05) that can be offered to non-D engineering students. In this report, we gather data about EDAF45 and identify issues that we would like to address in the new course. The result of this review is a proposed format for EDAG05 where we try to address the identified issues.