Adding back switch checking.