ugh, deal with more data issues