Addition with some regrouping

Addition with some regrouping
Active — user can report