correct folding and change tracking.