Added questions, eliminate categories