diff --git a/labsw/labsw.brd b/labsw/labsw.brd
index df3c707..2ea8b98 100644
--- a/labsw/labsw.brd
+++ b/labsw/labsw.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Fri Sep 30 03:05:47 2011
+PCBNEW-BOARD Version 1 date Fri Sep 30 04:02:55 2011
 
 # Created by Pcbnew(2010-12-27 BZR 2685)-unstable
 
@@ -10,7 +10,7 @@ Links 145
 NoConn 0
 Di 36982 23563 77191 44173
 Ndraw 22
-Ntrack 597
+Ntrack 599
 Nzone 0
 BoardThickness 630
 Nmodule 65
@@ -1107,7 +1107,7 @@ Po -2657 1751
 $EndPAD
 $EndMODULE  miniUSB_B
 $MODULE SOT-323-CW
-Po 62362 39449 2700 0 4E477EAA 4E5713F5 ~~
+Po 62362 39055 2700 0 4E477EAA 4E5713F5 ~~
 Li SOT-323-CW
 Sc 4E5713F5
 AR /4E6BEDF0/4E6BEEEB
@@ -1215,10 +1215,10 @@ Po 1999 0
 $EndPAD
 $EndMODULE  HDR-3x1-200mil
 $MODULE 0603
-Po 50000 30000 0 0 4E53B58E 4E571EAF ~~
+Po 56614 30000 0 0 4E53B58E 4E571EAF ~~
 Li 0603
 Sc 4E571EAF
-AR /4E55BED6/4E55BFB1
+AR /4E55BED6/4E55BFB2
 Op 0 0 0
 At SMD 
 T0 0 150 200 200 0 40 M V 20 N"R12"
@@ -1238,15 +1238,15 @@ $PAD
 Sh "2" R 276 354 0 0 0
 Dr 0 0 0
 At SMD N 00440001
-Ne 61 "N-000048"
+Ne 62 "N-000052"
 Po 295 0
 $EndPAD
 $EndMODULE  0603
 $MODULE 0603
-Po 56614 30000 0 0 4E53B58E 4E571EB1 ~~
+Po 50000 30000 0 0 4E53B58E 4E571EB1 ~~
 Li 0603
 Sc 4E571EB1
-AR /4E55BED6/4E55BFB2
+AR /4E55BED6/4E55BFB1
 Op 0 0 0
 At SMD 
 T0 0 150 200 200 0 40 M V 20 N"R13"
@@ -1266,7 +1266,7 @@ $PAD
 Sh "2" R 276 354 0 0 0
 Dr 0 0 0
 At SMD N 00440001
-Ne 62 "N-000052"
+Ne 61 "N-000048"
 Po 295 0
 $EndPAD
 $EndMODULE  0603
@@ -2904,92 +2904,120 @@ Ne 12 "/Back/EXT_IN_4_P"
 Po 1180 0
 $EndPAD
 $EndMODULE  2512
-$MODULE DIP-4-300mil
-Po 61024 41654 900 15 4E63DDD7 4E854A6C ~~
-Li DIP-4-300mil
-Sc 4E854A6C
-AR /4E6BEDF0/4E854A18
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 900 40 N V 25 N"U7"
-T1 0 150 200 200 900 40 N I 25 N"OPTO-TRANS-4"
-DC -1068 864 -1068 729 50 21
-DS -814 1000 -814 -1000 50 21
-DS -814 -1000 814 -1000 50 21
-DS 814 -1000 814 1000 50 21
-DS 814 1000 -814 1000 50 21
-$PAD
-Sh "4" O 629 629 0 0 900
-Dr 315 0 0
-At STD N 00CC8001
-Ne 31 "/CH12/EXT_CH2_OPT"
-Po -499 -1499
-$EndPAD
-$PAD
-Sh "1" O 629 629 0 0 900
-Dr 315 0 0
-At STD N 00CC8001
-Ne 66 "N-000065"
-Po -499 1499
-$EndPAD
-$PAD
-Sh "3" O 629 629 0 0 900
-Dr 315 0 0
-At STD N 00CC8001
-Ne 28 "/CH12/EXT_CH2_COM"
-Po 499 -1499
-$EndPAD
-$PAD
-Sh "2" O 629 629 0 0 900
-Dr 315 0 0
-At STD N 00CC8001
-Ne 39 "CH2_OPT"
-Po 499 1499
-$EndPAD
-$EndMODULE  DIP-4-300mil
-$MODULE DIP-4-300mil
-Po 61024 36457 900 15 4E63DDD7 4E854A6E ~~
-Li DIP-4-300mil
-Sc 4E854A6E
+$MODULE DIP-4/6-300mil
+Po 61024 35984 900 15 4E856645 4E8566EC ~~
+Li DIP-4/6-300mil
+Sc 4E8566EC
 AR /4E6BEDF0/4E854A0D
 Op 0 0 0
 At SMD 
 T0 0 -150 200 200 900 40 N V 25 N"U6"
 T1 0 150 200 200 900 40 N I 25 N"OPTO-TRANS-4"
