Lets discuss this in a separate issue. I want to get the upgrades finished.