fixed api stuff