changes on group and part of questions