patches applied to yi / TODO