Working on fixing XYZ to correct values