Add group functionality added
resolved merge conflicts