control to switch on/off old and new models for standard metrics

formatting