Over the years, some of the larger spaces in the building were subdivided to make more office space. In the 1940s and 1950s, the city built a mezzanine floor over its side of the 3rd floor, and the county built an annex building on its side of the courtyard. In 1981, a committee plan recommended converting some of the spaces back to their original design and that other spaces be converted to a more open design with offices fronting onto the courtyard instead of the current corridors. The plan also called for the annex building in the courtyard to be demolished, the courtyard domed, and the Father of Waters sculpture moved in there. Many of these aspects of the plan were rejected, although restoration of certain historic spaces has been completed.