Move decision logic to result step