Started redefining variables to match the new question type