Added oneByOneOn and oneByOneOff