minor changes after debugging of EOC management