changed fetch and store
merge rw changes