Changed flow (no need to distinguish between driver and rider mode at
top level)