More work on diff