more owrk on upgrade stuff.