updated some method names