Fixed !? and added x, y, z