working on new service mode tweaks to switch test