More tweaking of examples 1 and 2