I am due to get an upgrade in August, after the new iPhone 4 comes out. I am wondering how will this effect my upgrade? I plan on getting an iPhone and I might as well get the new one but I was wondering how much it will be with my upgrade discount and all that? Thanks.