added x y and z
Merge branch 'auth'
finalized z code