Renamed some methods and stuff