Redid lost changes to api - I think