Made Several Changes