Sync logic changes