Sync is taking connectivity into acount. Closes #157
Sync takes connectivity into account. Closes #157