Changed constructor, added ep and getEP method