Re-write the api minus getting any data