Added ON/OFF switch