Retab
Optimized groupstage
Merge pull request #1 from denya/optimization-retab

retab + optimization