Fixed demo.xml file and numeration