Improved syncing