diff --git a/src/burn/drv/toaplan/d_samesame.cpp b/src/burn/drv/toaplan/d_samesame.cpp
index f64924d1d..f087e5933 100644
--- a/src/burn/drv/toaplan/d_samesame.cpp
+++ b/src/burn/drv/toaplan/d_samesame.cpp
@@ -232,6 +232,70 @@ static struct BurnDIPInfo FireshrkDIPList[]=
 
 STDDIPINFO(Fireshrk)
 
+static struct BurnDIPInfo FireshrkaDIPList[]=
+{
+	{0x13, 0xff, 0xff, 0x01, NULL			},
+	{0x14, 0xff, 0xff, 0x00, NULL			},
+	{0x15, 0xff, 0xff, 0x03, NULL			},
+
+	{0   , 0xfe, 0   ,    2, "Cabinet"		},
+	{0x13, 0x01, 0x01, 0x01, "Upright"		},
+	{0x13, 0x01, 0x01, 0x00, "Cocktail"		},
+
+	{0   , 0xfe, 0   ,    2, "Flip Screen"		},
+	{0x13, 0x01, 0x02, 0x00, "Off"			},
+	{0x13, 0x01, 0x02, 0x02, "On"			},
+
+	{0   , 0xfe, 0   ,    2, "Demo Sounds"		},
+	{0x13, 0x01, 0x08, 0x08, "Off"			},
+	{0x13, 0x01, 0x08, 0x00, "On"			},
+
+	{0   , 0xfe, 0   ,    4, "Coin A"		},
+	{0x13, 0x01, 0x30, 0x30, "4 Coins 1 Credits"	},
+	{0x13, 0x01, 0x30, 0x20, "3 Coins 1 Credits"	},
+	{0x13, 0x01, 0x30, 0x10, "2 Coins 1 Credits"	},
+	{0x13, 0x01, 0x30, 0x00, "1 Coin  1 Credits"	},
+
+	{0   , 0xfe, 0   ,    4, "Coin B"		},
+	{0x13, 0x01, 0xc0, 0x00, "1 Coin  2 Credits"	},
+	{0x13, 0x01, 0xc0, 0x40, "1 Coin  3 Credits"	},
+	{0x13, 0x01, 0xc0, 0x80, "1 Coin  4 Credits"	},
+	{0x13, 0x01, 0xc0, 0xc0, "1 Coin  6 Credits"	},
+
+	{0   , 0xfe, 0   ,    4, "Difficulty"		},
+	{0x14, 0x01, 0x03, 0x01, "Easy"			},
+	{0x14, 0x01, 0x03, 0x00, "Medium"		},
+	{0x14, 0x01, 0x03, 0x02, "Hard"			},
+	{0x14, 0x01, 0x03, 0x03, "Hardest"		},
+
+	{0   , 0xfe, 0   ,    4, "Bonus Life"		},
+	{0x14, 0x01, 0x0c, 0x04, "50K, every 150K"	},
+	{0x14, 0x01, 0x0c, 0x00, "70K, every 200K"	},
+	{0x14, 0x01, 0x0c, 0x08, "100K"			},
+	{0x14, 0x01, 0x0c, 0x0c, "None"			},
+
+	{0   , 0xfe, 0   ,    4, "Lives"		},
+	{0x14, 0x01, 0x30, 0x30, "2"			},
+	{0x14, 0x01, 0x30, 0x00, "3"			},
+	{0x14, 0x01, 0x30, 0x20, "4"			},
+	{0x14, 0x01, 0x30, 0x10, "5"			},
+
+	{0   , 0xfe, 0   ,    2, "Invulnerability"	},
+	{0x14, 0x01, 0x40, 0x00, "Off"			},
+	{0x14, 0x01, 0x40, 0x40, "On"			},
+
+	{0   , 0xfe, 0   ,    2, "Allow Continue"	},
+	{0x14, 0x01, 0x80, 0x80, "No"			},
+	{0x14, 0x01, 0x80, 0x00, "Yes"			},
+
+
+	{0   , 0xfe, 0   ,    2, "Territory"		},
+	{0x15, 0x01, 0x03, 0x03, "Europe"		},
+	{0x15, 0x01, 0x03, 0x00, "USA"			},
+};
+
+STDDIPINFO(Fireshrka)
+
 #ifdef TOAPLAN_SOUND_SAMPLES_HACK
 static void StopAllSamples()
 {
@@ -975,11 +1039,11 @@ static struct BurnSampleInfo samesameSampleDesc[] = {
 STD_SAMPLE_PICK(samesame)
 STD_SAMPLE_FN(samesame)
 
-// Fire Shark (World, set 1)
+// Fire Shark 
 
 static struct BurnRomInfo fireshrkRomDesc[] = {
-	{ "09.bin",			0x08000, 0xf0c70e6f, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
-	{ "10.bin",			0x08000, 0x9d253d77, BRF_PRG | BRF_ESS },    //  1
+	{ "09.8j",			0x08000, 0xf0c70e6f, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
+	{ "10.8l",			0x08000, 0x9d253d77, BRF_PRG | BRF_ESS },    //  1
 	{ "o17_11ii.7j",	0x20000, 0x6beac378, BRF_PRG | BRF_ESS },    //  2
 	{ "o17_12ii.7l",	0x20000, 0x6adb6eb5, BRF_PRG | BRF_ESS },    //  3
 
@@ -1004,7 +1068,7 @@ STD_ROM_FN(fireshrk)
 
 struct BurnDriver BurnDrvFireshrk = {
 	"fireshrk", NULL, NULL, "fireshrk", "1990",
-	"Fire Shark (World, set 1)\0", "No sound", "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"Fire Shark\0", "No sound", "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
 	NULL, fireshrkRomInfo, fireshrkRomName, samesameSampleInfo, samesameSampleName, SamesameInputInfo, FireshrkDIPInfo,
@@ -1013,7 +1077,7 @@ struct BurnDriver BurnDrvFireshrk = {
 };
 
 
-// Fire Shark (World, set 2)
+// Fire Shark (Earlier)
 
 static struct BurnRomInfo fireshrkaRomDesc[] = {
 	{ "o17_09ii.8j",	0x08000, 0xb60541ee, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
@@ -1042,10 +1106,10 @@ STD_ROM_FN(fireshrka)
 
 struct BurnDriver BurnDrvFireshrka = {
 	"fireshrka", "fireshrk", NULL, "fireshrk", "1989",
-	"Fire Shark (Wolrd, set 2)\0", "No sound", "Toaplan", "Toaplan BCU-2 / FCU-2 based",
+	"Fire Shark (Earlier)\0", "No sound", "Toaplan", "Toaplan BCU-2 / FCU-2 based",
 	NULL, NULL, NULL, NULL,
 	BDF_GAME_WORKING | BDF_CLONE | TOA_ROTATE_GRAPHICS_CCW, 2, HARDWARE_TOAPLAN_RAIZING, GBF_VERSHOOT, 0,
-	NULL, fireshrkaRomInfo, fireshrkaRomName, samesameSampleInfo, samesameSampleName, SamesameInputInfo, FireshrkDIPInfo,
+	NULL, fireshrkaRomInfo, fireshrkaRomName, samesameSampleInfo, samesameSampleName, SamesameInputInfo, FireshrkaDIPInfo,
 	DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &ToaRecalcPalette, 0x800,
 	240, 320, 3, 4
 };
@@ -1094,8 +1158,8 @@ struct BurnDriver BurnDrvFireshrkd = {
 static struct BurnRomInfo fireshrkdhRomDesc[] = {
 	{ "o17_09dyh.8j",	0x10000, 0x7b4c14dd, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
 	{ "o17_10dyh.8l",	0x10000, 0xa3f159f9, BRF_PRG | BRF_ESS },    //  1
-	{ "o17_11x.bin",	0x20000, 0x6beac378, BRF_PRG | BRF_ESS },    //  2
-	{ "o17_12x.bin",	0x20000, 0x6adb6eb5, BRF_PRG | BRF_ESS },    //  3
+	{ "o17_11ii.7j",	0x20000, 0x6beac378, BRF_PRG | BRF_ESS },    //  2
+	{ "o17_12ii.7l",	0x20000, 0x6adb6eb5, BRF_PRG | BRF_ESS },    //  3
 
 	{ "o17_05.12j",		0x20000, 0x565315f8, BRF_GRA },              //  4 Tile data
 	{ "o17_06.13j",		0x20000, 0x95262d4c, BRF_GRA },              //  5
@@ -1130,10 +1194,10 @@ struct BurnDriver BurnDrvFireshrkdh = {
 // Same! Same! Same! (2 player alternating ver.)
 
 static struct BurnRomInfo samesameRomDesc[] = {
-	{ "o17_09.bin",		0x08000, 0x3f69e437, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
-	{ "o17_10.bin",		0x08000, 0x4e723e0a, BRF_PRG | BRF_ESS },    //  1
-	{ "o17_11.bin",		0x20000, 0xbe07d101, BRF_PRG | BRF_ESS },    //  2
-	{ "o17_12.bin",		0x20000, 0xef698811, BRF_PRG | BRF_ESS },    //  3
+	{ "o17_09.8j",		0x08000, 0x3f69e437, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
+	{ "o17_10.8l",		0x08000, 0x4e723e0a, BRF_PRG | BRF_ESS },    //  1
+	{ "o17_11.7j",		0x20000, 0xbe07d101, BRF_PRG | BRF_ESS },    //  2
+	{ "o17_12.7l",		0x20000, 0xef698811, BRF_PRG | BRF_ESS },    //  3
 
 	{ "o17_05.12j",		0x20000, 0x565315f8, BRF_GRA },              //  4 Tile data
 	{ "o17_06.13j",		0x20000, 0x95262d4c, BRF_GRA },              //  5
@@ -1168,8 +1232,8 @@ struct BurnDriver BurnDrvSamesame = {
 // Same! Same! Same!
 
 static struct BurnRomInfo samesame2RomDesc[] = {
-	{ "o17_09x.bin",	0x08000, 0x3472e03e, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
-	{ "o17_10x.bin",	0x08000, 0xa3ac49b5, BRF_PRG | BRF_ESS },    //  1
+	{ "o17_09x.8j",		0x08000, 0x3472e03e, BRF_PRG | BRF_ESS },    //  0 CPU #0 code
+	{ "o17_10x.8l",		0x08000, 0xa3ac49b5, BRF_PRG | BRF_ESS },    //  1
 	{ "o17_11ii.7j",	0x20000, 0x6beac378, BRF_PRG | BRF_ESS },    //  2
 	{ "o17_12ii.7l",	0x20000, 0x6adb6eb5, BRF_PRG | BRF_ESS },    //  3