converted an aweful example in a bad example
Merge branch 'monards'