more function call changes