wip/typhoon/patches
