Some changes to the questions