Updated function calls and variables