Added ability to pick a group