Rewrapping instead of state changing