Improved sync process