Fix schedule, redo model