Updated function calls