uncommented changes, jwz