Part z
Fixed bugs