some changes to the way pins are selected