readded Bryns changes
Merge branch 'claytonContribution'