restructure new cohort logic