Changed QuestionGroup to Group, + bug fix!!