Added Dual Control and a lot of other changes