Changed software design to be less cohesive between activities