More work on the diff