adding some more windows and buffers