wip/ding/patches
