add greyscale, remove increment, maybe fix merge conflict