Making the new floor plan work