changes to api, not working yet