Work on including storage efficiencies