Added support for two messages: on and off