Re-added switches for arm (disappeared for some reason)