Added up to 24 questions