Added separation and rotation of citizens