Changed the function calls.