Added Wall Switch Controller