some more
added diff handlers