Added lots of schedule checking