merged massratio and final from bigMerge branch