Changes to mapping algorithm and collection of data files.