Modified ViewController to make it better