change some snapshot and storage logic