Added windowswap