add static and adjust storage requirements