added question and choice in model