refactored to question partial