fixing driver to work with refactored implementation
excluding pussycat metrics for now whilst I test refactored implementation