fixed store, need to change to OO