wip/smc/patches
