working on storage