Tree Identification

Are the needles mainly clustered in groups of 2-4, the cone scales thick and often prickly?

- OR -

Are the needles mainly clustered in groups of 5, the cone scales usually without prickles?