Changed code to use storeParameters rather than store
More improvements
More improvements