added data values and ability to get all names