patched again
checked out orig third time (editor seems to modify some lines)