-DC -1068 864 -1068 729 50 21
-DS -814 1000 -814 -1000 50 21
-DS -814 -1000 814 -1000 50 21
-DS 814 -1000 814 1000 50 21
-DS 814 1000 -814 1000 50 21
+DC -1568 864 -1568 729 50 21
+DS -1314 1000 -1314 -1000 50 21
+DS -1314 -1000 1314 -1000 50 21
+DS 1314 -1000 1314 1000 50 21
+DS 1314 1000 -1314 1000 50 21
 $PAD
 Sh "4" O 629 629 0 0 900
 Dr 315 0 0
 At STD N 00CC8001
 Ne 27 "/CH12/EXT_CH1_OPT"
-Po -499 -1499
+Po -999 -1499
 $EndPAD
 $PAD
 Sh "1" O 629 629 0 0 900
 Dr 315 0 0
 At STD N 00CC8001
 Ne 64 "N-000063"
-Po -499 1499
+Po -999 1499
 $EndPAD
 $PAD
-Sh "3" O 629 629 0 0 900
-Dr 315 0 0
+Sh "3" O 628 629 0 0 900
+Dr 314 0 0
 At STD N 00CC8001
 Ne 24 "/CH12/EXT_CH1_COM"
-Po 499 -1499
+Po 0 -1499
 $EndPAD
 $PAD
-Sh "2" O 629 629 0 0 900
-Dr 315 0 0
+Sh "2" O 628 629 0 0 900
+Dr 314 0 0
 At STD N 00CC8001
 Ne 37 "CH1_OPT"
-Po 499 1499
+Po 0 1499
 $EndPAD
-$EndMODULE  DIP-4-300mil
+$PAD
+Sh "HOLE" C 315 315 0 0 900
+Dr 315 0 0
+At HOLE N 00C00000
+Ne 0 ""
+Po 999 -1499
+$EndPAD
+$PAD
+Sh "HOLE" C 315 315 0 0 900
+Dr 315 0 0
+At HOLE N 00C00000
+Ne 0 ""
+Po 999 1499
+$EndPAD
+$EndMODULE  DIP-4/6-300mil
+$MODULE DIP-4/6-300mil
+Po 61024 41181 900 15 4E856645 4E8566EE ~~
+Li DIP-4/6-300mil
+Sc 4E8566EE
+AR /4E6BEDF0/4E854A18
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 900 40 N V 25 N"U7"
+T1 0 150 200 200 900 40 N I 25 N"OPTO-TRANS-4"
+DC -1568 864 -1568 729 50 21
+DS -1314 1000 -1314 -1000 50 21
+DS -1314 -1000 1314 -1000 50 21
+DS 1314 -1000 1314 1000 50 21
+DS 1314 1000 -1314 1000 50 21
+$PAD
+Sh "4" O 629 629 0 0 900
+Dr 315 0 0
+At STD N 00CC8001
+Ne 31 "/CH12/EXT_CH2_OPT"
+Po -999 -1499
+$EndPAD
+$PAD
+Sh "1" O 629 629 0 0 900
+Dr 315 0 0
+At STD N 00CC8001
+Ne 66 "N-000065"
+Po -999 1499
+$EndPAD
+$PAD
+Sh "3" O 628 629 0 0 900
+Dr 314 0 0
+At STD N 00CC8001
+Ne 28 "/CH12/EXT_CH2_COM"
+Po 0 -1499
+$EndPAD
+$PAD
+Sh "2" O 628 629 0 0 900
+Dr 314 0 0
+At STD N 00CC8001
+Ne 39 "CH2_OPT"
+Po 0 1499
+$EndPAD
+$PAD
+Sh "HOLE" C 315 315 0 0 900
+Dr 315 0 0
+At HOLE N 00C00000
+Ne 0 ""
+Po 999 -1499
+$EndPAD
+$PAD
+Sh "HOLE" C 315 315 0 0 900
+Dr 315 0 0
+At HOLE N 00C00000
+Ne 0 ""
+Po 999 1499
+$EndPAD
+$EndMODULE  DIP-4/6-300mil
 $DRAWSEGMENT
 Po 0 77165 35354 77165 25984 50
 De 28 0 900 0 0
