more improvements for sync