renamed method names again, must be unique apparently