Modified HomeworkModel