Made some changes to the viewController