added x y z
Merge branch 'a
finalized z code