commit from netscape #2