changing up the data mapper