Get rid of ranges and graph shift