Restructured Spaces
Fixed bugs from new spaces