updated with the current api calls