Made some small changes to work with the new datasets