Server-side:  new diff logic