Finally fixed the oneByOneOn and Off code