Question handling now works