added ews2 and cleaned ews1 [merge]