adding api calls
fixing merging