removed dontdiff and my_diff