working on storage generation