pulling in changes to make site sync more robust