updated z in master branch
commit from gt2-master
updated z from gt3:master
updated z from gt2:master