Switch fixes in CAH Game