added icdiff for better diffs