updated metric calculations