layout upgrade and storage structure