switched order of pick-making checks