+some api changes