I believe if you check with Revenue Canada or your bank the amount in your TFSA now can be 20k with another amount of 5k after Jan 1 2012.
Therefore 25 k in total after Jan 1 2012 contribution. IMO.
Hope I am right.
Great place for SLI shares.
Cheers.