Add adjustments from Joyride master branch