Changed the function calls