diff --git a/demos/simulation/pspice/2n2222.model b/demos/simulation/pspice/2n2222.model
new file mode 100644
index 0000000000..46c14e96e4
--- /dev/null
+++ b/demos/simulation/pspice/2n2222.model
@@ -0,0 +1 @@
+.model Q2N2222 npn (bf=200)
diff --git a/demos/simulation/pspice/pspice.kicad_sch b/demos/simulation/pspice/pspice.kicad_sch
index 0f35fd4c7d..44aa9ef6d3 100644
--- a/demos/simulation/pspice/pspice.kicad_sch
+++ b/demos/simulation/pspice/pspice.kicad_sch
@@ -1,4 +1,4 @@
-(kicad_sch (version 20230121) (generator eeschema)
+(kicad_sch (version 20230221) (generator eeschema)
 
   (uuid a4349b77-fc13-4b06-b73d-e811f055a7b6)
 
@@ -555,11 +555,6 @@
     (stroke (width 0) (type solid))
     (uuid 2c0b3dd4-4daf-4853-95db-20c17416783f)
   )
-  (polyline (pts (xy 99.06 168.91) (xy 99.06 157.48))
-    (stroke (width 0) (type dash))
-    (uuid 2e31f3a3-23f8-436c-9fb5-14bc2bf079dd)
-  )
-
   (wire (pts (xy 97.79 106.68) (xy 97.79 107.95))
     (stroke (width 0) (type solid))
     (uuid 2ff59997-dc99-4f9e-b240-027ee32648f7)
@@ -640,11 +635,6 @@
     (stroke (width 0) (type solid))
     (uuid 7fc661e7-01ba-4f88-9114-d133e8f16294)
   )
-  (polyline (pts (xy 99.06 157.48) (xy 27.94 157.48))
-    (stroke (width 0) (type dash))
-    (uuid 8cde6390-70af-47c6-9b19-869ffd9efef2)
-  )
-
   (wire (pts (xy 237.49 71.12) (xy 238.76 71.12))
     (stroke (width 0) (type solid))
     (uuid 942325ec-633f-48d4-b3d3-1e46a05f980e)
@@ -685,11 +675,6 @@
     (stroke (width 0) (type solid))
     (uuid be59c4b2-2c26-40b4-9a85-be3ad43fa4f8)
   )
-  (polyline (pts (xy 27.94 168.91) (xy 99.06 168.91))
-    (stroke (width 0) (type dash))
-    (uuid c5feda4c-00be-4d64-9b5d-f8c1cb992dd6)
-  )
-
   (wire (pts (xy 233.68 45.72) (xy 220.98 45.72))
     (stroke (width 0) (type solid))
     (uuid c91305b5-4574-4571-9eed-e12137b78fac)
@@ -718,11 +703,6 @@
     (stroke (width 0) (type solid))
     (uuid dcea6893-7252-4648-8059-110744638814)
   )
-  (polyline (pts (xy 27.94 168.91) (xy 27.94 157.48))
-    (stroke (width 0) (type dash))
-    (uuid de0ef60a-2131-4d37-a124-3fbc0cb90c9a)
-  )
-
   (wire (pts (xy 198.12 45.72) (xy 208.28 45.72))
     (stroke (width 0) (type solid))
     (uuid de388234-29ba-4a59-8aba-fc793b637ef9)
@@ -772,11 +752,7 @@
     (uuid faf25f99-bd42-4fd9-803e-8b56942c3a46)
   )
 
-  (text "Pspice directives using one multiline text:" (at 27.94 157.48 0)
-    (effects (font (size 1.524 1.524)) (justify left bottom))
-    (uuid 0ddada8a-70ea-40ec-85b3-fe06299d60b4)
-  )
-  (text ".model Q2N2222 npn (bf=200)\n.ac dec 100 10 1Meg\n" (at 29.21 165.1 0)
+  (text ".ac dec 100 10 1Meg" (at 148.59 121.92 0)
     (effects (font (size 1.524 1.524)) (justify left bottom))
     (uuid 3f1c85ee-fda3-40b1-bed1-9da936a0795e)
   )
@@ -813,6 +789,21 @@
     (property "Datasheet" "" (at 142.24 71.12 0)
       (effects (font (size 1.524 1.524)) hide)
     )
+    (property "Sim.Library" "2n2222.model" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Name" "Q2N2222" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Device" "NPN" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Type" "GUMMELPOON" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=C 2=B 3=E" (at 142.24 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 705319b9-8503-42db-9062-d9d138027781))
     (pin "2" (uuid 6d635333-416f-44fc-9c6a-725e30c4e4a4))
     (pin "3" (uuid 3f871b07-9065-408c-96e2-faf4b4625d8d))
@@ -840,6 +831,21 @@
     (property "Datasheet" "" (at 158.75 71.12 0)
       (effects (font (size 1.524 1.524)) hide)
     )
+    (property "Sim.Library" "2n2222.model" (at 158.75 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Name" "Q2N2222" (at 158.75 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Device" "NPN" (at 158.75 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Type" "GUMMELPOON" (at 158.75 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=C 2=B 3=E" (at 158.75 71.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 36a40cd7-7d50-458e-add7-125f6d732851))
     (pin "2" (uuid 8fba8fca-6e03-4da5-ae6b-292eae8e4d1e))
     (pin "3" (uuid d0b29582-8e9f-4d5c-925a-c265fd09065b))
@@ -1386,6 +1392,21 @@
     (property "Datasheet" "" (at 191.77 62.23 0)
       (effects (font (size 1.524 1.524)) hide)
     )
+    (property "Sim.Library" "2n2222.model" (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Name" "Q2N2222" (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Device" "NPN" (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Type" "GUMMELPOON" (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Sim.Pins" "1=C 2=B 3=E" (at 191.77 62.23 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid d6abae40-7890-459f-8a50-b5eca82ea2df))
     (pin "2" (uuid 4d560946-efc0-447b-9d34-7c63f0fa87c6))
     (pin "3" (uuid a509d581-7438-4eba-9d3a-281cd39ea394))