Final changes made to try to use the last set of cleaned up data.