wip/fribid/patches
