Added torch switches(again)