wip/sm-compatibility
