trying to make compatible with new data dict