Changes made by Carl Richard (carlr@precicom.com).