slight changes to the way sync windows is handled