Added dirswitch and adder.