Debugged & fixed regroup part.