almost done with the zd changes