Changed syncing
Improved syncing