added stay in school condition