wip/kyra2/patches
