added E1 and E2
 fixing conflict