added Z calculation fix