Rewrote Store.java