removed add cohort +refactoring