Changing some stuff to adjust for the new dataset and its quirks.