Restructured to make more sense without partials