Rewrite to match Breeze mockup