@@ -3085,15 +3113,15 @@ Po 0 77165 42126 64567 42126 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TRACK
-Po 0 58110 40294 58446 40294 157 -1
+Po 0 58110 40294 58210 40294 157 -1
 De 0 0 1 0 800
-Po 0 62047 40157 65039 40157 157 -1
+Po 0 61968 39685 65039 39685 157 -1
 De 0 0 1 0 0
-Po 0 61811 39921 62047 40157 157 -1
+Po 0 61574 39291 61968 39685 157 -1
 De 0 0 1 0 0
-Po 0 58819 39921 61811 39921 157 -1
+Po 0 59213 39291 61574 39291 157 -1
 De 0 0 1 0 0
-Po 0 58446 40294 58819 39921 157 -1
+Po 0 58210 40294 59213 39291 157 -1
 De 0 0 1 0 0
 Po 0 72677 30709 74673 30709 157 -1
 De 0 0 1 0 0
@@ -3157,11 +3185,13 @@ Po 0 67323 30709 66929 30315 157 -1
 De 15 0 1 0 0
 Po 0 64389 41181 64724 41181 157 -1
 De 0 0 1 0 800
-Po 0 65039 40866 65039 40157 157 -1
+Po 0 65039 40157 65039 39685 157 -1
 De 0 0 1 0 0
 Po 0 64724 41181 65039 40866 157 -1
 De 0 0 1 0 0
-Po 0 65039 40157 65039 37658 157 -1
+Po 0 65039 40866 65039 40157 157 -1
+De 0 0 1 0 0
+Po 0 65039 39685 65039 37658 157 -1
 De 0 0 1 0 0
 Po 0 65039 37658 64389 37008 157 -1
 De 0 0 1 0 400
@@ -3407,12 +3437,16 @@ Po 0 74409 31890 74409 32443 80 -1
 De 0 0 23 0 0
 Po 0 74409 32443 74961 32995 80 -1
 De 0 0 23 0 400
+Po 0 59525 35984 58897 35984 394 -1
+De 0 0 24 0 800
+Po 0 50236 37480 49921 37165 394 -1
+De 0 0 24 0 0
+Po 0 49921 37165 48504 37165 394 -1
+De 0 0 24 0 0
 Po 0 50236 37480 57401 37480 394 -1
 De 0 0 24 0 0
-Po 0 57401 37480 58923 35958 394 -1
+Po 0 58897 35984 57401 37480 394 -1
 De 0 0 24 0 0
-Po 0 58923 35958 59525 35958 394 -1
-De 0 0 24 0 400
 Po 0 48504 37165 43306 37165 394 -1
 De 0 0 24 0 0
 Po 0 42677 35040 43780 33937 394 -1
@@ -3423,10 +3457,6 @@ Po 0 43306 37165 42677 36536 394 -1
 De 0 0 24 0 0
 Po 0 48442 37165 48504 37165 394 -1
 De 0 0 24 0 0
