- refactored decision V2