Added a switch type
Moved breakable wall around