Modified code & XML