fixing up get data