Set operates with ON / OFF now

Set operates with ON / OFF now