wip/stfl/patches
