merged master
storage check
saving