Changes to questions as per LW's amends