Index: branches/FEPSimulator/DataPacker.cpp
===================================================================
--- branches/FEPSimulator/DataPacker.cpp	(revision 115)
+++ branches/FEPSimulator/DataPacker.cpp	(revision 117)
@@ -8,5 +8,5 @@
     DataPacker packer;
     msg = packer.staticDataPack(station);
-/*    pos = packer.dynamicDataPack(station, 5, pos);    
+    pos = packer.dynamicDataPack(station, 5, pos);    
     pos = packer.dynamicDataPack(station, 6, pos);
     pos = packer.dynamicDataPack(station, 7, pos);
@@ -20,5 +20,5 @@
     // will need to check if queue override is enabled (Currently, no queue
     // ldsMap[i].dataPack[16-1] = ;
-*/
+
     // byte 23: MAINLINE total volume
     msg[23 - 1] = station->MlTotVol;
Index: branches/FEPSimulator/nbproject/Makefile-Debug.mk
===================================================================
--- branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 115)
+++ branches/FEPSimulator/nbproject/Makefile-Debug.mk	(revision 117)
@@ -58,5 +58,5 @@
 
 # Link Libraries and Options
-LDLIBSOPTIONS=tinyxml/libosxtinyxml.a
+LDLIBSOPTIONS=tinyxml/tinyxml.a
 
 # Build Targets
@@ -64,5 +64,5 @@
 	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a
 
 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES}
Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/configurations.xml	(revision 115)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 117)
@@ -53,5 +53,5 @@
         <linkerTool>
           <linkerLibItems>
-            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem>
+            <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem>
           </linkerLibItems>
         </linkerTool>
Index: branches/FEPSimulator/nbproject/private/private.xml
===================================================================
--- branches/FEPSimulator/nbproject/private/private.xml	(revision 115)
+++ branches/FEPSimulator/nbproject/private/private.xml	(revision 117)
@@ -8,9 +8,5 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
         </group>
     </open-files>
Index: branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d
===================================================================
--- branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d	(revision 113)
+++ branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d	(revision 117)
@@ -1,4 +1,4 @@
 build/Debug/GNU-MacOSX/Main.o: Main.cpp FEPSim.h fep.h NetworkReader.h \
- network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
+  network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
 
 FEPSim.h: