New YAML fixing all requirements