Enhanced Storage step #2