Metrics and slight optimization