More work on syllabus