diff --git a/src/XMLConfigParser.cpp b/src/XMLConfigParser.cpp
index 525e75e..42ad314 100644
--- a/src/XMLConfigParser.cpp
+++ b/src/XMLConfigParser.cpp
@@ -23,7 +23,7 @@ XMLConfigParser::~XMLConfigParser()
 //*****************************************************************************
 bool XMLConfigParser::Load_Config()
 {
-	const std::string FILE_NAME = "/home/mistlab/catkin_ws/src/xbee_ros_node/Resources/XBee_Config.xml";
+	const std::string FILE_NAME = "/home/ubuntu/ROS_WS/src/xbeemav/Resources/XBee_Config.xml";
 
 	if (Check_Config_File_Exists(FILE_NAME))
 	{
diff --git a/src/Xbee.cpp b/src/Xbee.cpp
index 60c823c..d4b1d38 100644
--- a/src/Xbee.cpp
+++ b/src/Xbee.cpp
@@ -17,7 +17,7 @@ int main(int argc, char* argv[])
 
 	Mist::Xbee::CommunicationManager communication_manager;
 	const std::string& device = "/dev/ttyUSB0"; // TO DO can be introduced as command.
-	const std::size_t baud_rate = 19200; // TO DO Can be introduced as command.
+	const std::size_t baud_rate = 115200; // TO DO Can be introduced as command.
 	Mist::Xbee::CommunicationManager::DRONE_TYPE drone_type = 
 			Mist::Xbee::CommunicationManager::DRONE_TYPE::SLAVE;
 	Mist::Xbee::CommunicationManager::RUNNING_MODE running_mode =