Changed the names of the functions