more unwinding of diffs