wip/nsc2ke/patches
