inline diff seems better