make groups less hacky