12-11 Changes

Changes Per Ian's Metric Data Fix