Revisions to flashback and end of school day