added code to Eoc management