q6 added; modified *.xml for testing