32GB in 2010 VS 20GB in 1980

A 20GB (eight 2.5GB) storage in year 1980 is 648000% to 758400% more expensive and 440000000% more heavy than a 32GB storage in year 2010. Fast forward 30 years and I suppose the comparison would instead be 20TB in 2010 vs 32TB in 2040?