diff --git a/ccm_model.asc b/ccm_model.asc
index 63c9219..c683a2d 100755
--- a/ccm_model.asc
+++ b/ccm_model.asc
@@ -1,5 +1,5 @@
 Version 4
-SHEET 1 2200 1588
+SHEET 1 2212 1668
 WIRE 64 48 48 48
 WIRE 144 48 64 48
 WIRE 192 48 144 48
@@ -43,7 +43,11 @@ WIRE 1200 432 944 432
 WIRE 1488 432 1488 272
 WIRE 1488 432 1200 432
 WIRE 48 464 48 432
+WIRE 336 592 336 576
+WIRE 336 592 272 592
+WIRE 272 608 272 592
 WIRE 1360 656 1360 576
+WIRE 272 688 272 672
 WIRE 1296 704 1264 704
 WIRE -448 720 -448 672
 WIRE -448 720 -816 720
@@ -51,7 +55,7 @@ WIRE -304 720 -448 720
 WIRE 368 720 208 720
 WIRE 464 720 448 720
 WIRE -816 752 -816 720
-WIRE 336 784 336 640
+WIRE 336 784 336 592
 WIRE 896 784 880 784
 WIRE 960 784 896 784
 WIRE 1168 784 1056 784
@@ -69,8 +73,9 @@ WIRE 464 816 368 816
 WIRE 560 816 464 816
 WIRE 640 816 592 816
 WIRE 1360 816 1360 784
-WIRE 256 832 240 832
-WIRE 304 832 256 832
+WIRE 16 832 -16 832
+WIRE 144 832 96 832
+WIRE 304 832 144 832
 WIRE 960 832 704 832
 WIRE 1616 832 1616 784
 WIRE -704 848 -768 848
@@ -79,6 +84,7 @@ WIRE -448 848 -480 848
 WIRE 560 848 592 816
 WIRE 592 848 560 816
 WIRE 640 848 592 848
+WIRE 144 864 144 832
 WIRE 208 864 208 800
 WIRE 1264 864 1264 784
 WIRE 1296 864 1264 864
@@ -96,6 +102,7 @@ WIRE -880 976 -896 976
 WIRE -704 976 -880 976
 WIRE -448 976 -480 976
 WIRE -368 976 -448 976
+WIRE 144 976 144 944
 WIRE 208 976 208 944
 WIRE 1360 976 1360 912
 WIRE 1616 976 1616 896
@@ -149,9 +156,9 @@ FLAG 240 192 vg
 FLAG 48 464 0
 FLAG 64 48 vcc
 FLAG 336 896 0
-FLAG 336 640 vcc
+FLAG 336 576 vcc
 FLAG 208 976 0
-FLAG 256 832 ifeed
+FLAG -16 832 ifeed
 FLAG 672 912 0
 FLAG 672 656 vcc
 FLAG 960 912 0
@@ -171,6 +178,8 @@ FLAG -768 1184 0
 FLAG -448 672 vcc
 FLAG -880 976 vsq
 FLAG 1440 48 out
+FLAG 144 976 0
+FLAG 272 688 0
 SYMBOL voltage 48 192 R0
 WINDOW 123 0 0 Left 0
 WINDOW 39 0 0 Left 0
@@ -179,11 +188,13 @@ SYMATTR Value 5
 SYMBOL cap 128 224 R0
 SYMATTR InstName C1
 SYMATTR Value 10µ
-SYMBOL diode 688 64 R270
+SYMBOL schottky 688 64 R270
 WINDOW 0 32 32 VTop 2
 WINDOW 3 0 32 VBottom 2
 SYMATTR InstName D1
-SYMATTR Value RFVS8TG6S
+SYMATTR Value UPSC600
+SYMATTR Description Diode
+SYMATTR Type diode
 SYMBOL ind 176 64 R270
 WINDOW 0 32 56 VTop 2
 WINDOW 3 5 56 VBottom 2
@@ -295,7 +306,7 @@ SYMATTR InstName R12
 SYMATTR Value 10k
 SYMBOL cap -320 1072 R0
 SYMATTR InstName C7
-SYMATTR Value 1n
+SYMATTR Value 1.8n
 SYMBOL res -320 912 R0
 SYMATTR InstName R13
 SYMATTR Value 22k
@@ -307,15 +318,29 @@ SYMATTR InstName D4
 SYMATTR Value 1N5817
 SYMATTR Description Diode
 SYMATTR Type diode
-SYMBOL OpAmps\\AD8604 560 1232 R0
-SYMATTR InstName U2
-SYMBOL OpAmps\\AD8604 336 752 R0
+SYMBOL OpAmps\\AD8648 672 768 R0
+SYMATTR InstName U3
+SYMBOL OpAmps\\AD8648 336 752 R0
 SYMATTR InstName U1
-SYMBOL OpAmps\\AD8604 672 768 R0
-SYMATTR InstName U5
+SYMBOL OpAmps\\AD8648 560 1232 R0
+SYMATTR InstName U2
+SYMBOL res 112 816 R90
+WINDOW 0 0 56 VBottom 2
+WINDOW 3 32 56 VTop 2
+SYMATTR InstName R16
+SYMATTR Value 5.2k
+SYMBOL res 160 960 R180
+WINDOW 0 36 76 Left 2
+WINDOW 3 36 40 Left 2
+SYMATTR InstName R15
+SYMATTR Value 82k
+SYMBOL cap 256 608 R0
+SYMATTR InstName C8
+SYMATTR Value 1µ
 TEXT -272 480 Left 2 !.tran 0 16m 0
 TEXT 520 280 Left 2 ;snubber here
-TEXT 1592 200 Left 2 !.step param Il list 10u 2m 4m 6m 8m 10m 12m 14m
+TEXT 1592 200 Left 2 !*.step param Il list 10u 2m 4m 6m 8m 10m 12m 14m
 TEXT 1592 232 Left 2 !.meas Pin AVG -V(vcc)*I(V1)
 TEXT 1592 256 Left 2 !.meas Pout AVG V(OUT)*I(I1)
 TEXT 1592 280 Left 2 !.meas Eff param Pout/Pin
+TEXT 1624 144 Left 2 !.param Il=10m