Updated to final schedule