Issue #3197 Improvements according to the diagram

[SirLouen]

In the #3197 I've placed a diagram to explain the improvements in this conditionals according to the docs logic

[stale[bot]]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

[connortechnology]

The code has changed so much, this PR is no longer needed and could never apply.