Added the questions and made changes on that