diff --git a/lib/smartapi-connect.js b/lib/smartapi-connect.js
index 265206c..5ac5e91 100644
--- a/lib/smartapi-connect.js
+++ b/lib/smartapi-connect.js
@@ -3,10 +3,14 @@
 let axios = require('axios');
 let querystring = require('querystring');
 let address = require('address');
-let publicIp = require('public-ip');
 const https = require('https');
 let { API } = require('../config/api');
 const { errorLogger } = require('./winston_log');
+const publicIp = {}
+process.nextTick(async () => {
+	const object = await import('public-ip');
+	Object.assign(publicIp, object);
+  });
 /**
  * @constructor
  * @name SmartApi
@@ -45,7 +49,7 @@ var SmartApi = function (params) {
 	});
 
 	(async () => {
-		self.public_ip = await publicIp.v4();
+		self.public_ip = await publicIp.publicIpv4();
 	})();
 
 	var requestInstance = axios.create({
@@ -226,7 +230,7 @@ var SmartApi = function (params) {
 		token_data.then((response) => {
 			if (response.status) {
 				self.setAccessToken(response.data.jwtToken);
-				self.setPublicToken(token_data.data.refreshToken);
+				self.setPublicToken(response.data.refreshToken);
 			}
 		});
 
diff --git a/lib/websocket2.0.js b/lib/websocket2.0.js
index ab7fb1b..0335ae1 100644
--- a/lib/websocket2.0.js
+++ b/lib/websocket2.0.js
@@ -9,14 +9,14 @@ let triggers = {
 
 let WebSocketV2 = function (params) {
 	try {
-		let { clientcode, jwttoken, apikey, feedtype } = params;
+		let { clientcode, jwttoken, apikey, feedtype, feedtoken } = params;
 		let self = this;
 		let ws = null;
 		let headers = {
 			'x-client-code': clientcode,
 			Authorization: jwttoken,
 			'x-api-key': apikey,
-			'x-feed-token': feedtype,
+			'x-feed-token': feedtype || feedtoken, // MAKE SURE BACKWARD COMPATIBILITY IS THERE
 		};
 		const url = CONSTANTS?.websocketURL;
 		let ping_Interval = CONSTANTS?.Interval;
diff --git a/package.json b/package.json
index b7ffd84..f3586be 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 		"nyc": "^15.1.0",
 		"pako": "^2.1.0",
 		"proxyquire": "^2.1.3",
-		"public-ip": "^4.0.2",
+		"public-ip": "^6.0.2",
 		"querystring": "^0.2.0",
 		"sinon": "^17.0.1",
 		"winston": "^3.11.0",