WIP Improve diffs

Change-Id: I8549e3e7054e80531c8baa0ee3894cf2e2384dd8