Further yaml battle