Pin selector now more specific