Change to ast.xml after feedback