Renamed a couple methods