Continuing work on mod_diff