Improved sync