Several Changes Made