wip/nsp/patches
