Change schedule fix
Diagnostic method optimization