Changes made by Justin Reich (jreich@hiperos.com).