Updated to support new questions