diff --git a/Assets/Editor/Editor.SHConfig b/Assets/Editor/Editor.SHConfig
index c56772c9..09efea23 100644
--- a/Assets/Editor/Editor.SHConfig
+++ b/Assets/Editor/Editor.SHConfig
@@ -1,4 +1,4 @@
 Start Maximized: true
-Working Scene ID: 97402985
+Working Scene ID: 84373000
 Window Size: {x: 1920, y: 1013}
 Style: 0
\ No newline at end of file
diff --git a/Assets/Scenes/x.shade b/Assets/Scenes/x.shade
index ae4767bc..7a59d350 100644
--- a/Assets/Scenes/x.shade
+++ b/Assets/Scenes/x.shade
@@ -1,4 +1,4 @@
-- EID: 65536
+- EID: 0
   Name: Default
   IsActive: true
   NumberOfChildren: 0
@@ -12,9 +12,9 @@
       Type: Dynamic
       Drag: 0.00999999978
       Angular Drag: 0.100000001
-      Use Gravity: false
+      Use Gravity: true
       Interpolate: true
-      Sleeping Enabled: true
+      Sleeping Enabled: false
       Freeze Position X: false
       Freeze Position Y: false
       Freeze Position Z: false
diff --git a/Assets/Scenes/x.shade.shmeta b/Assets/Scenes/x.shade.shmeta
index 2e00ee43..06a5e721 100644
--- a/Assets/Scenes/x.shade.shmeta
+++ b/Assets/Scenes/x.shade.shmeta
@@ -1,3 +1,3 @@
 Name: x
-ID: 91446183
+ID: 84373000
 Type: 5
diff --git a/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.cpp b/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.cpp
index 9fc403f8..8aec29b1 100644
--- a/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.cpp
+++ b/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.cpp
@@ -216,7 +216,6 @@ namespace SHADE
     {
       .entityID     = rigidBody->GetEID()
     , .bodyType     = rigidBody->type
-    , .flags        = rigidBody->flags
     , .interpolate  = rigidBody->interpolate
     , .drag         = rigidBody->drag
     , .angularDrag  = rigidBody->angularDrag
@@ -309,14 +308,14 @@ namespace SHADE
       
 
       // Re-set properties
-      rigidBodyComponent->SetGravityEnabled   (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::GRAVITY));
-      rigidBodyComponent->SetIsAllowedToSleep (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::SLEEPING));
-      rigidBodyComponent->SetFreezePositionX  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::LINEAR_X));
-      rigidBodyComponent->SetFreezePositionY  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::LINEAR_Y));
-      rigidBodyComponent->SetFreezePositionZ  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::LINEAR_Z));
-      rigidBodyComponent->SetFreezeRotationX  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::ANGULAR_X));
-      rigidBodyComponent->SetFreezeRotationY  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::ANGULAR_Y));
-      rigidBodyComponent->SetFreezeRotationZ  (DEF.flags & SHUtilities::ConvertEnum(SHRigidBodyComponent::Flags::ANGULAR_Z));
+      rigidBodyComponent->SetGravityEnabled   (rigidBodyComponent->IsGravityEnabled());
+      rigidBodyComponent->SetIsAllowedToSleep (rigidBodyComponent->IsAllowedToSleep());
+      rigidBodyComponent->SetFreezePositionX  (rigidBodyComponent->GetFreezePositionX());
+      rigidBodyComponent->SetFreezePositionY  (rigidBodyComponent->GetFreezePositionY());
+      rigidBodyComponent->SetFreezePositionZ  (rigidBodyComponent->GetFreezePositionZ());
+      rigidBodyComponent->SetFreezeRotationX  (rigidBodyComponent->GetFreezeRotationX());
+      rigidBodyComponent->SetFreezeRotationY  (rigidBodyComponent->GetFreezeRotationY());
+      rigidBodyComponent->SetFreezeRotationZ  (rigidBodyComponent->GetFreezeRotationZ());
 
       rigidBodyComponent->SetInterpolate      (DEF.interpolate);
       rigidBodyComponent->SetDrag             (DEF.drag);
diff --git a/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.h b/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.h
index 3c333ff9..10c8dcfa 100644
--- a/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.h
+++ b/SHADE_Engine/src/Physics/Interface/PhysicsObject/SHPhysicsObjectManager.h
@@ -47,7 +47,6 @@ namespace SHADE
     {
       EntityID                    entityID    = MAX_EID;
       SHRigidBodyComponent::Type  bodyType    = SHRigidBodyComponent::Type::STATIC;
-      uint8_t                     flags       = 0;   // aZ aY aX lZ lY lX sleepEnabled gravity
       bool                        interpolate = true;
       float                       drag        = 0.0f;
       float                       angularDrag = 0.0f;
diff --git a/SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.h b/SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.h
index 5fe49dbe..a75256b8 100644
--- a/SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.h
+++ b/SHADE_Engine/src/Physics/Interface/SHRigidBodyComponent.h
@@ -152,14 +152,14 @@ namespace SHADE
 
     enum class Flags : uint8_t
     {
-      GRAVITY     = 0x0
-    , SLEEPING    = 0x1
-    , LINEAR_X    = 0x2
-    , LINEAR_Y    = 0x4
-    , LINEAR_Z    = 0x8
-    , ANGULAR_X   = 0x10
-    , ANGULAR_Y   = 0x20
-    , ANGULAR_Z   = 0x30
+      GRAVITY     = 0x1
+    , SLEEPING    = 0x2
+    , LINEAR_X    = 0x4
+    , LINEAR_Y    = 0x8
+    , LINEAR_Z    = 0x10
+    , ANGULAR_X   = 0x20
+    , ANGULAR_Y   = 0x30
+    , ANGULAR_Z   = 0x40
     };
 
     /*---------------------------------------------------------------------------------*/