1) Refactored to support question set and question