changes suggested by jterrace