update to have one less Switchless