working on the storage