dilution fixed
Merge branch 'round' into testing