minor fix 6
add toggle ( on / off ) and minor fix