More changes to try to get segmentation going