Improved sync between windows