Improvements to Example