Question tool changes

Question tool changes