Added stacking with group