Added some question logic