Storage optimization

shape