merged from yassine's group discussion code