fixup! Split Compare() and Update()