changes to the api to be more user-centric