combining ratio into single field
merging master
Merge branch 'conversion' into testing