Switched up the API