Added bunch of stuff for lecturers