another restructuring of spaces