Charlton Athletic goalkeeper Nick Pope has agreed a new contract which will keep him at the club until 2018.
Pope enjoyed an impressive second half of the 2013/14 campaign on loan at York as his performances helped transform the Minstermen from a team in relegation trouble to one which finished in the Sky Bet League Two play-off places.
During his stay at Bootham Crescent, t he 22-year-old kept 14 clean sheet in 20 matches.
"I'm delighted that the club thinks I'm part of their long-term plan and I think it's the right place for me to develop my career and my game," Pope told Charlton's official club website. "So I'm really happy to have agreed the extension.
"I think when a player goes on loan you're looking to prove yourself to your parent club and, for me, that was for this coming season. I went to York to get games and hopefully put myself in the club's mind for 2014/15."
With Ben Hamer set to join Barclays Premier League newcomers Leicester when his Addicks contract expires later this month, and Yohann Thuram-Ulien having returned to Standard Liège following his loan spell, Pope is currently the most senior goalkeeper on Charlton's books.
Looking ahead to next season, he said: "Things change in football and you have to go with it, but I think I did all I could at York.
"I didn't leave anything there. I gave my all and did my best so I'll work hard at Charlton and see what happens.
"I think this is the right place to develop and, with the right coaches around me, hopefully I can do that. This is where I want to play my football."