Renamed some methods