Optimized groupstage