Improved the sync feature