Make it all one diff