What are the numbers in your calculation? Don't ever count on the upgrade but their 20k bonus does a lot to pay back the envoy bonus.