Reorganized spaces for shapeless 1 and 2