Changes to schedule and improvements to rules