US632 - Change to use new questions