Updating to not use METRICS dictionary and to match ref_v, ref_c, est_v, est_c call/return order