Revamp Revenue & Metrics