wip/kup/patches
