UPDATED factory and related controllers
Merge pull request #47 from josephktcheung/update_factory

UPDATED factory and related controllers