Changed to table view controller