simplified
tightened Diff coalescing