update ride store with major refactoring of logic