ON and OFF modified