removed cpp part again, fixed data conversion