-Po 0 48504 37165 49921 37165 394 -1
-De 0 0 24 0 0
-Po 0 50236 37480 49921 37165 394 -1
-De 0 0 24 0 0
 Po 0 48442 35740 48442 37165 394 -1
 De 0 0 24 0 800
 Po 0 48442 32764 48442 35740 394 -1
@@ -3447,17 +3477,17 @@ Po 0 46261 35936 43780 35936 394 -1
 De 0 0 26 0 400
 Po 0 46457 32764 46457 35740 394 -1
 De 0 0 26 0 C00
-Po 0 59525 36956 59525 38107 118 -1
+Po 0 59525 36983 59525 38107 118 -1
 De 0 0 27 0 800
 Po 0 59525 38107 59528 38110 118 -1
 De 0 0 27 0 400
-Po 0 59525 41155 59239 41155 394 -1
-De 0 0 28 0 800
-Po 0 59239 41155 58661 41733 394 -1
+Po 0 58661 42677 58661 41733 394 -1
 De 0 0 28 0 0
-Po 0 58661 41733 58661 42677 394 -1
+Po 0 57873 43465 58661 42677 394 -1
 De 0 0 28 0 0
-Po 0 58661 42677 57873 43465 394 -1
+Po 0 59213 41181 59525 41181 394 -1
+De 0 0 28 0 400
+Po 0 58661 41733 59213 41181 394 -1
 De 0 0 28 0 0
 Po 0 57480 43465 57873 43465 394 -1
 De 0 0 28 0 0
@@ -3495,9 +3525,9 @@ Po 0 46261 42393 46457 42197 394 -1
 De 0 0 30 0 400
 Po 0 46457 39221 46457 42197 394 -1
 De 0 0 30 0 C00
-Po 0 59525 42153 59525 43304 118 -1
+Po 0 59528 43307 59528 42183 118 -1
 De 0 0 31 0 800
-Po 0 59525 43304 59528 43307 118 -1
+Po 0 59528 42183 59525 42180 118 -1
 De 0 0 31 0 400
 Po 0 70886 28425 70886 28878 80 -1
 De 15 0 32 0 800
@@ -3563,22 +3593,22 @@ Po 0 67480 33622 66594 33622 80 -1
 De 0 0 36 0 0
 Po 0 66594 33622 66299 33917 80 -1
 De 0 0 36 0 400
-Po 0 72362 34803 64646 34803 80 -1
-De 15 0 37 0 0
-Po 0 64646 34803 63543 35906 80 -1
-De 15 0 37 0 0
-Po 0 62523 35958 63491 35958 80 -1
-De 0 0 37 0 800
-Po 0 63491 35958 63543 35906 80 -1
-De 0 0 37 0 0
 Po 3 63543 35906 63543 35906 350 -1
 De 15 1 37 0 0
-Po 0 71889 34183 71889 34330 80 -1
-De 0 0 37 0 800
-Po 0 71889 34330 72362 34803 80 -1
-De 0 0 37 0 0
 Po 3 72362 34803 72362 34803 350 -1
 De 15 1 37 0 0
+Po 0 71889 34330 72362 34803 80 -1
+De 0 0 37 0 0
+Po 0 71889 34183 71889 34330 80 -1
+De 0 0 37 0 800
+Po 0 64646 34803 63543 35906 80 -1
+De 15 0 37 0 0
+Po 0 72362 34803 64646 34803 80 -1
+De 15 0 37 0 0
+Po 0 63465 35984 62523 35984 80 -1
+De 0 0 37 0 400
+Po 0 63543 35906 63465 35984 80 -1
+De 0 0 37 0 0
 Po 0 67874 32835 63149 32835 80 -1
 De 15 0 38 0 0
 Po 0 73937 33701 73386 33701 80 -1
@@ -3603,28 +3633,28 @@ Po 0 73386 33701 73937 33701 80 -1
 De 0 0 38 0 0
 Po 3 73937 33701 73937 33701 350 -1
 De 15 1 38 0 0
-Po 0 63150 40551 63150 35669 80 -1
-De 15 0 39 0 0
-Po 0 62523 41155 62546 41155 80 -1
+Po 0 62523 41181 62523 41178 80 -1
 De 0 0 39 0 800
