changed enums to be put in _E