the api is now MUCH more stable
merging