changed some method names