added option to group tokens