api changes and speed up