issue: 3782717 Fairness

[alexbriskin]

Description

Improve fairness

Change type

What kind of change does this PR introduce?

• [ ] Bugfix
• [X] Feature
• [ ] Code style update
• [X] Refactoring (no functional changes, no api changes)
• [ ] Build related changes
• [ ] CI related changes
• [ ] Documentation content changes
• [ ] Tests
• [ ] Other

Check list

• [ ] Code follows the style de facto guidelines of this project
• [ ] Comments have been inserted in hard to understand places
• [ ] Documentation has been updated (if necessary)
• [ ] Test has been added (if possible)