change YAML -big improvement DOM