logics refactoring
logics refactoring
logics refactoring