Storage part revised