-M5.18.0 move to switches