adding in changes to makeData