Changes made by David A. Bermeo (dbermeo@iconoi.com).