diff --git a/lua/acf/core/classes/entities/registration.lua b/lua/acf/core/classes/entities/registration.lua
index 9d730e06..c2a2d966 100644
--- a/lua/acf/core/classes/entities/registration.lua
+++ b/lua/acf/core/classes/entities/registration.lua
@@ -169,7 +169,7 @@ function Entities.AutoRegister(ENT)
 		ACF.RestoreEntity(self)
 
 		hook.Run("ACF_OnEntityUpdate", Class, self, ClientData)
-
+		if self.UpdateOverlay then self:UpdateOverlay(true) end
 		net.Start("ACF_UpdateEntity")
 		net.WriteEntity(self)
 		net.Broadcast()
@@ -214,7 +214,7 @@ function Entities.AutoRegister(ENT)
 		end
 
 		New:ACF_UpdateEntityData(ClientData)
-
+		if New.UpdateOverlay then New:UpdateOverlay(true) end
 		ACF.CheckLegal(New)
 
 		return New
diff --git a/lua/acf/menu/items_cl/baseplates.lua b/lua/acf/menu/items_cl/baseplates.lua
index 2f2492e6..192eea74 100644
--- a/lua/acf/menu/items_cl/baseplates.lua
+++ b/lua/acf/menu/items_cl/baseplates.lua
@@ -11,7 +11,7 @@ local gridMaterial = CreateMaterial("acf_bp_vis_spropgrid1", "VertexLitGeneric",
 local function CreateMenu(Menu)
 	ACF.SetToolMode("acf_menu", "Spawner", "Baseplate")
 	ACF.SetClientData("PrimaryClass", "acf_baseplate")
-	ACF.SetClientData("SecondaryClass", "acf_baseplate_replace")
+	ACF.SetClientData("SecondaryClass", "N/A")
 
 	Menu:AddTitle("Baseplate Settings")
 
diff --git a/lua/entities/acf_baseplate/init.lua b/lua/entities/acf_baseplate/init.lua
index 1ca52068..cd0abe26 100644
--- a/lua/entities/acf_baseplate/init.lua
+++ b/lua/entities/acf_baseplate/init.lua
@@ -24,7 +24,16 @@ function ENT:ACF_PostSpawn(_, _, _, ClientData)
     local EntMods = ClientData.EntityMods
     if EntMods and EntMods.mass then
         ACF.Contraption.SetMass(self, self.ACF.Mass or 1)
+    else
+        ACF.Contraption.SetMass(self, 1000)
+        print(self:GetPhysicsObject():GetMass())
     end
 end
 
+local Text = "Baseplate Size: %dx%dx%d"
+
+function ENT:UpdateOverlayText()
+    return Text:format(self.Size[1], self.Size[2], self.Size[3])
+end
+
 Entities.Register()
\ No newline at end of file