Added some more windows