diff --git a/src/mame/drivers/30test.c b/src/mame/drivers/30test.c
index 65766cda340..42fbee9db14 100644
--- a/src/mame/drivers/30test.c
+++ b/src/mame/drivers/30test.c
@@ -6,20 +6,23 @@
 
 	TODO:
 	- clickable artwork;
-	- remaining lamps;
 	- portd meaning is a mystery
 	- inputs are annoying to map;
+	- EEPROM
 
 ============================================================================
 
+cheats:
+- [0xb0-0xb3] timer
+
 lamps:
 ?OK???!! = really OK! (91+)
 ???????? = pretty good (80+)
-???~??? = not bad (70+)
-??? = normal (55+)
-????? = pretty bad (40+)
-???~ = worst (39 or less)
-??????? = game over
+???~??? = not bad (70+) (0x84)
+??? = normal (55+) (0x88)
+????? = pretty bad (40+) (0x90)
+???~ = worst (39 or less) (0xa0)
+??????? = game over (0xe0)
 
 
 ============================================================================
@@ -114,7 +117,16 @@ static WRITE8_HANDLER( namco_30test_led_rank_w )
 
 static WRITE8_HANDLER( namco_30test_lamps_w )
 {
-	popmessage("%02x",data);
+	if(!(data & 0x80)) // guess: lamps mask
+		data = 0;
+
+	output_set_lamp_value(0, (data & 0x01) >> 0); // really OK! lamp
+	output_set_lamp_value(1, (data & 0x02) >> 1); // pretty good lamp
+	output_set_lamp_value(2, (data & 0x04) >> 2); // not bad lamp
+	output_set_lamp_value(3, (data & 0x08) >> 3); // normal lamp
+	output_set_lamp_value(4, (data & 0x10) >> 4); // pretty bad lamp
+	output_set_lamp_value(5, (data & 0x20) >> 5); // worst lamp
+	output_set_lamp_value(6, (data & 0x40) >> 6); // game over lamp
 }
 
 static READ8_DEVICE_HANDLER( hc11_okibank_r )
@@ -244,7 +256,7 @@ static MACHINE_RESET( 30test )
 static const hc11_config namco_30test_config =
 {
 	0, 	   //has extended internal I/O
-	768,   //internal RAM size
+	0,//768,   //internal RAM size
 	0x00   //registers are at 0-0x100
 };
 
diff --git a/src/mame/layout/30test.lay b/src/mame/layout/30test.lay
index 0e0db2fe95d..21dae7e10cd 100644
--- a/src/mame/layout/30test.lay
+++ b/src/mame/layout/30test.lay
@@ -6,6 +6,15 @@
 		</led7seg>
 	</element>
 
+	<element name="rank">
+		<rect state="1">
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.1" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
 	<view name="Simple LEDs">
 		<screen index="0">
 			<bounds left="0" top="0" right="3.2" bottom="4.3" />
@@ -344,5 +353,35 @@
 		<bezel name="digit71" element="digit">
 			<bounds x="0.4" y="0.3" width="0.4" height="0.4" />
 		</bezel>
+	
+		<bezel name="lamp0" element="rank">
+			<bounds x="1.5" y="0.3" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp1" element="rank">
+			<bounds x="1.5" y="0.4" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp2" element="rank">
+			<bounds x="1.5" y="0.5" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp3" element="rank">
+			<bounds x="1.5" y="0.6" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp4" element="rank">
+			<bounds x="1.5" y="0.7" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp5" element="rank">
+			<bounds x="1.5" y="0.8" width="0.1" height="0.1" />
+		</bezel>
+
+		<bezel name="lamp6" element="rank">
+			<bounds x="1.5" y="0.9" width="0.1" height="0.1" />
+		</bezel>
+
+
 	</view>
 </mamelayout>