Added a movement mode selection option