A better doc, again