diff --git a/YSFGateway/FCSNetwork.cpp b/YSFGateway/FCSNetwork.cpp
index 1ab7d83..38305ff 100644
--- a/YSFGateway/FCSNetwork.cpp
+++ b/YSFGateway/FCSNetwork.cpp
@@ -35,6 +35,7 @@ m_debug(debug),
 m_address(),
 m_ping(NULL),
 m_options(NULL),
+m_opt(),
 m_info(NULL),
 m_reflector(),
 m_print(),
@@ -69,21 +70,8 @@ CFCSNetwork::~CFCSNetwork()
 
 bool CFCSNetwork::open()
 {
-	LogMessage("Resolving FCS00x addresses");
-
-	/* OE1KBC not needed see ::writeLink
-	m_addresses["FCS001"] = CUDPSocket::lookup("fcs001.xreflector.net");
-	m_addresses["FCS002"] = CUDPSocket::lookup("fcs002.xreflector.net");
-	m_addresses["FCS003"] = CUDPSocket::lookup("fcs003.xreflector.net");
-	m_addresses["FCS004"] = CUDPSocket::lookup("fcs004.xreflector.net");
-	m_addresses["FCS005"] = CUDPSocket::lookup("fcs005.xreflector.net");
-	m_addresses["FCS222"] = CUDPSocket::lookup("fcs222.xreflector.net");
-	m_addresses["FCS224"] = CUDPSocket::lookup("fcs224.xreflector.net");
-	m_addresses["FCS232"] = CUDPSocket::lookup("fcs232.xreflector.net");
-	m_addresses["FCS260"] = CUDPSocket::lookup("fcs260.xreflector.net");
-	m_addresses["FCS262"] = CUDPSocket::lookup("fcs262.xreflector.net");
-	m_addresses["FCS310"] = CUDPSocket::lookup("fcs310.xreflector.net");
-	*/
+	LogMessage("Resolving FCS999 address");
+
 	m_addresses["FCS999"] = CUDPSocket::lookup("fcs999.xreflector.net");
 	
 	LogMessage("Opening FCS network connection");
@@ -109,11 +97,7 @@ void CFCSNetwork::write(const unsigned char* data)
 	unsigned char buffer[130U];
 	::memset(buffer + 0U, ' ', 130U);
 	::memcpy(buffer + 0U, data + 35U, 120U);
-	
-	// OE1KBC 2020-09-05 frame# was missing
 	::memcpy(buffer + 120U, data + 34U, 1U);
-	//
-	
 	::memcpy(buffer + 121U, m_reflector.c_str(), 8U);
 
 	if (m_debug)
diff --git a/YSFGateway/FCSNetwork.h b/YSFGateway/FCSNetwork.h
index 0dd0d18..b43beb3 100644
--- a/YSFGateway/FCSNetwork.h
+++ b/YSFGateway/FCSNetwork.h
@@ -41,6 +41,8 @@ public:
 
 	bool open();
 
+	void setOptions(const std::string& options);
+
 	void clearDestination();
 
 	void write(const unsigned char* data);
@@ -60,6 +62,8 @@ private:
 	bool                           m_debug;
 	in_addr                        m_address;
 	unsigned char*                 m_ping;
+	unsigned char*                 m_options;
+	std::string                    m_opt;
 	unsigned char*                 m_info;
 	std::string                    m_reflector;
 	std::string                    m_print;
@@ -70,6 +74,7 @@ private:
 	CTimer                         m_resetTimer;
 	FCS_STATE                      m_state;
 
+	void writeOptions();
 	void writeInfo();
 	void writePing();
 };