Rearranging schedule a little