Put function call back in ViewController.
Merge remote-tracking branch 'origin'