We provide a framework of improvement for the course FMAF35 Linear and Combinatorial Optimization, which is an elective course in the F/Pi programme at LTH. This should make the course more agile and adapted to current students’ needs. Our concrete suggestions are grounded in pedagogical research findings, which we summarize prior to its implementation. This report includes two pos- sible directions, which can be consequently discussed by the programme leader and the teachers.