wip/noor/patches
