storage fix

Storage changes