Changes made by Brad Ash (bash@capinfogroup.com).