more changes to make yaml work