Add remaining windows
Add remaining windows