More responsive changes (round 2)