Melissa Tapper will make her time in Tokyo count - she'll compete at the Olympics and Paralympics.
Tapper was named in Australia's 11-strong Paralympic team for Tokyo over the weekend.
The announcement comes a month after Tapper was added to the six-strong Australian Olympic team.
"I'm struggling to put it into words, it's been such a long process, and I can't believe I will now be a two-time Olympian," Tapper said. "That's a feat I never thought possible."
She and Heming Hu will compete in the mixed doubles and teams events at Tokyo's Metropolitan Gymnasium at the Olympics.
The Paralympics are on from August 24 to September 5
Tapper, who is South-Melbourne based, became the nation's first athlete to compete at both the Olympic and Paralympic Games in the same year at Rio, 2016.
She won gold at the 2018 Gold Coast Commonwealth Games.
The south-west Victorian product became the first Australian to win gold in the table tennis at the Commonwealth Games.
Tapper, who first competed for Australia in 2009, played in the bronze medal match during her Paralympics debut at London in 2012.
It was Australia's best para-table tennis result in 28 years at the Games at that time according to Paralympics Australia.