diff --git a/Source/Processors/Channel.cpp b/Source/Processors/Channel.cpp
index 11de6fc646b91402210848a5ef2ac374faa5906b..1136a0e1feafc24a3dbdf7d1494e56d8ba6dd00a 100644
--- a/Source/Processors/Channel.cpp
+++ b/Source/Processors/Channel.cpp
@@ -35,15 +35,17 @@ Channel::Channel(GenericProcessor* p, int n) : num(n), eventType(0), processor(p
 Channel::Channel(const Channel& ch)
 {
     processor = ch.processor;
+    isEventChannel = ch.isEventChannel;
     isEnabled = ch.isEnabled;
     isMonitored = false;
-    type = ch.type;
+    isADCchannel = ch.isADCchannel;
     sampleRate = ch.sampleRate;
     bitVolts = ch.bitVolts;
     name = ch.name;
     eventType = ch.eventType;
     nodeId = ch.nodeId;
     num = ch.num;
+
     originalStream = ch.originalStream;
     originalChannel = ch.originalChannel;
 
diff --git a/Source/Processors/Channel.h b/Source/Processors/Channel.h
index c502fffba3327a9bedbd99d03d7f4e53e9d69897..27df965a7d732c2c9cc91d0a13c382128a90d432 100644
--- a/Source/Processors/Channel.h
+++ b/Source/Processors/Channel.h
@@ -104,13 +104,17 @@ public:
     /** Pointer to the channel's parent processor. */
     GenericProcessor* processor;
 
+    int originalStream;
+    int originalChannel;
 
 
     // crucial information:
     float sampleRate;
     channelType type;
     
-    // boolean values:
+     // boolean values:
+    bool isEventChannel;
+    bool isADCchannel;
     bool isMonitored;
     bool isEnabled;
 
diff --git a/Source/Processors/RecordNode.cpp b/Source/Processors/RecordNode.cpp
index 249475f1ce0e2f0e8f9f9b20e8a1f4e71eeb3ae4..8c1f3ab552e57b117e164f45c341a92e849755e0 100755
--- a/Source/Processors/RecordNode.cpp
+++ b/Source/Processors/RecordNode.cpp
@@ -212,31 +212,31 @@ void RecordNode::addInputChannel(GenericProcessor* sourceNode, int chan)
 
 void RecordNode::updateFileName(Channel* ch)
 {
-    String filename = rootFolder.getFullPathName();
-    filename += rootFolder.separatorString;
+    // String filename = rootFolder.getFullPathName();
+    // filename += rootFolder.separatorString;
 
-    if (!ch->getType() == EVENT_CHANNEL)
-    {
-        filename += ch->nodeId;
-        filename += "_";
-        filename += ch->name;
+    // if (!ch->getType() == EVENT_CHANNEL)
+    // {
+    //     filename += ch->nodeId;
+    //     filename += "_";
+    //     filename += ch->name;
 
-        if (appendTrialNum)
-        {
-            filename += "_";
-            filename += trialNum;
-        }
+    //     if (appendTrialNum)
+    //     {
+    //         filename += "_";
+    //         filename += trialNum;
+    //     }
 
-        filename += ".continuous";
-    }
-    else
-    {
-        filename += "all_channels.events";
-    }
+    //     filename += ".continuous";
+    // }
+    // else
+    // {
+    //     filename += "all_channels.events";
+    // }
 
 
-    ch->filename = filename;
-    ch->file = 0;
+    // ch->filename = filename;
+    // ch->file = 0;
 
 
     //std::cout << "Updating " << filename << std::endl;
diff --git a/Source/Processors/RecordNode.h b/Source/Processors/RecordNode.h
index ab8b3c7a39715bb81d54682b69fd3f3ef5a87a2d..96d47f067e9f1875f5eb7148227b6043b07e5806 100755
--- a/Source/Processors/RecordNode.h
+++ b/Source/Processors/RecordNode.h
@@ -125,6 +125,13 @@ public:
         return rootFolder;
     }
 
+    void appendTrialNumber(bool);
+    
+    void updateTrialNumber();
+
+       /** Generate filename for a given channel */
+    void updateFileName(Channel* ch);
+
 	/** Adds a Record Engine to use
 	*/
     void registerRecordEngine(RecordEngine* engine);