.. and this time with the diff included