new logic in historical syncing