Improved Diff, see screenshots