Updated for gradient, event range, working on cohort range