segregation part 3

Change-Id: Iee7d1450456ae6d788d99e842c775fb712dbd58f