Added second type of question!