update to use groups