Some work on upgrade and questiontype