wip/dpic/patches
