made store collection routine in SM, and updated everything to suit