Adjusted function calls