swapped choices to avoid '-' as logic name