Added an option to not handle questions