Updated for ControlFactory
Merge pull request #1216 from seanpaultaylor/next

Updated for ControlFactory