Tree Identification

Are the needles clustered in groups of 5 and the cones long with thin scales?

- OR -

Are the needles clustered in groups of 2 or 3, and the cone scales thick and often tipped with spines?