Added choice selection