Better sourcing of z