move this up to the z data.