Added 'wedges' for better grouping and control