diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index 9e380a789b4..0db445ea759 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -627,6 +627,7 @@ static MSM6242_INTERFACE( amiga_rtc_intf )
 	DEVCB_NULL
 };
 
+
 static MACHINE_CONFIG_START( ntsc, amiga_state )
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", M68000, AMIGA_68000_NTSC_CLOCK)
@@ -637,8 +638,8 @@ static MACHINE_CONFIG_START( ntsc, amiga_state )
 	MCFG_DEVICE_DISABLE()
 
 	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_REFRESH_RATE(59.997)
-	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+//	MCFG_SCREEN_REFRESH_RATE(59.997)
+//	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
 
 	MCFG_MACHINE_RESET_OVERRIDE(amiga_state, amiga )
 
@@ -646,8 +647,9 @@ static MACHINE_CONFIG_START( ntsc, amiga_state )
 
     /* video hardware */
 	MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
-	MCFG_SCREEN_SIZE(228*4, 262)
-	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
+//	MCFG_SCREEN_SIZE(228*4, 262)
+//	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
+	MCFG_SCREEN_RAW_PARAMS(AMIGA_68000_NTSC_CLOCK*2,228*4,214,228*4,262,34,262)
 	MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga)
 
 	MCFG_PALETTE_LENGTH(4096)
@@ -747,9 +749,10 @@ static MACHINE_CONFIG_DERIVED( pal, ntsc )
 	// Change the FDC clock too?
 
 	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_REFRESH_RATE(50)
-	MCFG_SCREEN_SIZE(228*4, 312)
-	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1)
+	MCFG_SCREEN_RAW_PARAMS(AMIGA_68000_PAL_CLOCK*2,228*4,214,228*4,312,34,312)
+//	MCFG_SCREEN_REFRESH_RATE(50)
+//	MCFG_SCREEN_SIZE(228*4, 312)
+//	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1)
 
 	/* cia */
 	MCFG_DEVICE_REMOVE("cia_0")
@@ -828,11 +831,15 @@ static MACHINE_CONFIG_START( a1200n, a1200_state )
 
 	MCFG_MACHINE_RESET_OVERRIDE(amiga_state, amiga )
 
+	/* TODO: params */
 	MCFG_SCREEN_ADD("screen", RASTER)
-	MCFG_SCREEN_REFRESH_RATE(59.997)
-	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-	MCFG_SCREEN_SIZE(512*2, 312)
-	MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1)
+//	MCFG_SCREEN_REFRESH_RATE(59.997)
+//	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+//	MCFG_SCREEN_SIZE(512*2, 312)
+//	MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1)
+//	MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8)
+	MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,228*4,214,228*4,262,34,262)
+
 	MCFG_SCREEN_UPDATE_DRIVER(a1200_state, screen_update_amiga_aga)
 
 	MCFG_VIDEO_START_OVERRIDE(a1200_state,amiga_aga)
@@ -885,8 +892,10 @@ static MACHINE_CONFIG_DERIVED( a1200, a1200n )
 	MCFG_CPU_CLOCK(AMIGA_68EC020_PAL_CLOCK) /* 14.18758 MHz */
 
 	/* video hardware */
+	/* TODO: params */
 	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_REFRESH_RATE(50)
+//	MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_PAL_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8)
+	MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_PAL_CLOCK,228*4,214,228*4,312,34,312)
 
 	/* sound hardware */
 	MCFG_SOUND_MODIFY("amiga")
@@ -929,8 +938,9 @@ static MACHINE_CONFIG_START( a3000n, amiga_state )
 
     /* video hardware */
 	MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
-	MCFG_SCREEN_SIZE(228*4, 262)
-	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
+	MCFG_SCREEN_RAW_PARAMS(A3000_XTAL,228*4,214,228*4,262,34,262)
+//	MCFG_SCREEN_SIZE(228*4, 262)
+//	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
 	MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga)
 
 	MCFG_PALETTE_LENGTH(4096)
@@ -971,9 +981,10 @@ MACHINE_CONFIG_END
 static MACHINE_CONFIG_DERIVED( a3000, a3000n )
 
 	MCFG_SCREEN_MODIFY("screen")
-	MCFG_SCREEN_REFRESH_RATE(50)
-	MCFG_SCREEN_SIZE(228*4, 312)
-	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1)
+	MCFG_SCREEN_RAW_PARAMS(A3000_XTAL,228*4,214,228*4,312,34,312)
+//	MCFG_SCREEN_REFRESH_RATE(50)
+//	MCFG_SCREEN_SIZE(228*4, 312)
+//	MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1)
 
 	/* cia */
 	MCFG_DEVICE_REMOVE("cia_0")