Modifs by CS, in his forked repo