updated APIs to work fully now