// diff engine seems close to ok