patches applied to yi / cbits /