Rebuilt with the new incremental work on storage.