Update some of the function calls