Dimension rewrite #3, smarter this way