diverse styles
Merge branch 'chris2'