resorted data and minor changes to color mapping