Refactor GRP items
Refactor GRP items
Refactor GRP items