Added more questions
Added more questions
Fixed merge issues