Better YODA