added group selection and tagging