I think that's extremely conservative, even if you don't consider the gigafactory. He said years ago that the rate of improvement in density would be 6-8% per year, but clearly it's been much better than that - more like a 20% increase in density or a 15% drop in price per year, for the past 8 years.