Improvements to example