changes Pertino requested