Added choices where appropriate.