some changes in staticStorage