Simplified based on design team feedback