Complete overhaul of the entire space