wip/zinf/patches
