Stonewall diversity scheme