I added code for basic and general wndow