Updated for table view controller