wip/qrq/patches
