185 fixed switch order. New echo for toggle