diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0cbd312aff..1945250e6c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -931,8 +931,9 @@
     ;; implements non preemptive microthreading, so fixing problems like llSleep or long events handlers
     ;; but those will suffer from timeslicing, so will be slower.
     ;; warning: scripts state is lost on TP or cross to Xengine regions (cars stop, etc)
-	;; ignore its extensions (subset of original XMRengine), those are still undefined.
-    ; Enabled = false
+    ;; ignore its extensions (subset of original XMRengine), those are still undefined.
+    ;# {Enabled} {} {Enable the YEngine scripting engine?} {true false} true
+    ; Enabled = true
 
     ;; llSetTimerEvent minimum value. Default 0.5s, 0.05s whould be more resonable
     ; MinTimerInterval = 0.5
@@ -964,9 +965,9 @@
 
 
 [XEngine]
-    ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true
+    ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} false
     ;; Enable this engine in this OpenSim instance
-    ; Enabled = true
+    ; Enabled = false
 
     ;; How many threads to keep alive even if nothing is happening
     ; MinThreads = 2
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 164a405a52..9b336fa115 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -274,6 +274,8 @@
     ;
     ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
     ; Usually this is only a box
+    ; select ubODEMeshmerizer with and only with ubOde physics engine
+    ; meshing = ubODEMeshmerizer
 
     meshing = Meshmerizer
     ;meshing = ZeroMesher
@@ -300,13 +302,18 @@
     ;physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
+    ; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+    ; physics = ubODE
 
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
 
     ;; Default script engine to use. Currently, we only have XEngine
-    DefaultScriptEngine = "XEngine"
+    ;DefaultScriptEngine = "XEngine"
+    ;; new alternative engine
+    ;; see section [YEngine] below
+    DefaultScriptEngine = "YEngine"
 
     ; Http proxy setting for llHTTPRequest and dynamic texture loading, if
     ; required
@@ -1742,7 +1749,7 @@
     ;; but those will suffer from timeslicing, so will be slower.
     ;; warning: scripts state is lost on TP or cross to Xengine regions (cars stop, etc)
     ;; ignore its extensions (subset of original XMRengine), those are still undefined.
-    ;Enabled = false
+    Enabled = true
     
     ; maximum stack a script can use in KB
     ;ScriptStackSize = 2048
@@ -1798,7 +1805,7 @@
 
 [XEngine]
     ; Enable this engine in this OpenSim instance
-    Enabled = true
+    Enabled = false
 
     ; How many threads to keep alive even if nothing is happening
     MinThreads = 2