Adding of windows works again.
Added removing windows.