Example api changes
More tweaks
Tweaks