As a prime example of the First Bay Region Tradition, the Naval Architecture Building is a designated Berkeley city landmark and listed in the National Register of Historic Places. Originally used as an annex to the architecture building, its drawing studios were substantially infilled and altered in the century following its construction. The University of California received a gift to rehabilitate the 11,000 square foot historic building and construct a 13,000 square foot addition. Knapp Architects consulted on the compatibility of the new addition to incorporate a kit of parts remembering the characteristics of the historic structure. The resulting design incorporated the ideas of over a dozen committees, integrating new technologies while preserving character-defining features to achieve LEED Silver. Knapp Architects prepared as-built drawings for team use and construction documents for exterior and interior rehabilitation. Exterior restoration included restoration of cedar shingles, roofing, and historic windows. We collaborated with Simpson Gumpertz & Hager on waterproofing of the walls and roof. The historic stair hall was revived to reflect its original character by removing visually incompatible retrofitted walls and infrastructure, rehabilitating exposed wood framing and wood stair, replacing battleship linoleum in-kind, and providing new lighting compatible with its character. The studio/office spaces integrated new private offices while retaining volumes of original open studio space.