diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw
index c130c93a..825a749e 100644
Binary files a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw and b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw differ
diff --git a/bacnet-stack/ports/win32/bacnet.ide b/bacnet-stack/ports/win32/bacnet.ide
index a00df311..566cabcf 100644
Binary files a/bacnet-stack/ports/win32/bacnet.ide and b/bacnet-stack/ports/win32/bacnet.ide differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.ncb b/bacnet-stack/ports/win32/bacnet/bacnet.ncb
index c012d256..4914a281 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.ncb and b/bacnet-stack/ports/win32/bacnet/bacnet.ncb differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.opt b/bacnet-stack/ports/win32/bacnet/bacnet.opt
index e3cb378b..9821af52 100644
Binary files a/bacnet-stack/ports/win32/bacnet/bacnet.opt and b/bacnet-stack/ports/win32/bacnet/bacnet.opt differ
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.plg b/bacnet-stack/ports/win32/bacnet/bacnet.plg
index e2c7144a..284390b7 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.plg
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.plg
@@ -6,60 +6,14 @@
 --------------------Configuration: bacnet - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP606.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP862.tmp" with contents
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\.." /I ".." /I "..\..\..\demo\object\\" /I "..\..\..\demo\handler\\" /D "_DEBUG" /D BACDL_BIP=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TSM_ENABLED=1 /D PRINT_ENABLED=1 /D BIG_ENDIAN=0 /D USE_INADDR=0 /FR"Debug/" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\code\bacnet-stack\abort.c"
-"C:\code\bacnet-stack\address.c"
-"C:\code\bacnet-stack\demo\object\ai.c"
-"C:\code\bacnet-stack\demo\object\ao.c"
-"C:\code\bacnet-stack\apdu.c"
-"C:\code\bacnet-stack\arf.c"
-"C:\code\bacnet-stack\demo\object\av.c"
 "C:\code\bacnet-stack\bacapp.c"
 "C:\code\bacnet-stack\bacdcode.c"
-"C:\code\bacnet-stack\bacerror.c"
-"C:\code\bacnet-stack\demo\object\bacfile.c"
-"C:\code\bacnet-stack\bacstr.c"
-"C:\code\bacnet-stack\bactext.c"
-"C:\code\bacnet-stack\demo\object\bi.c"
-"C:\code\bacnet-stack\bigend.c"
-"C:\code\bacnet-stack\ports\win32\bip-init.c"
-"C:\code\bacnet-stack\bip.c"
-"C:\code\bacnet-stack\demo\object\bo.c"
-"C:\code\bacnet-stack\demo\object\bv.c"
-"C:\code\bacnet-stack\crc.c"
-"C:\code\bacnet-stack\dcc.c"
-"C:\code\bacnet-stack\demo\object\device.c"
-"C:\code\bacnet-stack\demo\handler\h_arf.c"
-"C:\code\bacnet-stack\demo\handler\h_arf_a.c"
-"C:\code\bacnet-stack\demo\handler\h_iam.c"
-"C:\code\bacnet-stack\demo\handler\h_rp.c"
-"C:\code\bacnet-stack\demo\handler\h_rp_a.c"
-"C:\code\bacnet-stack\demo\handler\h_whois.c"
-"C:\code\bacnet-stack\demo\handler\h_wp.c"
-"C:\code\bacnet-stack\iam.c"
-"C:\code\bacnet-stack\indtext.c"
-"C:\code\bacnet-stack\demo\object\lsp.c"
-"C:\code\bacnet-stack\ports\win32\main.c"
-"C:\code\bacnet-stack\demo\object\mso.c"
-"C:\code\bacnet-stack\demo\handler\noserv.c"
-"C:\code\bacnet-stack\npdu.c"
-"C:\code\bacnet-stack\reject.c"
-"C:\code\bacnet-stack\ringbuf.c"
-"C:\code\bacnet-stack\rp.c"
-"C:\code\bacnet-stack\demo\handler\s_rp.c"
-"C:\code\bacnet-stack\demo\handler\s_whois.c"
-"C:\code\bacnet-stack\demo\handler\s_wp.c"
-"C:\code\bacnet-stack\tsm.c"
-"C:\code\bacnet-stack\demo\handler\txbuf.c"
-"C:\code\bacnet-stack\whois.c"
-"C:\code\bacnet-stack\wp.c"
-"C:\code\bacnet-stack\demo\object\lc.c"
-"C:\code\bacnet-stack\datetime.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP606.tmp" 
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP607.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP862.tmp" 
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP863.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/bacnet.pdb" /debug /machine:I386 /out:"Debug/bacnet.exe" /pdbtype:sept 
 ".\Debug\abort.obj"
