change selector instantiation to be less greedy