Refactor logic one more time
Refactor
Change distribution model