Perhaps, but I don't see how that changes things... It's still only 1 mode: licensed or not. The only question is where you check it. In the past it was checked in Trade only. Now it's been moved earlier in the code to affect all functions - Trade, Test, etc. (Unless it's been _copied_ into all the other functions?! Yuk!)

To me, whatever simplification this provides isn't really commensurate to the Marketing hit. But, hey, it's your choice!

Thanks.