Most recent diff: with the mixed setup