Added swap for 2 and 4 quandrants