adapt sm and smcw models to commit dae63c3