Updating the full sync logic