Edinburgh have announced that lock Fraser McKenzie has signed a new deal which will see him remain at the PRO12 club until May 2019.
McKenzie joins twenty players who have already committed their futures to the club for the new season.
Reflecting on his decision to remain in the black and red for another three years McKenzie said: "Solly [Alan Solomons] the coaches and Jonny have shown faith in me and I'm delighted to be staying.”
The Dunfermline-born Scotland A cap, who turned 28 earlier this week, started his professional career at the capital club in 2008 on graduating from Scottish Rugby's national academy.
Moving from Edinburgh to Sale Sharks in 2011, McKenzie then joined Newcastle Falcons, making a total of 41 Premiership appearances before earning a move home.
"When I left the first time, things at the club were a bit unsettled but since then Solly's stabilised the ship, has good coaches around him, I'm happy being back here and it's great to see Edinburgh heading in the right direction," he added.
"We have a really good close-knit bunch of guys here. You class them all as friends. That's one of the real strengths of this club and another reason I wanted to stay.
"I still class myself a relatively young player with plenty of opportunity for progression and I want to kick on from here.”
Turning out for Dunfermline's 1st XV from the age of 16, the former Queen Anne High School pupil led his country at U19 level in the 2007 World Championships – having already represented Scotland at U20 where he made a try-scoring debut against Wales in February that year.
The lock, who can also play on the blindside, made his Scotland Sevens debut in November 2008, represented Scotland A in 2010 and 2011, and was included in the extended Scotland squad for the 2012 RBS 6 Nations.
Edinburgh head coach Alan Solomons said: "It is great to see Fraz make a long term commitment to the club.
"Since coming back from Newcastle he has become an integral part of the team and has made a huge contribution to its development.
"He is a real team man and a pleasure to coach. I look forward to continuing working with him.”