Added rank-based values in addition to linear values.