round 2 of sweeping changes