made some changes with apis and ko