wip/hs-Lucu/patches
