Updated for table view