trying again with the diff highlighting