added ability to map from tableView