adding btw grouping to fix space issues in production