added diff stuff