Code refactoring. Solving the problem of multiples conflicts.

// increasing the ability to scale it