making fully consistent with new data dict