Changes to a few of the questions