I bought a 3G on launch date with 2 year contract, so I have 1 year down and 1 to go. If I buy a 3GS tomorrow for their "early upgrade price", will that 2 year contract add to my remaining 1 year? Or will my current contract terminate and start a new 2 year contract? I don't want to be stuck with AT&T for 3 years.