Update for fixed function calling