Trial to upgrade

I searched the forums and couldn't find the answer.
I have a $2.95 two day trial with CCBill. Members are limited to 5 downloads. After the 2 days, they are billed $24.95 (unless they've canceled)
Questions:
1) How do I make it so after they are billed the $24.95 after the trial, they are upgraded so they are no longer limited to 5 downloads?
2) How do I make it so if they join and decide to upgrade before the 2 day rebill, they don't get double billed when their 2 day trial is up (upgrade cancels the trial billing).
Thank you!
I have a $2.95 two day trial with CCBill. Members are limited to 5 downloads. After the 2 days, they are billed $24.95 (unless they've canceled)
Questions:
1) How do I make it so after they are billed the $24.95 after the trial, they are upgraded so they are no longer limited to 5 downloads?
2) How do I make it so if they join and decide to upgrade before the 2 day rebill, they don't get double billed when their 2 day trial is up (upgrade cancels the trial billing).
Thank you!