Updated function calls for consistency.