Changes needed for scheduling