-Po 0 62546 41155 63150 40551 80 -1
-De 0 0 39 0 0
-Po 3 63150 40551 63150 40551 350 -1
-De 15 1 39 0 0
-Po 3 73150 34016 73150 34016 350 -1
-De 15 1 39 0 0
-Po 0 72756 33622 73150 34016 80 -1
-De 0 0 39 0 0
-Po 0 72756 33622 72450 33622 80 -1
-De 0 0 39 0 400
-Po 0 72362 34016 73150 34016 80 -1
-De 15 0 39 0 0
-Po 0 71811 34567 72362 34016 80 -1
+Po 0 63150 35669 64252 34567 80 -1
 De 15 0 39 0 0
 Po 0 64252 34567 71811 34567 80 -1
 De 15 0 39 0 0
-Po 0 63150 35669 64252 34567 80 -1
+Po 0 71811 34567 72362 34016 80 -1
 De 15 0 39 0 0
+Po 0 72362 34016 73150 34016 80 -1
+De 15 0 39 0 0
+Po 0 72756 33622 72450 33622 80 -1
+De 0 0 39 0 400
+Po 0 72756 33622 73150 34016 80 -1
+De 0 0 39 0 0
+Po 3 73150 34016 73150 34016 350 -1
+De 15 1 39 0 0
+Po 3 63150 40551 63150 40551 350 -1
+De 15 1 39 0 0
+Po 0 63150 40551 63150 35669 80 -1
+De 15 0 39 0 0
+Po 0 62523 41178 63150 40551 80 -1
+De 0 0 39 0 0
 Po 0 72362 35354 65355 35354 80 -1
 De 15 0 40 0 0
 Po 0 65355 35354 64409 36300 80 -1
@@ -3643,6 +3673,24 @@ Po 0 64389 38445 64409 38425 80 -1
 De 0 0 40 0 0
 Po 3 64409 38425 64409 38425 350 -1
 De 15 1 40 0 0
+Po 0 64883 34644 61969 34644 157 -1
+De 0 0 41 0 0
+Po 0 61969 34644 61969 34607 157 -1
+De 0 0 41 0 0
+Po 0 62735 39310 62538 39310 157 -1
+De 0 0 41 0 800
+Po 0 62538 39310 62362 39134 157 -1
+De 0 0 41 0 0
+Po 0 62362 39134 62362 38031 157 -1
+De 0 0 41 0 0
+Po 0 62362 38031 61969 37638 157 -1
+De 0 0 41 0 0
+Po 0 61969 37638 61969 34607 157 -1
+De 0 0 41 0 0
+Po 0 61969 34607 61969 34607 157 -1
+De 0 0 41 0 0
+Po 0 61969 34607 60767 33405 157 -1
+De 0 0 41 0 400
 Po 0 73287 29370 73858 29370 157 -1
 De 0 0 41 0 800
 Po 0 72913 28425 72736 28425 157 -1
@@ -3697,10 +3745,6 @@ Po 0 73229 34488 72756 34961 157 -1
 De 0 0 41 0 0
 Po 0 72756 34961 72756 35590 157 -1
 De 0 0 41 0 0
-Po 0 60767 33405 60767 34074 157 -1
-De 0 0 41 0 800
-Po 0 60767 34074 61969 35276 157 -1
-De 0 0 41 0 0
 Po 0 66299 33327 66200 33327 157 -1
 De 0 0 41 0 800
 Po 0 66200 33327 64883 34644 157 -1
@@ -3715,8 +3759,6 @@ Po 3 65591 35984 65591 35984 394 -1
 De 15 1 41 0 0
 Po 0 65591 35984 64883 35276 157 -1
 De 0 0 41 0 0
-Po 0 64883 35276 61969 35276 157 -1
-De 0 0 41 0 0
 Po 0 68031 36063 72283 36063 157 -1
 De 15 0 41 0 0
 Po 0 72283 36063 72362 35984 157 -1
@@ -3729,16 +3771,6 @@ Po 0 72224 36122 71654 36122 157 -1
 De 0 0 41 0 400
 Po 0 71024 36122 71654 36122 157 -1
 De 0 0 41 0 C00
