small mods in yoneda, make one construction transparent there