Implemented proper metrics