working on new metrics controls