Almost perfect diff - #6