api changes
tests updated