Edinburgh have re-signed Steven Lawrie for their front row for the new season and he joins recent signings Sean Cox and Chris Leck at Murrayfield.
The 27-year-old hooker left for Championship side Doncaster Knights in 2009 after four seasons in Edinburgh.
Lawrie's form last season earned him Scotland A appearances against USA Eagles and Italy A.
"I've stayed a fan of Edinburgh while I've been away so it's great to get the chance to come back," he said.
Lawrie will compete with the likes of Ross Ford and Andrew Kelly for a starting place in Michael Bradley's team.
He told Edinburgh Rugby's website: "I'm delighted to be back and really excited about the professional challenge.
"I've spoken to a lot of fans and players about the ambitions of the club and I'm acutely aware of how people what to push the club forward and get the results we all want.
"I left because I needed to play more to develop my game and Doncaster offered me the chance to play regularly in the Championship, which is a seriously competitive league, especially up front, and I believe I'm returning to the club a more rounded and experienced player.
"Edinburgh has some fantastic hookers in Ross Ford and Andrew Kelly, as well as the up-and-coming Alun Walker.
"It's going to be difficult but I'm here to fight for a place and push Edinburgh Rugby forward, through training and when I'm given the opportunity to play, but that begins with earning the respect of my team-mates in pre-season training."
And his new coach Bradley added: "It's great to have Steve on board, and I'm excited about the competition he's going to bring to the hooker berth.
"He's a powerful scrummager, an effective presence in the loose and a player who brings an excellent attitude and work-rate."
Lawrie could make the first appearance of his second stint at his home-town club on 26 August when Edinburgh take on Newcastle falcons in a pre-season friendly.