Edinburgh World Heritage has moved to new offices at Acheson House, at the heart of the Old Town.
The move marks a new era for EWH and for Acheson House, which is also to become part of a new museum hub.
Built in 1633 for Sir Archibald Acheson, Secretary of State for King Charles I, the building has lain empty since 1991 when it was last used by the Scottish Crafts Centre. As a result Acheson House has been on the Buildings at Risk register since 2000.
The interior has now been repaired and fitted out with necessary services, with funding from Historic Scotland of £120,000 towards the project through EWH. This has included new floors and plasterwork to walls and ceilings.
Adam Wilkinson, director of Edinburgh World Heritage, said: “We are very excited to be establishing our new base in one of the most significant historic buildings in the Old Town.”