wip/girara/patches
