Scheduler cleaned up and added catch_it