Swindon Town have completed the signing of midfielder Jonathan Smith from York City for £30,000.
The 24-year-old has signed a two-year contract at the County Ground.
Smith joined the Minstermen in July 2010 after a three-year spell at Forest Green Rovers and played 43 games last season, scoring four goals.
Meanwhile, fellow midfielder Michael Timlin has agreed a new deal with the Robins, the details of which have not yet been disclosed.
The 28-year-old first joined Swindon on loan from Fulham in 2006.
He signed a permanent contract two years later after two further loan spells and has since made 100 appearances for the club.