more work on storage situation