incorporate revisions from J