Switched to multiple-choice format