Update to v6.04; move var to top as it gets changed regularely.