Tweaks to write api
Merge branch 'my'