add bomb switch check