Testing stuff
Finalized z fix