Changed question generator mechanism