More changes to try to segment data into meaningful groups