Question number is now saved and restored