Try again to make YAML better