EG: renamed few methods