completed logic and added more questions