More work on storage.sav