Updated to final schedule, some last minute cleanups
Tick version
Fix Pablo