Replace Diff engine again, this time with my own