handling rideinprogress states better