restructured; Selector compat