WIP : handing group matrix update edge cases