tweaked diff stuff