@@ -82,6 +36,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\bo.obj"
 ".\Debug\bv.obj"
 ".\Debug\crc.obj"
+".\Debug\datetime.obj"
 ".\Debug\dcc.obj"
 ".\Debug\device.obj"
 ".\Debug\h_arf.obj"
@@ -93,6 +48,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\h_wp.obj"
 ".\Debug\iam.obj"
 ".\Debug\indtext.obj"
+".\Debug\lc.obj"
 ".\Debug\lsp.obj"
 ".\Debug\main.obj"
 ".\Debug\mso.obj"
@@ -108,67 +64,15 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32
 ".\Debug\txbuf.obj"
 ".\Debug\whois.obj"
 ".\Debug\wp.obj"
-".\Debug\lc.obj"
-".\Debug\datetime.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP607.tmp"
+Creating command line "link.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP863.tmp"
 <h3>Output Window</h3>
 Compiling...
-abort.c
-address.c
-ai.c
-ao.c
-apdu.c
-arf.c
-av.c
 bacapp.c
 bacdcode.c
-bacerror.c
-bacfile.c
-bacstr.c
-bactext.c
-bi.c
-bigend.c
-bip-init.c
-bip.c
-bo.c
-bv.c
-crc.c
-Generating Code...
-Compiling...
-dcc.c
-device.c
-h_arf.c
-h_arf_a.c
-h_iam.c
-h_rp.c
-h_rp_a.c
-h_whois.c
-h_wp.c
-iam.c
-indtext.c
-lsp.c
-main.c
-mso.c
-noserv.c
-npdu.c
-reject.c
-ringbuf.c
-rp.c
-s_rp.c
-Generating Code...
-Compiling...
-s_whois.c
-s_wp.c
-tsm.c
-txbuf.c
-whois.c
-wp.c
-lc.c
-datetime.c
 Generating Code...
 Linking...
-Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP609.tmp" with contents
+Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP864.tmp" with contents
 [
 /nologo /o"Debug/bacnet.bsc" 
 ".\Debug\abort.sbr"
@@ -191,6 +95,7 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP609.tmp" with conten
 ".\Debug\bo.sbr"
 ".\Debug\bv.sbr"
 ".\Debug\crc.sbr"
+".\Debug\datetime.sbr"
 ".\Debug\dcc.sbr"
 ".\Debug\device.sbr"
 ".\Debug\h_arf.sbr"
@@ -202,6 +107,7 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP609.tmp" with conten
 ".\Debug\h_wp.sbr"
 ".\Debug\iam.sbr"
 ".\Debug\indtext.sbr"
+".\Debug\lc.sbr"
 ".\Debug\lsp.sbr"
 ".\Debug\main.sbr"
 ".\Debug\mso.sbr"
@@ -216,10 +122,8 @@ Creating temporary file "C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP609.tmp" with conten
 ".\Debug\tsm.sbr"
 ".\Debug\txbuf.sbr"
 ".\Debug\whois.sbr"
-".\Debug\wp.sbr"
-".\Debug\lc.sbr"
-".\Debug\datetime.sbr"]
-Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP609.tmp"
+".\Debug\wp.sbr"]
+Creating command line "bscmake.exe @C:\DOCUME~1\stk01\LOCALS~1\Temp\RSP864.tmp"
 Creating browse info file...
 <h3>Output Window</h3>