New metrics, reorganized