A year ago, I bought a wonderful 15GB iPod, and now it's full. Which is fine, except that I still have 40+CDs to import, plus a gig or two still on my old iMac, plus $40 of iTunes credit. All that extra music, plus a baby on the way in May (we'll be taking lots of pictures), and I figure it's time to upgrade. I'm afraid I'll outgrow 30GB, but I can't really afford 60GB. I started poking around online and found some of the discontinued 40GB models for the same price as the 30GB via Apple. So is there any disadvantage to buying the 40GB over the 30GB? Right now, it looks like I get 33% more space, plus all the goodies, for the same price. Were there any major changes (especially battery-wise) that were made in the 30GB that weren't in the 40GB?