-Po 0 62735 39704 62538 39704 157 -1
-De 0 0 41 0 800
-Po 0 62538 39704 62362 39528 157 -1
-De 0 0 41 0 0
-Po 0 62362 39528 62362 37873 157 -1
-De 0 0 41 0 0
-Po 0 62362 37873 61969 37480 157 -1
-De 0 0 41 0 0
-Po 0 61969 37480 61969 35276 157 -1
-De 0 0 41 0 0
 Po 0 68189 35256 68189 35905 157 -1
 De 0 0 41 0 800
 Po 0 68189 35905 68031 36063 157 -1
@@ -4068,29 +4100,31 @@ De 0 0 61 0 800
 Po 0 50298 30003 50295 30000 80 -1
 De 0 0 61 0 400
 Po 0 56909 30000 57789 30000 80 -1
-De 0 0 62 0 800
+De 0 0 62 0 C00
 Po 0 57789 30000 57792 30003 80 -1
-De 0 0 62 0 400
+De 0 0 62 0 C00
 Po 0 44429 30138 43622 30138 80 -1
 De 0 0 63 0 400
 Po 0 44564 30003 44429 30138 80 -1
 De 0 0 63 0 800
-Po 0 62523 36956 63747 36956 80 -1
+Po 0 63799 37008 62548 37008 80 -1
 De 0 0 64 0 800
-Po 0 63747 36956 63799 37008 80 -1
+Po 0 62548 37008 62523 36983 80 -1
 De 0 0 64 0 400
-Po 0 62735 39194 63739 39194 80 -1
+Po 0 62735 38800 63465 38800 80 -1
 De 0 0 65 0 800
-Po 0 63739 39194 63799 39134 80 -1
+Po 0 63465 38800 63799 39134 80 -1
 De 0 0 65 0 400
-Po 0 63799 41181 63495 41181 80 -1
+Po 0 63799 41181 63522 41181 80 -1
 De 0 0 66 0 800
-Po 0 63495 41181 62523 42153 80 -1
+Po 0 63522 41181 62523 42180 80 -1
 De 0 0 66 0 400
-Po 0 60767 32895 61577 32895 80 -1
+Po 0 61674 32992 61339 32992 80 -1
 De 0 0 67 0 800
-Po 0 61577 32895 61674 32992 80 -1
+Po 0 61242 32895 60767 32895 80 -1
 De 0 0 67 0 400
+Po 0 61339 32992 61242 32895 80 -1
+De 0 0 67 0 0
 Po 0 57855 33170 57855 32764 80 -1
 De 0 0 68 0 800
 Po 0 56378 32764 57776 32764 80 -1
@@ -4101,16 +4135,14 @@ Po 0 57855 32764 59635 32764 80 -1
 De 0 0 68 0 0
 Po 0 59635 32764 60021 33150 80 -1
 De 0 0 68 0 400
-Po 0 57855 39548 57855 39221 80 -1
+Po 0 57855 39548 57855 39055 80 -1
 De 0 0 69 0 800
-Po 0 56378 39221 57855 39221 80 -1
+Po 0 61989 39055 57855 39055 80 -1
 De 0 0 69 0 800
-Po 0 57855 39221 61761 39221 80 -1
-De 0 0 69 0 0
-Po 0 61761 39221 61989 39449 80 -1
+Po 0 57855 39055 56544 39055 80 -1
 De 0 0 69 0 400
-Po 0 56378 39221 56426 39221 80 -1
-De 0 0 69 0 800
+Po 0 56544 39055 56378 39221 80 -1
+De 0 0 69 0 C00
 Po 0 64567 31496 73307 31496 80 -1
 De 15 0 70 0 0
 Po 0 73307 31496 74016 32205 80 -1
diff --git a/labsw/labsw.cmp b/labsw/labsw.cmp
index 9978eae..89cb18d 100644
--- a/labsw/labsw.cmp
+++ b/labsw/labsw.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2010-12-27 BZR 2685)-unstable date = Fri Sep 30 01:49:38 2011
+Cmp-Mod V01 Created by CvPCB (2010-12-27 BZR 2685)-unstable date = Fri Sep 30 03:49:48 2011
 
 BeginCmp
 TimeStamp = /4E55CABB;
