Dick Hollenbeck <dick@softplc.com> part deux of previous changes just committed.