Some more to metric computation (need to tweak rsmaa before continuing)