Refactored for one Diff object per tab