Adjusted storage to be a tad more stable