Britain's James Gibson intends to extend his career so he can bow out at the 2012 Olympics in London. Gibson, will be defending his 50m breaststroke crown at the World Championships which begin in Montreal on Sunday, 17 July.
He will be 32 in 2012 but will compete if the 50m events are added to the Olympic swimming programme.
"There is talk of the 50s being put in by 2012 - if that is the case, I will definitely be swimming," he said.
"That would be a fantastic way for me to finish off my career - in front of a home crowd.
"It changed a few things when I heard the announcement - after shouting and screaming I thought maybe I will carry on for four extra years."
Gibson finished a disappointing sixth in the Olympic 100m final in Athens last year.
"I've had a bit of a rough year, but things have just started to come together," he said.
"I've changed a few little things to the programme and in the last three weeks I've done some fantastic training.
"I feel in myself a lot better but I am a realist. I know it's going to be very difficult to go out there and defend my title in Montreal.
"But I am a good racer and I raise my game for the big ones so I'll just go out there and give it my all."