Added some more window funcs