Made changes to cover question without choices.