Second pass on selector