Actually The New Tree

The top is the old tree that y'all know, the bottom is the new one proposed by Baron et al. (2017), and the middle is what SAND (Sauropods Are Not Dinosaurs) people want. Either of the bottom ones are fine, as at least the dinosaurs are in the right spot, and the bottom makes more sense to avoid confusion, but I like the middle because it keeps the original (kinda) definitions.