Added last question methods and refactor most of the code