fixed apis, so people wont shout at me!