Peripheral estate land was gradually feued to buyers. In 1920, when Edinburgh absorbed the formerly independent Leith, the remaining ground was part of the agreed "settlement" to be given to Leith as a public park. However, this did not fully materialise until the death of the remaining spinster sisters who lived in the house. It was eventually taken over by the local authority just before World War II, after which the house served variously as a fireman's hostel and hostel for homeless women until it became disused in 1970. Following two devastating fires it was virtually razed to the ground, but, with the help of grant aid, was meticulously rebuilt in 1984. Various 19th-century additions were removed to return its exterior to its original form of 1710. At this stage (no original interior remaining) it was divided into 6 flats, and new houses were built between it and Bonnington Road. At roughly the same time a huge railway embankment, which used to enclose the park on its west and north sides, was flattened.