diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h
index 852e6f5f3..27d9a861f 100644
--- a/src/zapit/include/zapit/getservices.h
+++ b/src/zapit/include/zapit/getservices.h
@@ -168,8 +168,9 @@ class CServiceManager
 
 		std::string GetServiceName(t_channel_id channel_id);
 
-		bool GetAllRadioChannels(ZapitChannelList &list, int flags = 0);
-		bool GetAllTvChannels(ZapitChannelList &list, int flags = 0);
+		tallchans* GetAllChannels(){ return &allchans; };
+		bool GetAllRadioChannels(ZapitChannelList &list);
+		bool GetAllTvChannels(ZapitChannelList &list);
 		bool GetAllHDChannels(ZapitChannelList &list);
 		bool GetAllSatelliteChannels(ZapitChannelList &list, t_satellite_position position);
 		bool GetAllTransponderChannels(ZapitChannelList &list, transponder_id_t tpid);
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index a89172b67..10054881c 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -108,12 +108,11 @@ class CZapit : public OpenThreads::Thread
 
 		int currentMode;
 		bool playbackStopForced;
-		diseqc_t diseqcType;
+		//diseqc_t diseqcType;
 
-		int video_mode;
-		Zapit_config config;
-		CConfigFile configfile;
-	
+		//int video_mode;
+		//Zapit_config config;
+		//CConfigFile configfile;
 		CEventServer *eventServer;
 		CBasicServer zapit_server;
 
@@ -125,18 +124,17 @@ class CZapit : public OpenThreads::Thread
 
 		audio_map_t audio_map;
 		bool current_is_nvod;
-		bool standby;
-		t_channel_id  lastChannelRadio;
-		t_channel_id  lastChannelTV;
+		//bool standby;
+		uint32_t  lastChannelRadio;
+		uint32_t  lastChannelTV;
 		int abort_zapit;
 		int pmt_update_fd;
 
-		void LoadAudioMap();
-		void SaveAudioMap();
-		void SaveSettings(bool write);
-		void SaveChannelPids(CZapitChannel* channel);
+		//void LoadAudioMap();
+		void SaveSettings(bool write_conf, bool write_audio);
+		//void SaveChannelPids(CZapitChannel* channel);
 		void RestoreChannelPids(CZapitChannel* channel);
-		void ConfigFrontend();
+		//void ConfigFrontend();
 
 		bool TuneChannel(CFrontend *frontend, CZapitChannel * channel, bool &transponder_change);
 		bool ParsePatPmt(CZapitChannel * channel);
@@ -150,29 +148,41 @@ class CZapit : public OpenThreads::Thread
 		void SendConfig(int connfd);
 
 		bool StartPlayBack(CZapitChannel *thisChannel);
-		bool StopPlayBack(bool send_pmt);
+		//bool StopPlayBack(bool send_pmt);
 		void SendPMT(bool forupdate = false);
 		void SetAudioStreamType(CZapitAudioChannel::ZapitAudioChannelType audioChannelType);
 
 		void enterStandby();
-		void leaveStandby();
+		//void leaveStandby();
 		unsigned int ZapTo(const unsigned int bouquet, const unsigned int pchannel);
 		unsigned int ZapTo(t_channel_id channel_id, bool isSubService = false);
 		unsigned int ZapTo(const unsigned int pchannel);
 		void PrepareScan();
 
-		CZapitSdtMonitor SdtMonitor;
+		//CZapitSdtMonitor SdtMonitor;
 
 		void run();
 	protected:
+		diseqc_t diseqcType;
+		int video_mode;
+		CConfigFile configfile;
+		bool standby;
+		Zapit_config config;
+		CZapitSdtMonitor SdtMonitor;
+		void LoadAudioMap();
+		void SaveChannelPids(CZapitChannel* channel);
+		virtual void ConfigFrontend();
+		bool StopPlayBack(bool send_pmt);
+		virtual void leaveStandby();
+
 		static CZapit * zapit;
 		CZapit();
 	public:
 		~CZapit();
 		static CZapit * getInstance();
 
-		void LoadSettings();
-		bool Start(Z_start_arg* ZapStart_arg);
+		virtual void LoadSettings();
+		virtual bool Start(Z_start_arg* ZapStart_arg);
 		bool Stop();
 		bool ParseCommand(CBasicMessage::Header &rmsg, int connfd);
 		bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true);