diff --git a/rheometerApp/Db/read_data.db b/rheometerApp/Db/read_data.db
index c052cea0378d85d79f3fe2347632b60dfed1dbdd..df63ab054b50ac52d09094eb62dab28ee15c5c63 100644
--- a/rheometerApp/Db/read_data.db
+++ b/rheometerApp/Db/read_data.db
@@ -40,25 +40,26 @@ record(aSub, "$(P)$(R)#split_waveform") {
 	field(NOB, "20")
 	field(INPC, "$(P)$(R)MeasInterval-R")
 	field(FTC, "LONG")
-	field(OUTA, "$(P)$(R)Temp-R")
+	field(OUTA, "$(P)$(R)Temp-R PP")
 	field(NOVA, "1")
 	field(FTVA, "FLOAT")
-	field(OUTB, "$(P)$(R)Torque-R")
+	field(OUTB, "$(P)$(R)Torque-R PP")
 	field(FTVB, "FLOAT")
 	field(NOVB, "1")
-	field(OUTC, "$(P)$(R)RotSpeed-R")
+	field(OUTC, "$(P)$(R)RotSpeed-R PP")
 	field(FTVC, "FLOAT")
 	field(NOVC, "1")
-	field(OUTD, "$(P)$(R)PhaseAng-R")
+	field(OUTD, "$(P)$(R)PhaseAng-R PP")
 	field(FTVD, "FLOAT")
 	field(NOVD, "1")
-	field(OUTE, "$(P)$(R)Strain1-R")
+	field(OUTE, "$(P)$(R)Strain1-R PP")
 	field(FTVE, "FLOAT")
 	field(NOVE, "1")
 	field(OUTF, "$(P)$(R)MeasState.SELN")
 	field(FTVF, "USHORT")
 	field(NOVF, "1")
 	field(FLNK, "$(P)$(R)MeasState.PROC")
+	field(EFLG, "ALWAYS")
 }
 
 record(fanout, "$(P)$(R)MeasState") {
@@ -84,36 +85,35 @@ record(ai, "$(P)$(R)PhaseAng-R") {
 	field(DESC, "Phase angle")
 	field(EGU,  "rad")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
 
 record(ai, "$(P)$(R)Strain1-R") {
 	field(DESC, "Strain") 
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
-	field(FLNK, "$(P)$(R)ShearStrain-RB.PROC")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
+	
 }
 
 record(ai, "$(P)$(R)Temp-R"){
 	field(DESC, "Temperature in control system")
 	field(EGU,  "K")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIMEE NPP")
 }
 
 record(ai, "$(P)$(R)Torque-R"){
 	field(DESC, "Torque")
 	field(EGU,  "Nm")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
 
 record(ai, "$(P)$(R)RotSpeed-R"){
 	field(DESC, "Rotational speed")
 	field(EGU,  "Hz")
-	field(FLNK, "$(P)$(R)ShearRate-RB.PROC")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
 
 # --------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ record(calc, "$(P)$(R)ShearStress") {
 	field(CALC, "A*B")
 	field(EGU,  "Pa")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
 
 record(calc, "$(P)$(R)ShearRate") {
@@ -151,9 +151,9 @@ record(calc, "$(P)$(R)ShearRate") {
 	field(INPA, "$(P)$(R)RotSpeed-R.VAL NPP")
 	field(INPB, "$(P)$(R)CSRfactor.VAL NPP")
 	field(CALC, "A*B")
-	field(EGU,  "Hz")
+	field(EGU,  "1/s")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
 
 record(calc, "$(P)$(R)ShearStrain") {
@@ -171,7 +171,7 @@ record(calc, "$(P)$(R)Viscosity") {
 	field(CALC, "A/B")
 	field(EGU,  "Pa*s")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP") 
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP") 
 }
 
 record(calc, "$(P)$(R)TotModulus") {
@@ -181,5 +181,5 @@ record(calc, "$(P)$(R)TotModulus") {
 	field(CALC, "A/B")
 	field(EGU,  "?")
 	field(TSE,  "-2")
-	field(TSEL, "$(P)$(R)MeasNumb-R.TIME NPP")
+	field(TSEL, "$(P)$(R)#meas_data.TIME NPP")
 }
\ No newline at end of file
diff --git a/rheometerApp/Db/rheo_comm.proto b/rheometerApp/Db/rheo_comm.proto
index db6a8b8c86efc48afc200e0733a9836ecee2e996..4e7dbd8a3b441fe463bf6eef06de6973de1f4014 100644
--- a/rheometerApp/Db/rheo_comm.proto
+++ b/rheometerApp/Db/rheo_comm.proto
@@ -1,6 +1,6 @@
-Terminator = SUB;
+# Terminator = SUB;
 # ReplyTimeout = 2000;
-# TERMINATOR = LF;
+TERMINATOR = LF;
 
 initRheo {
 
@@ -119,8 +119,8 @@ Kconfig_amp_sweep {
 
 getWaveform {
 	Separator = ',';
-	InTerminator = ")]",SUB;
-	# InTerminator = ")]",LF;
+	# InTerminator = ")]",SUB;
+	InTerminator = ")]",LF;
 	in ":MEAS[%d,%(\$1)i,%*f,%*f,%*i,(),(%(\$2)[^,]";
 	
 }