diff --git a/source/SAMP.h b/source/SAMP.h
index 1dd6ea1..b0a7234 100644
--- a/source/SAMP.h
+++ b/source/SAMP.h
@@ -16,31 +16,31 @@
 #define MAX_PLAYER_NAME 30
 #define MAX_SERVERNAME_LENGTH 50
 
-#define SAMP_SERVERNAME_ADDR 0x212AB8
-#define SAMP_SERVERIP_ADDR 0x2121F5
-#define SAMP_PLAYERSONLINE_OFFSET 0x4
-#define SAMP_PLAYERSONLINE_ADDR 0x212A3C
-#define SAMP_PLAYERNAME_ADDR 0x21242F
-#define SAMP_SENDCHAT_FUNC_ADDR 0x4C30
-#define SAMP_SENDCMD_FUNC_ADDR 0x63390
-#define SAMP_PLAYERID_OFFSET 0x4
+#define SAMP_SERVERNAME_ADDR 0x21A0F8 //updated
+#define SAMP_SERVERIP_ADDR 0x2121F5 //not updated
+#define SAMP_PLAYERSONLINE_OFFSET 0x4 //not updated
+#define SAMP_PLAYERSONLINE_ADDR 0x212A3C //not updated
+#define SAMP_PLAYERNAME_ADDR 0x219A6F //updated
+#define SAMP_SENDCHAT_FUNC_ADDR 0x57F0 //updated
+#define SAMP_SENDCMD_FUNC_ADDR 0x65C60 //updated
+#define SAMP_PLAYERID_OFFSET 0x4 
 #define SAMP_PLAYERSCORE_OFFSET 0x2A
 #define SAMP_PLAYERPING_OFFSET 0x26
-#define SAMP_SCOREBOARD_OFFSET 0x7D10
-#define SAMP_SCOREBOARD_PLAYERPOOLS_OFFSET 0x3D9
-#define SAMP_SCOREBOARD_PLAYERPOOL_OFFSET 0x14
-#define SAMP_SCOREBOARD_PLAYER_OFFSET 0x2E
-#define SAMP_SCOREBOARD_PLAYER_NAME_OFFSET 0x14
-#define SAMP_SCOREBOARD_PLAYER_NAMELNG_OFFSET 0x24
-#define SAMP_SCOREBOARD_PLAYER_SCORE_OFFSET 0x4
-#define SAMP_SCOREBOARD_PLAYER_PING_OFFSET 0xC
-#define SAMP_ISINCHAT_ADDR 0x212ACC
-#define SAMP_ISINCHAT_OFFSET 0x55
-#define SAMP_SERVERNAME_ADDR 0x212AB8
-#define SAMP_SERVERNAME_OFFSET 0x2C6
-#define SAMP_DIALOG_OBJECT 0x212A78
-#define SAMP_CHATINFO_OBJECT 0x212AA4
-#define SAMP_ADDCHATMESSAGE_FUNC_ADDR 0x61FC0
+#define SAMP_SCOREBOARD_OFFSET 0x8A10 //not tested
+#define SAMP_SCOREBOARD_PLAYERPOOLS_OFFSET 0x3CD //updated
+#define SAMP_SCOREBOARD_PLAYERPOOL_OFFSET 0x18 // updated
+#define SAMP_SCOREBOARD_PLAYER_OFFSET 0x2E // not tested
+#define SAMP_SCOREBOARD_PLAYER_NAME_OFFSET 0xC // updated
+#define SAMP_SCOREBOARD_PLAYER_NAMELNG_OFFSET 0x1C // updated
+#define SAMP_SCOREBOARD_PLAYER_SCORE_OFFSET 0x24 // updated
+#define SAMP_SCOREBOARD_PLAYER_PING_OFFSET 0x28 // updated
+#define SAMP_ISINCHAT_ADDR 0x21A10C // updated
+#define SAMP_ISINCHAT_OFFSET 0x55 
+#define SAMP_SERVERNAME_ADDR 0x21A0F8 //not tested
+#define SAMP_SERVERNAME_OFFSET 0x2C6 //not updated 
+#define SAMP_DIALOG_OBJECT 0x21A0B8
+#define SAMP_CHATINFO_OBJECT 0x21A0E4
+#define SAMP_ADDCHATMESSAGE_FUNC_ADDR 0x64520
 
 struct PlayerDatas {
 	char _PlayerData_Name[MAX_PLAYER_NAME];
@@ -78,4 +78,4 @@ class SAMP {
 	int API_ShowDialog(int style, const char *caption, const char *info, const char *button);
 	int API_ShowGameText(const char *text, int time, int style);
 	int API_IsInChat();
-};
\ No newline at end of file
+};