initial changes for api callbacks