added joyride
solved merge conflict