Added comment and group check