@@ -396,14 +396,14 @@ BeginCmp
 TimeStamp = /4E6BEDF0/4E854A0D;
 Reference = U6;
 ValeurCmp = OPTO-TRANS-4;
-IdModule  = DIP-4-300mil;
+IdModule  = DIP-4/6-300mil;
 EndCmp
 
 BeginCmp
 TimeStamp = /4E6BEDF0/4E854A18;
 Reference = U7;
 ValeurCmp = OPTO-TRANS-4;
-IdModule  = DIP-4-300mil;
+IdModule  = DIP-4/6-300mil;
 EndCmp
 
 BeginCmp
diff --git a/labsw/labsw.pro b/labsw/labsw.pro
index 5e3c5e1..34a1808 100644
--- a/labsw/labsw.pro
+++ b/labsw/labsw.pro
@@ -1,4 +1,4 @@
-update=Fri Sep 30 03:05:49 2011
+update=Fri Sep 30 04:02:57 2011
 last_client=pcbnew
 [eeschema]
 version=1
@@ -77,3 +77,4 @@ LibName6=modules/header
 LibName7=modules/relay
 LibName8=../../kicad-libs/modules/sot-323
 LibName9=modules/spacer
+LibName10=modules/dip4of6
diff --git a/labsw/modules/Makefile b/labsw/modules/Makefile
index 98b68a7..517ff68 100644
--- a/labsw/modules/Makefile
+++ b/labsw/modules/Makefile
@@ -1,4 +1,4 @@
-MODULES=dip header relay spacer
+MODULES=dip dip4of6 header relay spacer
 
 .SUFFIXES:	.fpd .mod
 
diff --git a/labsw/modules/dip4of6.fpd b/labsw/modules/dip4of6.fpd
new file mode 100644
index 0000000..52a43dd
--- /dev/null
+++ b/labsw/modules/dip4of6.fpd
@@ -0,0 +1,90 @@
+/* MACHINE-GENERATED ! */
+
+frame hole {
+	__0: vec @(hole/2, hole/2)
+	__1: vec @(-hole/2, -hole/2)
+	hole . __0
+}
+
+frame pin {
+	frame hole @
+	__2: vec @(-ratio*hole/2, ratio*hole/2)
+	__3: vec @(ratio*hole/2, -ratio*hole/2)
+	rpad "$n" __2 .
+}
+
+frame pin_top {
+	set n = N-i
+
+	frame pin @
+}
+
+frame pin_bottom {
+	set n = i+1
+
+	frame pin @
+}
+
+frame pins {
+	loop i = 0, populated-1
+
+	__0: vec @(pitch*(i-(side-1)/2), 0mm)
+	__1: vec .(0mm, width/2)
+	frame pin_top .
+	__2: vec __0(0mm, -width/2)
+	frame pin_bottom .
+}
+
+frame holes {
+	loop i = populated, side-1
+
+	__0: vec @(pitch*(i-(side-1)/2), 0mm)
+	__1: vec .(0mm, width/2)
+	frame hole .
+	__2: vec __0(0mm, -width/2)
+	frame hole .
+}
+
+frame marker {
+	set r = (side*pitch-x)/2-w
+
+	set clear = 0.3mm
+
+	__0: vec @(-x/2-r-clear, -y/2+r)
+	__1: vec .(0mm, r)
+	circ __0 . w
+}
+
+frame outline {
+	set x = (side-1)*pitch+ratio*hole
+
+	set y = width-pitch
+
+	set w = 5mil
+
+	__0: vec @(x/2, y/2)
+	__1: vec @(-x/2, -y/2)
+	rect . __0 w
+	frame marker @
+}
+
+package "DIP-${N}/${M}-${width}"
+unit mm
+
+set N = 2*populated
+set M = 2*side
+
+set width = 300mil
+
+set hole = 0.8mm
+
+set ratio = 2
+
+set pitch = 100mil
+
+set side = 3
+set populated = 2
+
+frame outline @
+frame pins @
+frame holes @