added more commented out code in ESManager