Better YAMINABE