diff --git a/public/iclient.h b/public/iclient.h
index 510555d4..38a51070 100644
--- a/public/iclient.h
+++ b/public/iclient.h
@@ -76,8 +76,6 @@ public:
 	virtual bool	IsFakeClient( void ) const = 0;
 	// returns true, if client is a HLTV proxy
 	virtual bool	IsHLTV( void ) const = 0;
-	// returns true, if client is a Replay proxy
-	virtual bool	IsReplay( void ) const = 0;
 	// returns true, if client hears this player
 	virtual bool	IsHearingClient(int index) const = 0;
 	// returns true, if client hears this player by proximity
diff --git a/public/inetchannel.h b/public/inetchannel.h
index 218d7a21..ec25525a 100644
--- a/public/inetchannel.h
+++ b/public/inetchannel.h
@@ -19,6 +19,7 @@ class	IDemoRecorder;
 class	INetMessage;
 class	INetChannelHandler;
 class	INetChannelInfo;
+class	INetMessageBinder;
 typedef struct netpacket_s netpacket_t;
 
 #ifndef NET_PACKET_ST_DEFINED
@@ -44,19 +45,16 @@ public:
 	virtual	~INetChannel( void ) {};
 
 	virtual void	SetDataRate(float rate) = 0;
-	virtual bool	RegisterMessage(INetMessage *msg) = 0;
-	virtual bool	StartStreaming( unsigned int challengeNr ) = 0;
-	virtual void	ResetStreaming( void ) = 0;
+	virtual bool	RegisterMessage(INetMessageBinder *msg) = 0;
+	virtual bool	UnregisterMessage(INetMessageBinder *msg) = 0;
 	virtual void	SetTimeout(float seconds, bool bForceExact = false) = 0;
 	virtual void	SetDemoRecorder(IDemoRecorder *recorder) = 0;
-	virtual void	SetChallengeNr(unsigned int chnr) = 0;
 	
 	virtual void	Reset( void ) = 0;
 	virtual void	Clear( void ) = 0;
 	virtual void	Shutdown(const char *reason) = 0;
 	
-	virtual void	ProcessPlayback( void ) = 0;
-	virtual bool	ProcessStream( void ) = 0;
+	virtual bool	ProcessDemoStream( struct netpacket_s* packet ) = 0;
 	virtual void	ProcessPacket( struct netpacket_s* packet, bool bHasHeader ) = 0;
 			
 	virtual bool	SendNetMsg(INetMessage &msg, bool bForceReliable = false, bool bVoice = false ) = 0;
diff --git a/public/inetchannelinfo.h b/public/inetchannelinfo.h
index 9f74e393..c5505794 100644
--- a/public/inetchannelinfo.h
+++ b/public/inetchannelinfo.h
@@ -52,7 +52,6 @@ public:
 	
 	virtual bool		IsLoopback( void ) const = 0;	// true if loopback channel
 	virtual bool		IsTimingOut( void ) const = 0;	// true if timing out
-	virtual bool		IsPlayback( void ) const = 0;	// true if demo playback
 
 	virtual float		GetLatency( int flow ) const = 0;	 // current latency (RTT), more accurate but jittering
 	virtual float		GetAvgLatency( int flow ) const = 0; // average packet latency in seconds
diff --git a/public/inetmsghandler.h b/public/inetmsghandler.h
index 16a7e8d3..4131d582 100644
--- a/public/inetmsghandler.h
+++ b/public/inetmsghandler.h
@@ -41,6 +41,8 @@ public:
 	virtual void FileDenied(const char *fileName, unsigned int transferID, bool isReplayDemoFile) = 0;	// a file request was denied by other side
 
 	virtual void FileSent(const char *fileName, unsigned int transferID, bool isReplayDemoFile) = 0;	// we sent a file
+	
+	virtual bool ChangeSplitscreenUser(int nSplitScreenUserSlot) = 0;
 };
 
 #define PROCESS_NET_MESSAGE( name )	\