Some changes in ViewController