Upgrade whidbey, less haxing