Final commit before changing June 29th schedules