Addition of new questions and improving functionality