Changing the api around