diff --git a/channels.py b/channels.py
index 9d7b2c8..59eadbc 100644
--- a/channels.py
+++ b/channels.py
@@ -6,7 +6,7 @@
 
 # TODO: JF settings regarding raw conversion, compression, etc.
 detectors = [
-    # "JF16T03V01",
+     #"JF16T03V01",
 ]
 
 ####################
@@ -21,7 +21,7 @@ channels_gas_monitor = [
 ######################
 ### PCO edge camera for the wavefront analysis
 channels_PCO = [
-    "SARES30-CAMS156-PCO1:FPICTURE",
+    #"SARES30-CAMS156-PCO1:FPICTURE",
 ]
 
 ######################
@@ -129,6 +129,8 @@ channel_PBPS149 = [
     "SAROP31-PBPS149:YPOS",
 ]
 
+channels_EVR = ['SAR-CVME-TIFALL6:EvtSet',                 # Cristallina event reciever
+]
 
 further_channels = [
     ####################
@@ -151,14 +153,15 @@ further_channels = [
 
 channels = (
     channels_gas_monitor
-    + channels_PCO
-    + channels_OAV
+#    + channels_PCO
+#    + channels_OAV
     + channels_PBPS053
     + channels_pss059
-    + channels_PPRM113
+#    + channels_PPRM113
     + channels_PPRM150
-    + channel_PBPS149
-    + channel_PBPS149
+    + channels_PBPS113
+    + channels_EVR
+#    + channel_PBPS149
     + further_channels
 )
 
@@ -190,12 +193,14 @@ pv_channels = [
     "SARFE10-OATT053:TRANS_RB",
     ####################
     ## OATA150
-    "SAROP31-OATA150:MOTOR_1",
-    "SAROP31-OATA150:MOTOR_2",
-    "SAROP31-OATA150:MOTOR_3",
-    "SAROP31-OATA150:MOTOR_4",
-    "SAROP31-OATA150:MOTOR_5",
-    "SAROP31-OATA150:MOTOR_6",
+    "SAROP31-OATA150:MOTOR_1.RBV",
+    "SAROP31-OATA150:MOTOR_2.RBV",
+    "SAROP31-OATA150:MOTOR_3.RBV",
+    "SAROP31-OATA150:MOTOR_4.RBV",
+    "SAROP31-OATA150:MOTOR_5.RBV",
+    "SAROP31-OATA150:MOTOR_6.RBV",
+    "SAROP31-OATA150:TRANS_SP",
+    "SAROP31-OATA150:TRANS_RB",
     ####################
     ## PSSS
     "SARFE10-PSSS059:MOTOR_Y3.VAL",
@@ -256,4 +261,4 @@ smaract_channels = [
     "SARES30-XSMA156:Rz:MOTRBV",
 ]
 
-pvs = pvs_slits + pv_channels + smaract_channels
+pvs = pvs_slits + pv_channels # + smaract_channels