Refactored how syncs work