first draft of sensordata improvement