changed to EClass