Fiddling with diffing again