Added classrooms and not 100% subjects