Rodrigo's XML changes