More changes to the data package; not yet done.