final adjustments for D and Z functions
Merge commit