Input revised, began & refactored new  metrics