Changed controller to singleton format.