changed all variables to choice list names