Added ViewController changes