moved a few things around in api