Renamed some of the functions.