v2.6.2 has better id comparison/update