Last changes, group naming done