added spa setting/detection layer