tweaks to resync logic