diff --git a/evrisland-loc/evrislandApp/Db/evr-island.template b/evrisland-loc/evrislandApp/Db/evr-island.template
index 4cbe1b44793ff48a93e1e19bb11baa6f1d129572..3301b4188da34beb2af1a361fc87f944d83ae6a0 100644
--- a/evrisland-loc/evrislandApp/Db/evr-island.template
+++ b/evrisland-loc/evrislandApp/Db/evr-island.template
@@ -74,9 +74,11 @@ record(ao, "$(P)$(R=)RFSyncWdt-SP") {
 
 record(ao, "$(P)$(R=)BeamPulseDly-SP") {
     field(DESC, "Beam Pulse Delay")
-    field(VAL,  "300")
+    field(VAL,  "0.5")
     field(EGU, "us")
     field(DISP, "1") # Locked for this IOC version
+    field(PINI, "YES")
+    field(PREC, "3")
     info(autosaveFields_pass0, "VAL")
 }
 
@@ -85,26 +87,19 @@ record(ao, "$(P)$(R=)BeamPulseWdt-SP") {
     field(DESC, "Beam Pulse Width")
     field(VAL,  "2700")
     field(EGU, "us")
+    field(PREC, "3")
     info(autosaveFields_pass0, "VAL")
 }
 
-## Set Beam Delay and Width
+## Set Beam  Width
 
-# If rf pulse > beam pulse, set beam delay to 0.1
-record(calcout, "$(P)$(R=)#SetBeamDelay"){
-    field(INPA, "$(P)$(R=)RFSyncWdt-SP CP")
-    field(INPB, "$(P)$(R=)BeamPulseWdt-SP")
-    field(CALC, "A-B>1?A-B:0.1")
-    field(OUT, "$(P)$(R=)BeamPulseDly-SP PP")
-    field(FLNK, "$(P)$(R=)#SetBeamWidth")
-}
-
-# Always set beam width as rf pulse - beam delay - 0.5
-# So the beam end is always behind pulse end
+# Always set beam width as 90% of the Rf len - Beam Pulse Dly
+# The Beam Pulse Wdt never can fall out at the same moment as
+# RF End
 record(calcout, "$(P)$(R=)#SetBeamWidth"){
-    field(INPA, "$(P)$(R=)BeamPulseDly-SP")
-    field(INPB, "$(P)$(R=)RFSyncWdt-SP")
-    field(CALC, "(B-A)-0.5")
+    field(INPA, "$(P)$(R=)RFSyncWdt-SP CP")
+    field(INPB, "$(P)$(R=)BeamPulseDly-SP PP")
+    field(CALC, "(A-B)*0.9")
     field(OUT, "$(P)$(R=)BeamPulseWdt-SP PP")
 
 }