Improved on examples, etc