286 files changed, 37683 insertions, 23857 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 20adee80..f4b28dd4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -27,26 +27,26 @@ install:
     premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
 
 build:
-  project: build/re3.sln
+  project: build/reVC.sln
   verbosity: minimal
 after_build:
-- 7z a "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb
+- 7z a "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/reVC.exe bin/%PLATFORM%/%CONFIGURATION%/reVC.pdb
 artifacts:
-- path: "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
-  name: re3
+- path: "reVC_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip"
+  name: reVC
 deploy:
 - provider: BinTray
   username: shfil119
   api_key:
     secure: xWnYDfNWM87iPoBFbz6L1XAduxijJRWSpQLhMDOjznmzbMCsORtdx2tmWmFLTwf6
   subject: gtamodding
-  repo: re3
+  repo: revc
   package: "%configuration%_%platform%"
   version: "%APPVEYOR_BUILD_VERSION%"
-  artifact: re3
+  artifact: reVC
   publish: true
   on:
-    branch: master
+    branch: miami
     APPVEYOR_REPO_TAG: false
 
 cache:
diff --git a/README.md b/README.md
index 3dcc9f58..e96afb58 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
 <a href="https://discord.gg/jYpXxTm"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a>
 | Platform | Debug | Release |
 |------------------|-------------|-------------|
-| Windows Direct3D9 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_d3d9-mss/_latestVersion) |
-| Windows OpenGL3.3 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/_latestVersion) |
+| Windows Direct3D9 | [![Download](https://api.bintray.com/packages/gtamodding/revc/Debug_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/revc/Debug_win-x86-librw_d3d9-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/revc/Release_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/revc/Release_win-x86-librw_d3d9-mss/_latestVersion) |
+| Windows OpenGL3.3 | [![Download](https://api.bintray.com/packages/gtamodding/revc/Debug_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/revc/Debug_win-x86-librw_gl3_glfw-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/revc/Release_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/revc/Release_win-x86-librw_gl3_glfw-mss/_latestVersion) |
 
 ## Intro
 
diff --git a/gamefiles/data/PARTICLE.CFG b/gamefiles/data/PARTICLE.CFG
deleted file mode 100644
index 8bb6d30b..00000000
--- a/gamefiles/data/PARTICLE.CFG
+++ /dev/null
@@ -1,363 +0,0 @@
-; Author: Alexander Roger
-; Date:	21/12/2000
-;
-; Author: Andrzej Madajczyk
-; Date: 26/02/2001
-;		14/03/2001			- Alpha (opacity) support added;
-;		10/05/2001			- Drag/Friction Decceleration changed to constants;
-;		28/08/2001			- Initial Color Variation added;
-;
-;
-;
-; 
-; Note! Last line of the file MUST BE ";the end\n", otherwise you'll get parsing error(s) of the file;
-;
-;
-;
-;Particle Systems Configuration Data:: Format
-;
-;
-;A:	Particle Type Name (max 20 chars)
-;
-;B/C/D:	Render Colouring (r,g,b) (0-255)
-;
-;CV: Initial Color Variation (for r,g,b only, in %) (0-100);
-;	(i.e. Color=(100,100,100) and CV=20, then v=random(-20,20), real_color=(100+v, 100+v, 100+v));
-;
-;
-;
-;B2/C2/D2: Fade Destination Color (r,g,b) (0-255)
-;
-;FT: Color Fade Time for (B,C,D)->(B2,C2,D2), (0 for none);
-;
-;
-;
-;
-;E:	Default Initial Radius (float)
-;F:	Expansion Rate	(float)
-;
-;
-; Color "Fade-to-Black" options:
-;G:	Initial Intensity (0-255)
-;H:	Fade Time (time between fade steps in frames)
-;I:	Fade Amount (-255 to 255)  can get brighter or dimmer
-;
-; "Fade Alpha" options:
-;GA: Initial Intensity (0-255)
-;HA: Fade Time (time between fade steps in frames)
-;IA: Fade Amount
-;
-; "Z Rotation" options:
-;GZA: Initial Angle (0-1023)
-;HZA: Change Time (time between steps in frames)
-;IZA: Angle Change Amount
-;
-;GZR: Initial Z Radius
-;HZR: Change Time (time between steps in frames)
-;IZR: Z Radius Change Amount
-;
-;
-;J:	Animation Speed (0=no animation)(time between steps msec) 
-;K:	Start Animation Frame ( 0 -> )
-;L:	Final Animation Frame ( H -> )
-;
-;
-;M:	Rotation Speed (0=None,i-deg/frame)
-;N:	Gravitational Acceleration (0=none, float)
-;O:	Drag/Friction Decceleration (int: 0=none, 50=0.50, 80=0.80, 90=0.90, 95=0.95, 96=0.96, 99=0.99)
-;
-;P:	Default Life-Span of Particle (msec)
-;
-;Q:	Position Random Error	[position += (+/-)rand(a)]
-;R:	Velocity Random Error	[velocity += (+/-)rand(b)]
-;S:	Expansion Rate Error	[exp_rate += (+)rand(c)]
-;T:	Rotation Rate Error		[rot_speed = (+/-)rand(d)]
-;U:	Life-Span Error Shape	[shape distribution, e=0->all at default, e->Inf then shape->0] (max=255!!)
-;V:	Trail Length Multiplier [length *= (float) multiplier] (only used if trail flag active)
-;
-;CR:Particle Create Range (in meters: 0=no check); if particles are created enough far away from camera, they are deleted (not added to particle system);
-;
-;
-;Z:	Flags! Guide:		1=ZCHECK_FIRST,	2=ZCHECK_STEP,	4=DRAW_OPAQUE,	8=SCREEN_TRAIL,
-;						16=SPEED_TRAIL,	32=RAND_VERT_V,	64=CYCLE_ANIM,	128=DRAW_DARK,	256=VERT_TRAIL
-;						1024=DRAWTOP2D, 2048=CLIPOUT2D
-;						4096=ZCHECK_BUMP,	8192=ZCHECK_BUMP_FIRST
-;
-;
-;
-;default:
-;GUNFLASH			255	255	255		0	0.1		0.0		255	0	128		0	0	0		0	0.0		1.0		250		0.0		0.0		0.0		0	0	1.0	0
-;
-;good idea for fire-smudge?
-;GUNFLASH			255	255	255		0	1.0		0.0		255	0	32		100	0	3		0	0.0		1.0		400		0.0		0.0		0.0		0	0	1.0	0
-;
-;current:
-;GUNFLASH			255	255	255		0	1.0		0.0		255	0	32		100	0	3		0	0.0		1.0		400		0.0		0.0		0.0		0	0	1.0	0
-;
-;
-;SPARK_SMALL		255	255	128		0	0.005	0.0		255	0	0		0	0	0		0	0.0		1.0		500		0.0		0.05	0.0		0	0	0.5	40
-;
-;
-;
-;
-;
-;
-;
-;	A				B	C	D	CV		B2	C2	D2	FT		E		F		G	H	I		GA	HA	IA		GZA	HZA	IZA		GZR	HZR	IZR		J	K	L		M	N		O		P		Q		R		S		T	U	V	CR		Z
-;
-SPARK				255	128	64	0		0	0	0	0		0.005	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.001	1		300		0.0		0.07	0.0		0	0	1.0	20.0	48
-SPARK_SMALL			255	255	128	0		0	0	0	0		0.005	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.001	1		500		0.0		0.05	0.0		0	0	0.6	20.0	40
-;
-WHEEL_DIRT			8	24	8	0		0	0	0	0		0.05	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.002	1		1000	0.15	0.015	0.0		0	0	1.0	30.0	4
-;
-;
-;WHEEL_WATER		24	24	24	0		0	0	0	0		0.05	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.002	1		1000	0.15	0.015	0.0		0	0	1.0	20.0	0
-WHEEL_WATER			24	24	32	0		0	0	0	0		0.05	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.004	1		1000	0.15	0.015	0.0		0	0	1.0	20.0	1
-;
-;
-BLOOD				128	128	128	0		0	0	0	0		0.02	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.03	1		2000	0.3		0.05	0.0		0	0	1.0	50.0	5
-BLOOD_SMALL			255	32	32	0		0	0	0	0		0.007	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.005 	1		2000	0.05	0.05 	0.0		0	0	1.0	50.0	53
-;BLOOD_SPLAT		128	128	128	0		0	0	0	0		0.1 	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0 	1		200		0.3		0.0		0.0		0	0	1.0	400.0	36
-BLOOD_SPURT			255	32	32	0		0	0	0	0		0.008 	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.005 	1		2000	0.0		0.01	0.0		0	0	2.0	50.0	52
-DEBRIS				64	64	64	0		0	0	0	0		0.5		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.01	95		1000	0.2		0.0		0.0		0	0	1.0	50.0	4
-DEBRIS2				64	64	64	0		0	0	0	0		0.04	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		5	0.01	99		1000	0.03	0.04	0.0		0	0	1.0	50.0	38
-WATER				64	64	128	0		0	0	0	0		0.01	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		2000	0.0		0.0		0.0		0	0	1.0	100.0	0
-;
-;
-;FLAME				255	74	30	0		0	0	0	0		0.2		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	0.0		1		100		0.05	0.0		0.0		0	0	1.0	400.0	0
-;FLAME				255	74	30	0		0	255	0	400		0.8		-0.02	255	0	10		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.005	1		2000	0.02	0.01	0.01	0	0	1.0	200.0	0
-FLAME				255	74	30	0		0	0	0	0		0.8		-0.02	255	0	10		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.005	1		2000	0.02	0.01	0.01	0	0	1.0	200.0	0
-;
-;
-;
-;FIREBALL			255	74	30	0		0	0	0	0		0.1		0.04	255	1	8		255	0	0		0	0	0		0.0	0	0.0		32	0	7		0	0.0		96		1000	0.1		0.0		0.0		0	0	1.0	400.0	0
-;
-;FIREBALL			255	74	30	0		0	0	0	0		0.1		0.05	255	0	6		255	0	0		0	0	0		0.0	0	0.0		1	0	7		0	-0.002	96		2000	0.1		0.02	0.02	3	0	1.0	200.0	0
-FIREBALL			255	74	30	0		0	0	0	0		0.1		0.02	255	0	6		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.003	96		2000	0.1		0.03	0.014	2.5	0	1.0	200.0	0
-;
-;
-;
-GUNFLASH			170	170	170	0		0	0	0	0		0.1		0.0		255	1	50		255	0	0		0	0	0		0.0	0	0.0		51	0	3		0	0.0		1		250		0.0		0.0		0.0		0	0	1.0	35.0	0
-GUNFLASH_NOANIM		128	128	128	0		0	0	0	0		0.1		0.0		255	1	128		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		25		0.0		0.0		0.0		0	0	1.0	35.0	0
-;
-GUNSMOKE			64	64	64	0		0	0	0	0		0.15	0.0		255 0	0		255	0	0		0	0	0		0.0	0	0.0		2	0	7		0	-0.002	95		1000	0.0		0.0		0.0		0	0	1.0	60.0	0
-GUNSMOKE2			255	255	255	0		0	0	0	0		0.05	0.02	255	0	0		255	0	8		0	0	0		0.0	0	0.0		0	0	3		4	-0.001	80		1400	0.05	0.05	0.01	3	0	1.0	60.0	4
-;
-;
-SMOKE				32	32	32	0		0	0	0	0		0.15	0.015	255	5	25		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.01	95		1000	0.05	0.05	0.01	3	0	1.0	150.0	0
-;SMOKE_SLOWMOTION	32	32	32	0		0	0	0	0		0.15	0.015	255	5	15		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.003	95		1000	0.05	0.05	0.01	3	0	1.0	400.0	0
-SMOKE_SLOWMOTION	32	32	32	0		0	0	0	0		0.15	0.015	128	5	11		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.003	95		3000	0.05	0.05	0.01	3	0	1.0	150.0	0
-;
-;
-;
-;GARAGEPAINT_SPRAY	32	32	32	0		0	0	0	0		0.15	0.015	255	0	5		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	-0.001	95		2000	0.05	0.05	0.01	3	0	1.0	400.0	0
-GARAGEPAINT_SPRAY	32	32	32	0		0	0	0	0		0.15	0.015	255	0	5		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	-0.0005	95		4000	0.05	0.05	0.01	3	0	1.0	100.0	0
-SHARD				255	255	255	0		0	0	0	0		0.03	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		96		300		0.0		0.0		0.0		0	0	1.0	100.0	0
-SPLASH				64	64	128	0		0	0	0	0		0.1		0.007	255	1	10		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	100.0	0
-;BLOOD_SPLASH		24	64	0	0		0	0	0	0		0.1		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		96		300		0.0		0.0		0.0		0	0	1.0	100.0	0
-;
-;
-;CARFLAME			255	74	30	0		0	0	0	0		0.5		0.04	255	2	20		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	0.0		1		1000	0.4		0.0		0.0		0	0	1.0	400.0	64
-;CARFLAME			255	74	30	0		0	0	0	0		0.8		-0.02	255	0	10		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.001	1		2000	0.4		0.01	0.01	0	0	1.0	400.0	64
-;CARFLAME			255	74	30	0		0	0	0	0		0.8		-0.02	255	0	10		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.001	1		2000	0.4		0.01	0.01	0	0	1.0	400.0	64
-;
-CARFLAME			255	74	30	0		0	0	0	0		0.8		-0.02	255	0	10		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.005	1		2000	0.02	0.01	0.01	0	0	1.0	100.0	0
-;
-;
-STEAM				64	64	64	0		0	0	0	0		0.5		0.05	255	1	16		255	0	0		0	0	0		0.0	0	0.0		32	0	4		0	-0.005	95		2000	0.01	0.03	0.0		0	0	1.0	85.0	0
-;
-;default:
-;STEAM2				255	255	255	0		0	0	0	0		0.5		0.05	255	0	0		128	2	8		0	0	0		0.0	0	0.0		32	0	4		0	-0.005	95		2000	0.01	0.03	0.0		0	0	1.0	400.0	4
-STEAM2				255	255	255	0		0	0	0	0		0.5		0.015	255	0	0		192	0	1		0	0	10		0.5	1	0.02	32	0	4		0	-0.002	95		8000	0.01	0.03	0.0		0	0	1.0	85.0	4
-;
-;
-;STEAM_NY			255	255	255	0		0	0	0	0		0.5		0.05	255	0	0		128	2	8		0	0	0		0.0	0	0.0		32	0	4		0	-0.005	95		2000	0.01	0.03	0.0		0	0	1.0	400.0	4
-STEAM_NY			255	255	255	0		0	0	0	0		0.5		0.05	255	0	0		96	2	8		0	0	0		0.0	0	0.0		32	0	4		0	-0.005	95		1400	0.01	0.03	0.0		0	0	1.0	85.0	4
-STEAM_NY_SLOWMOTION	255	255	255	0		0	0	0	0		0.5		0.05	255	0	0		96	2	8		0	0	0		0.0	0	0.0		32	0	4		0	-0.0015	95		1400	0.01	0.03	0.0		0	0	1.0	85.0	4
-;
-;
-;ENGINE_STEAM		210	210	210	0		0	0	0	0		0.5		0.05	255	0	0		192	2	16		0	0	0		0.0	0	0.0		32	0	4		0	-0.005	95		2000	0.01	0.03	0.0		0	0	1.0	250.0	4
-ENGINE_STEAM		210	210	210	0		0	0	0	0		0.5		0.05	255	0	0		192	0	10		0	0	0		0.0	0	0.0		32	0	4		1	-0.005	95		4000	0.03	0.03	0.02		0	0	1.0	85.0	4
-;
-;
-;RAINDROP			32	32	32	0		0	0	0	0		0.6		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.025	1		1000	0.0		0.0		0.0		0	0	1.0	15.0	1
-RAINDROP			64	64	64	0		0	0	0	0		0.4		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	3		0	0.05	1		1000	0.0		0.0		0.0		0	0	1.0	15.0	1
-RAINDROP_SMALL		16	16	16	0		0	0	0	0		0.3		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.05	1		1000	0.0		0.0		0.0		0	0	1.0	15.0	1
-RAIN_SPLASH			32	32	32	0		0	0	0	0		0.08	0.0		255	0	5		255	0	0		0	0	0		0.0	0	0.0		1	0	4		0	0.0		1		500		0.0		0.0		0.0		0	0	1.0	15.0	0
-RAIN_SPLASH_BIGGROW	128	128	128	0		0	0	0	0		0.5		0.06	255	0	2		255	0	0		0	0	0		0.0	0	0.0		2	1	4		0	0.0		1		5500	0.0		0.0		0.0		0	0	1.0	15.0	0
-RAIN_SPLASHUP		48	48	48	0		0	0	0	0		0.1		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	1		0	0.0		1		50		0.0		0.0		0.0		0	0	1.0	15.0	0
-;
-WATERSPRAY			64	64	64	0		0	0	0	0		0.2		0.0		255	0	25		255	0	0		0	0	0		0.0	0	0.0		3	0	2		0	0.002	1		800		0.05	0.0		0.01	0	0	1.0	20.0	0
-;
-;
-;
-;EXPLOSION_MEDIUM	80	80	80	0		0	0	0	0		0.6		0.04	255	5	8		255	0	0		0	0	0		0.0	0	0.0		8	0	11		0	0.0		96		15000	0.2		0.0		0.0		3	0	1.0	400.0	0
-;EXPLOSION_LARGE	80	80	80	0		0	0	0	0		1.1		0.04	255	5	8		255	0	0		0	0	0		0.0	0	0.0		8	0	11		0	0.0		96		15000	0.8		0.0		0.0		3	0	1.0	400.0	0
-;EXPLOSION_MEDIUM	80	80	80	0		0	0	0	0		0.6		0.04	255	1	4		255	0	0		0	0	0		0.0	0	0.0		1	0	11		0	0.0		96		7000	0.2		0.0		0.0		0	0	1.0	400.0	0
-;EXPLOSION_LARGE	80	80	80	0		0	0	0	0		1.1		0.04	255	1	4		255	0	0		0	0	0		0.0	0	0.0		1	0	11		0	0.0		96		7000	0.8		0.0		0.0		0	0	1.0	400.0	0
-;
-;EXPLOSION_MEDIUM	80	80	80	0		0	0	0	0		0.6		0.04	255	0	3		255	0	0		0	0	0		0.0	0	0.0		1	0	11		0	-0.001	96		6000	0.2		0.0		0.0		0	0	1.0	400.0	0
-;EXPLOSION_LARGE	80	80	80	0		0	0	0	0		1.1		0.04	255	0	3		255	0	0		0	0	0		0.0	0	0.0		1	0	11		0	-0.001	96		6000	0.8		0.0		0.0		0	0	1.0	400.0	0
-EXPLOSION_MEDIUM	80	80	80	0		0	0	0	0		0.6		0.04	255	0	3		255	0	0		0	0	0		0.0	0	0.0		2	0	5		0	-0.001	96		6000	0.2		0.0		0.0		0	0	1.0	200.0	0
-EXPLOSION_LARGE		80	80	80	0		0	0	0	0		1.1		0.04	255	0	3		255	0	0		0	0	0		0.0	0	0.0		2	0	5		0	-0.001	96		6000	0.8		0.0		0.0		0	0	1.0	200.0	0
-EXPLOSION_MFAST		80	80	80	0		0	0	0	0		0.6		0.04	255	0	6		255	0	0		0	0	0		0.0	0	0.0		2	0	5		0	-0.001	96		3500	0.2		0.0		0.0		0	0	1.0	200.0	0
-EXPLOSION_LFAST		80	80	80	0		0	0	0	0		1.1		0.04	255	0	6		255	0	0		0	0	0		0.0	0	0.0		2	0	5		0	-0.001	96		3500	0.8		0.0		0.0		0	0	1.0	200.0	0
-;
-;
-;
-;
-;BOAT_SPLASH		32	64	32	0		0	0	0	0		0.2		0.2		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.01	1		2000	0.0		0.0		0.0		0	0	1.0	200.0	0
-;BOAT_THRUSTJET		24	32	24	0		0	0	0	0		0.5		0.1		255	0	0		255	0	0		0	0	0		0.0	0	0.0		250	0	4		0	0.01	50		1000	0.0		0.0		0.0		0	4	1.0	200.0	8
-;BOAT_SPLASH		16	32	32	0		0	0	0	0		0.2		0.2		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.01	1		2000	0.0		0.0		0.0		0	0	1.0	200.0	0
-;BOAT_THRUSTJET		8	24	24	0		0	0	0	0		0.5		0.1		255	0	0		255	0	0		0	0	0		0.0	0	0.0		250	0	4		0	0.01	50		1000	0.0		0.0		0.0		0	4	1.0	200.0	8
-;CAR_SPLASH			64	64	64	0		0	0	0	0		2.0		0.25	255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.02	1		2000	0.0		0.0		0.0		0	0	1.0	250.0	0
-;CAR_SPLASH			64	64	64	0		0	0	0	0		2.0		0.25	255	0	0		200	0	8		0	0	0		0.0	0	0.0		0	0	0		0	0.04	1		2000	0.0		0.0		0.0		0	0	1.0	150.0	4
-;CAR_SPLASH			64	64	64	0		0	0	0	0		2.0		0.35	255	0	0		200	0	8		0	0	0		0.0	0	0.0		0	0	0		0	0.05	1		2000	0.0		0.0		0.0		0	0	1.0	150.0	4
-;CAR_SPLASH			64	64	64	0		0	0	0	0		1.0		0.25	255	0	0		180	0	5		0	0	0		0.0	0	0.0		2	1	3		0	0.05	1		1000	0.0		0.0		0.0		0	0	1.0	150.0	12
-;
-;
-;CAR_SPLASH			64	64	64	0		0	0	0	0		1.0		0.15	255	0	0		180	0	2		0	0	0		0.0	0	0.0		2	0	3		0	0.02	1		2000	0.0		0.0		0.0		0	0	1.0	150.0	12
-;CAR_SPLASH			48	48	64	0		0	0	0	0		1.0		0.15	96	0	0		255	0	0		0	0	0		0.0	0	0.0		6	0	2		0	0.01	1		2000	0.5		0.04	0.0		0	0	2.0	150.0	288
-;CAR_SPLASH			48	48	64	0		0	0	0	0		1.0		0.05	96	0	0		255	0	0		0	0	0		0.0	0	0.0		0	1	2		0	0.01	1		2000	0.5		0.04	0.0		0	0	2.0	150.0	288
-;	A				B	C	D	CV		B2	C2	D2	FT		E		F		G	H	I		GA	HA	IA		GZA	HZA	IZA		GZR	HZR	IZR		J	K	L		M	N		O		P		Q		R		S		T	U	V	CR		Z
-CAR_SPLASH			48	48	60	0		0	0	0	0		1.0		0.00	128	1	4		128	0	0		0	0	0		0.0	0	0.0		0	0	2		0	0.01	1		2000	0.5		0.04	0.0		0	0	1.4	150.0	272
-;
-;
-;
-;BOAT_SPLASH		70	70	70	0		0	0	0	0		0.2		0.2		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.01	1		1000	0.0		0.0		0.0		0	0	1.0	150.0	0
-BOAT_SPLASH			64	64	64	0		0	0	0	0		0.2		0.2		255	0	2		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.01	1		1000	0.0		0.0		0.0		0	0	1.0	150.0	0
-;
-;
-;BOAT_THRUSTJET		90	90	90	0		0	0	0	0		1.8		0.1		255	0	0		120	0	1		0	0	0		0.0	0	0.0		0	1	4		0	0.01	50		1600	0.8		0.4		0.02	0	4	1.0	150.0	4
-BOAT_THRUSTJET		90	90	90	0		0	0	0	0		1.4		0.06	255	0	0		 96	0	1		0	0	0		0.0	0	0.0		0	1	4		0	0.01	50		1600	0.8		0.4		0.02	0	4	1.0	150.0	4
-;
-;
-;BOAT_WAKE			255	255	255	0		0	0	0	0		2.0		0.2		255	0	0		128	0	1		0	0	0		0.0	0	0.0		0	0	0		0	0.03	50		1600	0.8		0.4		0.02	0	4	1.0	150.0	4
-BOAT_WAKE			255	255	255	0		0	0	0	0		1.5		0.45	255	0	0		192	0	2		0	0	0		0.0	0	0.0		0	0	0		0	0.0		50		1600	0.8		0.4		0.02	0	4	1.0	150.0	4
-;
-;
-;
-;
-;
-;	A				B	C	D	CV		B2	C2	D2	FT		E		F		G	H	I		GA	HA	IA		GZA	HZA	IZA		GZR	HZR	IZR		J	K	L		M	N		O		P		Q		R		S		T	U	V	CR		Z
-WATER_HYDRANT		64	64	64	0		0	0	0	0		0.8		0.01	255	1	16		255	1	16		0	0	0		0.0	0	0.0		0	0	2		0	0.007	99		500		0.02	0.08	0.0		0	4	1.0	85.0	16
-WATER_CANNON		64	64	128	0		0	0	0	0		0.03	0.03	255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	85.0	0
-EXTINGUISH_STEAM	32	32	32	0		0	0	0	0		0.1		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	85.0	0
-;
-;
-;
-;PED_SPLASH			32	32	64	0		0	0	0	0		0.1		0.05	255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	85.0	0
-PED_SPLASH			48	48	60	0		0	0	0	0		0.1		0.06	96	0	0		255	0	0		0	0	0		0.0	0	0.0		0	1	2		0	0.01	1		2000	0.5		0.04	0.0		0	0	1.4	50.0	256
-;
-;
-PEDFOOT_DUST		170	166	150	0		0	0	0	0		0.01	0.015	255	0	0		63	0	4		0	0	0		0.0	0	0.0		0	0	0		0	-0.0005	1		1000	0.0		0.0		0.0		0	0	1.0	6.0		4
-;
-HELI_DUST			17	15	9	0		0	0	0	0		0.2		0.1		255	1	8		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.001	1		1000	0.2		0.05	0.0		0	0	1.0	85.0	0
-HELI_ATTACK			255	255	128	0		0	0	0	0		0.01	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		500		0.0		0.0		0.0		0	0	0.5	85.0	10
-;
-;
-;ENGINE_SMOKE		16	16	16	0		0	0	0	0		0.5		0.04	255	0	0		63	0	0		0	0	0		0.0	0	0.0		0	0	0		0	-0.005	95		2000	0.01	0.03	0.0		0	0	1.0	150.0	4
-;ENGINE_SMOKE2		8	8	8	0		0	0	0	0		1.0		0.2		128	2	4		63	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.001	1		1000	0.0		0.0		0.0		0	3	1.0	150.0	4
-ENGINE_SMOKE		16	16	16	0		0	0	0	0		0.5		0.04	255	0	0		52	0	2		10	0	80		0.0	0	0.0		0	0	5		2	-0.009	95		2000	0.11	0.03	0.01		1	0	1.0	85.0	4
-ENGINE_SMOKE2		9	9	9	80		0	0	0	0		1.0		0.06	128	0	1		140	0	5		10	0	80		0.0	0	0.0		0	0	0		2	0.002	1		1300	0.0		0.01	0.0		3	3	1.0	85.0	4
-;
-;
-CARFLAME_SMOKE		32	32	32	0		0	0	0	0		0.05	0.01	255	0	0		64	0	2		0	0	0		0.0	0	0.0		0	0	0		0	-0.008	95		2000	0.01	0.03	0.01	0	0	1.0	85.0	4
-FIREBALL_SMOKE		32	32	32	0		0	0	0	0		0.05	0.03	255	0	0		128	0	2		0	0	0		0.0	0	0.0		0	0	0		0	-0.004	95		2000	0.01	0.03	0.01	0	0	1.0	85.0	4
-;
-PAINT_SMOKE			255	0	0	0		0	0	0	0		0.1		0.01	255	1	8		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		95		3000	0.0		0.005	0.0		0	0	1.0	85.0	0
-TREE_LEAVES			64	64	64	0		0	0	0	0		0.2		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	85.0	0
-;
-;
-;CARCOLLISION_DUST	224	224	224	0		0	0	0	0		0.15	0.04	255	0	0		127	1	8		0	0	0		0.0	0	0.0		0	0	0		0	-0.002	90		2000	0.02	0.02	0.0		0	0	1.0	80.0	4
-CARCOLLISION_DUST	76	76	76	0		0	0	0	0		0.10	0.02	255	0	0		160	0	4		0	0	0		0.0	0	0.0		0	0	0		0	-0.0015	90		2000	0.02	0.02	0.0		0	0	1.0	30.0	4
-;
-;
-CAR_DEBRIS			32	32	32	0		0	0	0	0		0.5		0.0		224	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.010	90		1000	0.02	0.02	0.0		0	0	1.0	50.0	4
-HELI_DEBRIS			32	32	32	0		0	0	0	0		1.5		0.0		224	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.065	90		1500	0.02	0.02	0.0		0	0	1.0	150.0	4
-;
-;
-;
-;EXHAUST_FUMES		80	80	80	0		0	0	0	0		0.03	0.03	255	0	0		122	0	4		0	0	0		0.0	0	0.0		2	0	4		0	-0.001	95		1500	0.01	0.03	0.0		0	0	1.0	50.0	4
-EXHAUST_FUMES		98	98	108	0		0	0	0	0		0.03	0.06	255	0	0		152	0	12		0	0	0		0.0	0	0.0		2	0	4		0	-0.002	96		1000	0.01	0.03	0.0		0	0	1.0	25.0	4
-;
-;
-;RUBBER				40	40	40	0		0	0	0	0		0.4		0.005	255	21	20		255	0	0		0	0	0		0.0	0	0.0		3	0	4		0	-0.0005	1		1000	0.02	0.0		0.0		0	0	1.0	400.0	4
-RUBBER_SMOKE		255	255	255	0		0	0	0	0		0.4		0.005	255	0	0		127	1	8		0	0	0		0.0	0	0.0		3	0	4		0	-0.0005	1		1000	0.02	0.0		0.0		0	0	1.0	50.0	4
-;BURNINGRUBBER_SMOKE128 128	128	0		0	0	0	0		0.35	0.06	255	0	0		192	1	6		0	0	0		0.0	0	0.0		0	0	0		0	-0.002	90		4000	0.02	0.02	0.0		0	0	1.0	400.0	4
-BURNINGRUBBER_SMOKE	128 128	128	0		0	0	0	0		0.35	0.06	255	0	0		128	0	4		0	0	0		0.0	0	0.0		0	0	0		0	-0.002	90		2000	0.02	0.02	0.0		0	0	1.0	50.0	4
-;
-;
-BULLETHIT_SMOKE		192	192	192	0		0	0	0	0		0.15	0.03	70  0	2		255	1	10		0	0	0		0.0	0	0.0		0	0	0		0	-0.001	90		2000	0.04	0.02	0.0		0	0	1.0	150.0	0
-;
-;
-GUNSHELL_FIRST		108	108	108	0		0	0	0	0		0.015	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.010	90		1000	0.02	0.02	0.0		0	0	1.0	0.0		12292
-GUNSHELL			108	108	108	0		0	0	0	0		0.015	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.010	90		1000	0.02	0.02	0.0		0	0	1.0	12.0	4100
-GUNSHELL_BUMP1		108	108	108	0		0	0	0	0		0.015	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.010	90		1000	0.02	0.02	0.0		0	0	1.0	8.0		4100
-GUNSHELL_BUMP2		108	108	108	0		0	0	0	0		0.015	0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	0	4		0	0.010	90		400		0.02	0.02	0.0		0	0	1.0	8.0		4100
-;
-;
-TEST				255	64	64	0		0	0	0	0		0.2		0.025	255	1	20		255	0	0		0	0	0		0.0	0	0.0		0	0	0		0	0.0		1		3000	0.0		0.0		0.0		0	0	1.0	400.0	128
-;
-;
-;Particles with flag DRAWTOP2D should be placed last and VR (Visibility Range) set to 0!
-;
-;BIRD_FRONT			8	8	8	0		0	0	0	0		0.05	0.0		255	0	0		255	2	1		0	0	0		0.0	0	0.0		1	0	3		0	0.0		1		10000	0.0		0.0		0.0		0	0	1.0	0.0		3140
-BIRD_FRONT			8	8	8	0		0	0	0	0		1.05	0.0		255	0	0		255	2	2		0	0	0		0.0	0	0.0		1	0	3		0	0.0		1		8000	0.0		0.0		0.0		0	0	1.0	0.0		68
-;
-RAINDROP_2D			32	32	32	0		0	0	0	0		0.5		0.0		255	0	0		255	0	0		0	0	0		0.0	0	0.0		0	1	0		0	0.0		1		1000	0.0		0.0		0.0		0	0	1.0	0.0		3072
-;
-;
-;
-;
-;
-;
-;
-;
-;
-;
-;
-;
-; below is just backup of above values:
-;
-;SPARK				255	128	64		0.005	0.0		255	0	0		0	0	0		0	0.0		1.0		300		0.0		0.07	0.0		0	0	1.0	48
-;SPARK_SMALL			255	255	128		0.005	0.0		255	0	0		0	0	0		0	0.0		1.0		500		0.0		0.05	0.0		0	0	0.6	40
-;BLOOD				128	128	128		0.02	0.0		255	0	0		0	0	0		0	0.03	1.0		2000	0.3		0.05	0.0		0	0	1.0	6
-;BLOOD_SMALL			255	32	32		0.007	0.0		255	0	0		0	0	0		0	0.005 	1.0		2000	0.05	0.05 	0.0		0	0	1.0	54
-;BLOOD_SPLAT			128	128	128		0.1 	0.0		255	0	0		0	0	0		0	0.0 	1.0		200		0.3		0.0		0.0		0	0	1.0	36
-;BLOOD_SPURT			255	32	32		0.008 	0.0		255	0	0		0	0	0		0	0.005 	1.0		2000	0.0		0.01	0.0		0	0	2.0	52
-;DEBRIS				64	64	64		0.5		0.0		255	0	0		0	0	0		0	0.01	0.95	1000	0.2		0.0		0.0		0	0	1.0	4
-;DEBRIS2				64	64	64		0.04	0.0		255	0	0		0	0	0		5	0.01	0.99	1000	0.03	0.04	0.0		0	0	1.0	38
-;WATER				64	64	128		0.01	0.0		255	0	0		0	0	0		0	0.0		1.0		2000	0.0		0.0		0.0		0	0	1.0	0
-;FLAME				255	74	30		0.2		0.0		255	0	0		31	0	5		0	0.0		1.0		100		0.05	0.0		0.0		0	0	1.0	0
-;FIREBALL			255	74	30		0.1		0.04	255	0	8		31	0	8		0	0.0		0.96	1000	0.1		0.0		0.0		0	0	1.0	0
-;GUNFLASH			255	255	255		0.1		0.0		255	0	50		50	0	3		0	0.0		1.0		250		0.0		0.0		0.0		0	0	1.0	0
-;GUNFLASHSTATIC		255	255	255		0.1		0.0		255	0	128		0	0	0		0	0.0		1.0		25		0.0		0.0		0.0		0	0	1.0	0
-;SMOKE				32	32	32		0.15	0.015	255	4	25		31	0	5		0	-0.01	0.95	1000	0.05	0.05	0.01	3	0	1.0	0
-;SHARD				255	255	255		0.03	0.0		255	0	0		0	0	0		0	0.0		0.96	300		0.0		0.0		0.0		0	0	1.0	0
-;SPLASH				64	64	128		0.1		0.007	255	0	10		0	0	0		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;BLOOD_SPLASH		24	64	0		0.1		0.0		255	0	0		0	0	0		0	0.0		0.96	300		0.0		0.0		0.0		0	0	1.0	0
-;RUBBER				40	40	40		0.4		0.005	255	1	25		31	0	5		0	0.0		1.0		1000	0.02	0.0		0.0		0	0	1.0	0
-;CARFLAME			255	74	30		0.5		0.04	255	1	20		31	0	5		0	0.0		1.0		1000	0.4		0.0		0.0		0	0	1.0	64
-;STEAM				64	64	64		0.5		0.05	255	0	16		31	0	5		0	-0.005	0.95	2000	0.01	0.03	0.0		0	0	1.0	0
-;RAINDROP			32	32	32		0.6		0.0		255	0	0		0	0	0		0	0.1		1.0		1000	0.0		0.0		0.0		0	0	1.0	1
-;RAIN_SPLASH			32	32	32		0.08	0.0		255	0	0		1	0	4		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;RAINDROP_SMALL		32	32	32		0.3		0.0		255	0	0		0	0	0		0	0.1		1.0		1000	0.0		0.0		0.0		0	0	1.0	1
-;EXPLOSION_MEDIUM	80	80	80		0.6		0.04	255	4	8		7	0	11		0	0.0		0.96	30000	0.2		0.0		0.0		3	0	1.0	0
-;EXPLOSION_LARGE		80	80	80		1.1		0.04	255	4	8		7	0	11		0	0.0		0.96	30000	0.8		0.0		0.0		3	0	1.0	0
-;BOAT_SPLASH			32	64	32		0.2		0.2		255	0	0		0	0	0		0	0.01	1.0		2000	0.0		0.0		0.0		0	0	1.0	0
-;BOAT_THRUSTJET		24	32	24		0.5		0.1		255	0	0		250	0	5		0	0.01	0.5		1000	0.0		0.0		0.0		0	4	1.0	8
-;WATER_HYDRANT		64	64	128		0.4		0.01	255	1	2		20	0	5		0	0.007	0.99	500		0.02	0.05	0.0		0	4	1.0	256
-;WATER_CANNON		64	64	128		0.03	0.03	255	0	0		0	0	0		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;EXTINGUISH_STEAM	32	32	32		0.1		0.0		255	0	0		0	0	0		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;PED_SPLASH			32	32	64		0.1		0.05	255	0	0		0	0	0		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;HELI_DUST			17	15	9		0.2		0.1		255	0	8		0	0	0		0	-0.001	1.0		1000	0.2		0.05	0.0		0	0	1.0	0
-;HELI_ATTACK			255	255	128		0.01	0.0		255	0	0		0	0	0		0	0.0		1.0		500		0.0		0.0		0.0		0	0	0.5	10
-;ENGINE_SMOKE		16	16	16		0.5		0.04	255	0	0		0	0	0		0	-0.005	0.95	2000	0.01	0.03	0.0		0	0	1.0	4
-;ENGINE_SMOKE2		4	4	4		1.0		0.2		255	1	4		0	0	0		0	0.001	1.0		1000	0.0		0.0		0.0		0	3	1.0	4
-;PAINT_SMOKE			255	0	0		0.1		0.01	255	0	8		0	0	0		0	0.0		0.95	3000	0.0		0.005	0.0		0	0	1.0	0
-;TREE_LEAVES			64	64	64		0.2		0.0		255	0	0		0	0	0		0	0.0		1.0		1000	0.0		0.0		0.0		0	0	1.0	0
-;TEST				255	64	64		0.2		0.05	255	0	16		0	0	0		0	0.0		1.0		3000	0.0		0.0		0.0		0	0	1.0	128
-;
-;
-;the end
diff --git a/gamefiles/data/freeroam_miami.scm b/gamefiles/data/freeroam_miami.scm
new file mode 100644
index 00000000..36f5dfd0
--- /dev/null
+++ b/gamefiles/data/freeroam_miami.scm
diff --git a/gamefiles/data/main_d.scm b/gamefiles/data/main_d.scm
deleted file mode 100644
index 7b46ca39..00000000
--- a/gamefiles/data/main_d.scm
+++ /dev/null
diff --git a/gamefiles/data/main_freeroam.scm b/gamefiles/data/main_freeroam.scm
deleted file mode 100644
index 021b5c25..00000000
--- a/gamefiles/data/main_freeroam.scm
+++ /dev/null
diff --git a/gamefiles/models/menu.txd b/gamefiles/models/menu.txd
index f617bcf8..1ffe750e 100644
--- a/gamefiles/models/menu.txd
+++ b/gamefiles/models/menu.txd
diff --git a/milessdk/include/mss.h b/milessdk/include/mss.h
index 38371eb9..94bfc065 100644
--- a/milessdk/include/mss.h
+++ b/milessdk/include/mss.h
@@ -114,3 +114,17 @@ DLLEXPORT void WINAPI AIL_set_stream_ms_position(HSTREAM S, S32 milliseconds);
 DLLEXPORT void WINAPI AIL_set_stream_volume(HSTREAM stream, S32 volume);
 DLLEXPORT void WINAPI AIL_set_stream_pan(HSTREAM stream, S32 pan);
 DLLEXPORT S32 WINAPI AIL_stream_status(HSTREAM stream);
+
+typedef U32(WINAPI* AIL_file_open_callback)(char const * Filename, U32 * FileHandle);
+
+typedef void (WINAPI* AIL_file_close_callback) (U32 FileHandle);
+
+#define AIL_FILE_SEEK_BEGIN   0
+#define AIL_FILE_SEEK_CURRENT 1
+#define AIL_FILE_SEEK_END     2
+
+typedef S32(WINAPI* AIL_file_seek_callback)  (U32 FileHandle, S32 Offset, U32 Type);
+
+typedef U32(WINAPI* AIL_file_read_callback)  (U32 FileHandle, void* Buffer, U32 Bytes);
+
+DLLEXPORT  void  WINAPI AIL_set_file_callbacks(AIL_file_open_callback opencb, AIL_file_close_callback closecb, AIL_file_seek_callback seekcb, AIL_file_read_callback readcb);
\ No newline at end of file
diff --git a/milessdk/lib/mss32.lib b/milessdk/lib/mss32.lib
index f97091c7..49cea2d2 100644
--- a/milessdk/lib/mss32.lib
+++ b/milessdk/lib/mss32.lib
diff --git a/premake5.lua b/premake5.lua
index 2331c0b3..6a27c5af 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -39,7 +39,7 @@ function getarch(a)
 	return a
 end
 
-workspace "re3"
+workspace "reVC"
 	language "C++"
 	configurations { "Debug", "Release" }
 	location "build"
@@ -137,10 +137,11 @@ local function addSrcFiles( prefix )
 	return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.rc"
 end
 
-project "re3"
+project "reVC"
 	kind "WindowedApp"
-	targetname "re3"
+	targetname "reVC"
 	targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
+	defines { "MIAMI" }
 
 	files { addSrcFiles("src") }
 	files { addSrcFiles("src/animation") }
@@ -193,10 +194,10 @@ project "re3"
 		
 	filter "platforms:*oal"
 		defines { "AUDIO_OAL" }
-	
+
 	filter {}
-	if(os.getenv("GTA_III_RE_DIR")) then
-		setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")
+	if(os.getenv("GTA_VC_RE_DIR")) then
+		setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "")
 	end
 	
 	filter "platforms:win*"
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index fe419f2a..83c1742a 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -8,16 +8,22 @@
 
 #include "General.h"
 #include "RwHelper.h"
+#include "ModelIndices.h"
 #include "ModelInfo.h"
 #include "AnimManager.h"
 #include "RpAnimBlend.h"
 #include "AnimBlendAssociation.h"
 #include "AnimBlendAssocGroup.h"
 
+//--MIAMI: file done
+
 CAnimBlendAssocGroup::CAnimBlendAssocGroup(void)
 {
+	animBlock = nil;
 	assocList = nil;
 	numAssociations = 0;
+	firstAnimId = 0;
+	groupId = -1;
 }
 
 CAnimBlendAssocGroup::~CAnimBlendAssocGroup(void)
@@ -38,7 +44,7 @@ CAnimBlendAssocGroup::DestroyAssociations(void)
 CAnimBlendAssociation*
 CAnimBlendAssocGroup::GetAnimation(uint32 id)
 {
-	return &assocList[id];
+	return &assocList[id - firstAnimId];
 }
 
 CAnimBlendAssociation*
@@ -48,6 +54,7 @@ CAnimBlendAssocGroup::GetAnimation(const char *name)
 	for(i = 0; i < numAssociations; i++)
 		if(!CGeneral::faststricmp(assocList[i].hierarchy->name, name))
 			return &assocList[i];
+	debug("\n\nCan't find the fucking animation %s\n\n\n", name);
 	return nil;
 }
 
@@ -97,7 +104,7 @@ strcmpIgnoringDigits(const char *s1, const char *s2)
 		c2 = toupper(c2);
 #endif
 
-		if(c1 != c2)
+		if(c1 && c2 && c1 != c2)
 			return false;
 	}
 }
@@ -107,6 +114,15 @@ GetModelFromName(const char *name)
 {
 	int i;
 	CBaseModelInfo *mi;
+	char playername[32];
+
+	if(strncasecmp(name, "CSplay", 6) == 0 &&
+	   strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetName(), "ig", 2) == 0){
+		strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetName());
+		playername[0] = 'C';
+		playername[1] = 'S';
+		name = playername;
+	}
 
 	for(i = 0; i < MODELINFOSIZE; i++){
 		mi = CModelInfo::GetModelInfo(i);
@@ -123,8 +139,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
 	int i;
 	CAnimBlock *animBlock;
 
-	if(assocList)
-		DestroyAssociations();
+	DestroyAssociations();
 
 	animBlock = CAnimManager::GetAnimationBlock(name);
 	assocList = new CAnimBlendAssociation[animBlock->numAnims];
@@ -133,17 +148,18 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
 	for(i = 0; i < animBlock->numAnims; i++){
 		CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i);
 		CBaseModelInfo *model = GetModelFromName(anim->name);
-		assert(model);
-		printf("Associated anim %s with model %s\n", anim->name, model->GetName());
-		RpClump *clump = (RpClump*)model->CreateInstance();
-#ifdef PED_SKIN
-		if(IsClumpSkinned(clump))
-			RpClumpForAllAtomics(clump, AtomicRemoveAnimFromSkinCB, nil);
-#endif
-		RpAnimBlendClumpInit(clump);
-		assocList[i].Init(clump, anim);
-		RpClumpDestroy(clump);
-		assocList[i].animId = i;
+		if(model){
+			debug("Associated anim %s with model %s\n", anim->name, model->GetName());
+			RpClump *clump = (RpClump*)model->CreateInstance();
+			RpAnimBlendClumpInit(clump);
+			assocList[i].Init(clump, anim);
+			if(IsClumpSkinned(clump))
+				RpClumpForAllAtomics(clump, AtomicRemoveAnimFromSkinCB, nil);
+			RpClumpDestroy(clump);
+			assocList[i].animId = firstAnimId + i;
+			assocList[i].groupId = groupId;
+		}else
+			debug("\n\nCANNOT FIND MODELINFO WITH NAME %s\n\n\n", anim->name);
 	}
 	numAssociations = animBlock->numAnims;
 }
@@ -153,10 +169,8 @@ void
 CAnimBlendAssocGroup::CreateAssociations(const char *blockName, RpClump *clump, const char **animNames, int numAssocs)
 {
 	int i;
-	CAnimBlock *animBlock;
 
-	if(assocList)
-		DestroyAssociations();
+	DestroyAssociations();
 
 	animBlock = CAnimManager::GetAnimationBlock(blockName);
 	assocList = new CAnimBlendAssociation[numAssocs];
@@ -164,7 +178,8 @@ CAnimBlendAssocGroup::CreateAssociations(const char *blockName, RpClump *clump,
 	numAssociations = 0;
 	for(i = 0; i < numAssocs; i++){
 		assocList[i].Init(clump, CAnimManager::GetAnimation(animNames[i], animBlock));
-		assocList[i].animId = i;
+		assocList[i].animId = firstAnimId + i;
+		assocList[i].groupId = groupId;
 	}
 	numAssociations = numAssocs;
 }
diff --git a/src/animation/AnimBlendAssocGroup.h b/src/animation/AnimBlendAssocGroup.h
index aa58b0d3..86f0ca18 100644
--- a/src/animation/AnimBlendAssocGroup.h
+++ b/src/animation/AnimBlendAssocGroup.h
@@ -1,12 +1,16 @@
 #pragma once
 
 class CAnimBlendAssociation;
+struct CAnimBlock;
 
 class CAnimBlendAssocGroup
 {
 public:
+	CAnimBlock *animBlock;
 	CAnimBlendAssociation *assocList;
 	int32 numAssociations;
+	int32 firstAnimId;
+	int32 groupId;	// id of self in ms_aAnimAssocGroups
 
 	CAnimBlendAssocGroup(void);
 	~CAnimBlendAssocGroup(void);
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index 8c99b694..9a29601b 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -7,8 +7,11 @@
 #include "AnimBlendAssociation.h"
 #include "RwHelper.h"
 
+//--MIAMI: file done
+
 CAnimBlendAssociation::CAnimBlendAssociation(void)
 {
+	groupId = -1;
 	nodes = nil;
 	blendAmount = 1.0f;
 	blendDelta = 0.0f;
@@ -54,8 +57,8 @@ CAnimBlendAssociation::AllocateAnimBlendNodeArray(int n)
 void
 CAnimBlendAssociation::FreeAnimBlendNodeArray(void)
 {
-	assert(nodes != nil);
-	RwFreeAlign(nodes);
+	if(nodes)
+		RwFreeAlign(nodes);
 }
 
 void
@@ -75,7 +78,10 @@ CAnimBlendAssociation::Init(RpClump *clump, CAnimBlendHierarchy *hier)
 	// NB: This is where the order of nodes is defined
 	for(i = 0; i < hier->numSequences; i++){
 		CAnimBlendSequence *seq = &hier->sequences[i];
-		frame = RpAnimBlendClumpFindFrame(clump, seq->name);
+		if(seq->boneTag == -1)
+			frame = RpAnimBlendClumpFindFrame(clump, seq->name);
+		else
+			frame = RpAnimBlendClumpFindBone(clump, seq->boneTag);
 		if(frame && seq->numFrames > 0)
 			nodes[frame - clumpData->frames].sequence = seq;
 	}
@@ -90,6 +96,7 @@ CAnimBlendAssociation::Init(CAnimBlendAssociation &assoc)
 	numNodes = assoc.numNodes;
 	flags = assoc.flags;
 	animId = assoc.animId;
+	groupId = assoc.groupId;
 	AllocateAnimBlendNodeArray(numNodes);
 	for(i = 0; i < numNodes; i++){
 		nodes[i] = assoc.nodes[i];
@@ -129,9 +136,15 @@ CAnimBlendAssociation::SetCurrentTime(float time)
 		if(!IsRepeating())
 			return;
 	CAnimManager::UncompressAnimation(hierarchy);
-	for(i = 0; i < numNodes; i++)
-		if(nodes[i].sequence)
-			nodes[i].FindKeyFrame(currentTime);
+	if(hierarchy->compressed2){
+		for(i = 0; i < numNodes; i++)
+			if(nodes[i].sequence)
+				nodes[i].SetupKeyFrameCompressed();
+	}else{
+		for(i = 0; i < numNodes; i++)
+			if(nodes[i].sequence)
+				nodes[i].FindKeyFrame(currentTime);
+	}
 }
 
 void
@@ -147,13 +160,23 @@ CAnimBlendAssociation::Start(float time)
 	SetCurrentTime(time);
 }
 
+void
+CAnimBlendAssociation::UpdateTimeStep(float timeDelta, float relSpeed)
+{
+	if(IsRunning())
+		timeStep = (flags & ASSOC_MOVEMENT ? relSpeed*hierarchy->totalLength : speed) * timeDelta;
+}
+
 bool
 CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
 {
 	if(!IsRunning())
 		return true;
+	if(currentTime >= hierarchy->totalLength){
+		flags &= ~ASSOC_RUNNING;
+		return true;
+	}
 
-	timeStep = (flags & ASSOC_MOVEMENT ? relSpeed*hierarchy->totalLength : speed) * timeDelta;
 	currentTime += timeStep;
 
 	if(currentTime >= hierarchy->totalLength){
@@ -163,7 +186,6 @@ CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
 			currentTime -= hierarchy->totalLength;
 		else{
 			currentTime = hierarchy->totalLength;
-			flags &= ~ASSOC_RUNNING;
 			if(flags & ASSOC_FADEOUTWHENDONE){
 				flags |= ASSOC_DELETEFADEDOUT;
 				blendDelta = -4.0f;
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index 2dff4391..dbfcb722 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -12,12 +12,13 @@ enum {
 	ASSOC_PARTIAL = 0x10,
 	ASSOC_MOVEMENT = 0x20,	// ???
 	ASSOC_HAS_TRANSLATION = 0x40,
-	ASSOC_WALK = 0x80,	// for CPed::PlayFootSteps(void)
-	ASSOC_FLAG_XPRESS = 0x100,	// only used by xpress scratch, see CPed::Chat(void)
-	ASSOC_NOWALK = 0x200,	// see CPed::PlayFootSteps(void)
-	ASSOC_BLOCK = 0x400,	// unused in assoc description, blocks other anims from being played
-	ASSOC_FRONTAL = 0x800, // anims that we fall to front
-	ASSOC_HAS_X_TRANSLATION = 0x1000,	// for 2d velocity extraction
+	ASSOC_HAS_X_TRANSLATION = 0x80,	// for 2d velocity extraction
+	ASSOC_WALK = 0x100,	// for CPed::PlayFootSteps(void)
+	ASSOC_IDLE = 0x200,	// only xpress scratch has it by default, but game adds it to player's idle animations later
+	ASSOC_NOWALK = 0x400,	// see CPed::PlayFootSteps(void)
+	ASSOC_BLOCK = 0x800,	// unused in assoc description, blocks other anims from being played
+	ASSOC_FRONTAL = 0x1000, // anims that we fall to front
+	ASSOC_DRIVING = 0x2000,	// new in VC
 };
 
 // Anim hierarchy associated with a clump
@@ -35,7 +36,8 @@ public:
 
 	CAnimBlendLink link;
 
-	int numNodes;			// taken from CAnimBlendClumpData::numFrames
+	int16 numNodes;			// taken from CAnimBlendClumpData::numFrames
+	int16 groupId;		// ID of CAnimBlendAssocGroup this is in
 	// NB: Order of these depends on order of nodes in Clump this was built from
 	CAnimBlendNode *nodes;
 	CAnimBlendHierarchy *hierarchy;
@@ -44,8 +46,8 @@ public:
 	float currentTime;
 	float speed;
 	float timeStep;
-	int32 animId;
-	int32 flags;
+	int16 animId;
+	int16 flags;
 	int32 callbackType;
 	void (*callback)(CAnimBlendAssociation*, void*);
 	void *callbackArg;
@@ -76,16 +78,16 @@ public:
 	void SetCurrentTime(float time);
 	void SyncAnimation(CAnimBlendAssociation *other);
 	void Start(float time);
+	void UpdateTimeStep(float timeDelta, float relSpeed);
 	bool UpdateTime(float timeDelta, float relSpeed);
 	bool UpdateBlend(float timeDelta);
 
 	void SetRun(void) { flags |= ASSOC_RUNNING; }
 
-	inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
+	float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
+	float GetProgress() { return currentTime / hierarchy->totalLength; }
 
 	static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) {
 		return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
 	}
 };
-
-VALIDATE_SIZE(CAnimBlendAssociation, 0x40);
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp
index d40e8357..5f7491fe 100644
--- a/src/animation/AnimBlendClumpData.cpp
+++ b/src/animation/AnimBlendClumpData.cpp
@@ -3,6 +3,7 @@
 #include "AnimBlendClumpData.h"
 #include "RwHelper.h"
 
+//--MIAMI: file done
 
 CAnimBlendClumpData::CAnimBlendClumpData(void)
 {
diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h
index 5c511ab8..b953ee88 100644
--- a/src/animation/AnimBlendClumpData.h
+++ b/src/animation/AnimBlendClumpData.h
@@ -11,6 +11,7 @@ struct AnimBlendFrameData
 		IGNORE_TRANSLATION = 4,
 		VELOCITY_EXTRACTION = 8,
 		VELOCITY_EXTRACTION_3D = 0x10,
+		UPDATE_KEYFRAMES = 0x20,
 	};
 
 	uint8 flag;
@@ -35,9 +36,6 @@ class CAnimBlendClumpData
 public:
 	CAnimBlendLink link;
 	int32 numFrames;
-#ifdef PED_SKIN
-	int32 modelNumber;	// doesn't seem to be used
-#endif
 	CVector *velocity;
 	// order of frames is determined by RW hierarchy
 	AnimBlendFrameData *frames;
@@ -50,6 +48,3 @@ public:
 #endif
 	void ForAllFrames(void (*cb)(AnimBlendFrameData*, void*), void *arg);
 };
-#ifndef PED_SKIN
-VALIDATE_SIZE(CAnimBlendClumpData, 0x14);
-#endif
diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index feeaca3d..7388352f 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -2,6 +2,9 @@
 
 #include "AnimBlendSequence.h"
 #include "AnimBlendHierarchy.h"
+#include "AnimManager.h"
+
+//--MIAMI: file done
 
 CAnimBlendHierarchy::CAnimBlendHierarchy(void)
 {
@@ -15,9 +18,10 @@ CAnimBlendHierarchy::CAnimBlendHierarchy(void)
 void
 CAnimBlendHierarchy::Shutdown(void)
 {
+	CAnimManager::RemoveFromUncompressedCache(this);
 	RemoveAnimSequences();
+	totalLength = 0.0f;
 	compressed = 0;
-	linkPtr = nil;
 }
 
 void
@@ -30,15 +34,44 @@ void
 CAnimBlendHierarchy::CalcTotalTime(void)
 {
 	int i, j;
-	float totalTime = 0.0f;
+
+	totalLength = 0.0f;
 
 	for(i = 0; i < numSequences; i++){
-		float seqTime = 0.0f;
-		for(j = 0; j < sequences[i].numFrames; j++)
-			seqTime += sequences[i].GetKeyFrame(j)->deltaTime;
-		totalTime = Max(totalTime, seqTime);
+#ifdef FIX_BUGS
+		if(sequences[i].numFrames == 0)
+			continue;
+#endif
+
+		totalLength = Max(totalLength, sequences[i].GetKeyFrame(sequences[i].numFrames-1)->deltaTime);
+		for(j = sequences[i].numFrames-1; j > 0; j--){
+			KeyFrame *kf1 = sequences[i].GetKeyFrame(j);
+			KeyFrame *kf2 = sequences[i].GetKeyFrame(j-1);
+			kf1->deltaTime -= kf2->deltaTime;
+		}
+	}
+}
+
+void
+CAnimBlendHierarchy::CalcTotalTimeCompressed(void)
+{
+	int i, j;
+
+	totalLength = 0.0f;
+
+	for(i = 0; i < numSequences; i++){
+#ifdef FIX_BUGS
+		if(sequences[i].numFrames == 0)
+			continue;
+#endif
+
+		totalLength = Max(totalLength, sequences[i].GetKeyFrameCompressed(sequences[i].numFrames-1)->deltaTime/60.0f);
+		for(j = sequences[i].numFrames-1; j > 0; j--){
+			KeyFrame *kf1 = sequences[i].GetKeyFrameCompressed(j);
+			KeyFrame *kf2 = sequences[i].GetKeyFrameCompressed(j-1);
+			kf1->deltaTime -= kf2->deltaTime;
+		}
 	}
-	totalLength = totalTime;
 }
 
 void
@@ -53,17 +86,19 @@ CAnimBlendHierarchy::RemoveQuaternionFlips(void)
 void
 CAnimBlendHierarchy::RemoveAnimSequences(void)
 {
-	if(sequences)
-		delete[] sequences;
+	delete[] sequences;
+	sequences = nil;
 	numSequences = 0;
 }
 
 void
 CAnimBlendHierarchy::Uncompress(void)
 {
-	if(totalLength == 0.0f)
-		CalcTotalTime();
 	compressed = 0;
+	if(totalLength == 0.0f){
+		RemoveQuaternionFlips();
+		CalcTotalTime();
+	}
 }
 
 void
diff --git a/src/animation/AnimBlendHierarchy.h b/src/animation/AnimBlendHierarchy.h
index 0144108d..45c9217e 100644
--- a/src/animation/AnimBlendHierarchy.h
+++ b/src/animation/AnimBlendHierarchy.h
@@ -11,7 +11,8 @@ public:
 	char name[24];
 	CAnimBlendSequence *sequences;
 	int16 numSequences;
-	int16 compressed;	// not really used
+	bool compressed;	// not really used
+	bool compressed2;	// not really used
 	float totalLength;
 	CLink<CAnimBlendHierarchy*> *linkPtr;
 
@@ -19,6 +20,7 @@ public:
 	void Shutdown(void);
 	void SetName(char *name);
 	void CalcTotalTime(void);
+	void CalcTotalTimeCompressed(void);
 	void RemoveQuaternionFlips(void);
 	void RemoveAnimSequences(void);
 	void Uncompress(void);
diff --git a/src/animation/AnimBlendNode.cpp b/src/animation/AnimBlendNode.cpp
index df6cd1d5..4186e994 100644
--- a/src/animation/AnimBlendNode.cpp
+++ b/src/animation/AnimBlendNode.cpp
@@ -3,6 +3,8 @@
 #include "AnimBlendAssociation.h"
 #include "AnimBlendNode.h"
 
+//--MIAMI: file done
+
 void 
 CAnimBlendNode::Init(void)
 {
@@ -92,7 +94,9 @@ CAnimBlendNode::FindKeyFrame(float t)
 	frameA = 0;
 	frameB = frameA;
 
-	if(sequence->numFrames >= 2){
+	if(sequence->numFrames == 1){
+		remainingTime = 0.0f;
+	}else{
 		frameA++;
 
 		// advance until t is between frameB and frameA
@@ -101,8 +105,11 @@ CAnimBlendNode::FindKeyFrame(float t)
 			frameB = frameA++;
 			if(frameA >= sequence->numFrames){
 				// reached end of animation
-				if(!association->IsRepeating())
+				if(!association->IsRepeating()){
+					CalcDeltas();
+					remainingTime = 0.0f;
 					return false;
+				}
 				frameA = 0;
 				frameB = 0;
 			}
@@ -115,6 +122,25 @@ CAnimBlendNode::FindKeyFrame(float t)
 	return true;
 }
 
+bool
+CAnimBlendNode::SetupKeyFrameCompressed(void)
+{
+	if(sequence->numFrames < 1)
+		return false;
+
+	frameA = 1;
+	frameB = 0;
+
+	if(sequence->numFrames == 1){
+		frameA = 0;
+		remainingTime = 0.0f;
+	}else
+		remainingTime = sequence->GetKeyFrameCompressed(frameA)->deltaTime/60.0f;
+
+	CalcDeltasCompressed();
+	return true;
+}
+
 void
 CAnimBlendNode::CalcDeltas(void)
 {
@@ -130,6 +156,20 @@ CAnimBlendNode::CalcDeltas(void)
 }
 
 void
+CAnimBlendNode::CalcDeltasCompressed(void)
+{
+	if((sequence->type & CAnimBlendSequence::KF_ROT) == 0)
+		return;
+	KeyFrame *kfA = sequence->GetKeyFrameCompressed(frameA);
+	KeyFrame *kfB = sequence->GetKeyFrameCompressed(frameB);
+	float cos = DotProduct(kfA->rotation, kfB->rotation);
+	if(cos > 1.0f)
+		cos = 1.0f;
+	theta = Acos(cos);
+	invSin = theta == 0.0f ?  0.0f : 1.0f/Sin(theta);
+}
+
+void
 CAnimBlendNode::GetCurrentTranslation(CVector &trans, float weight)
 {
 	trans = CVector(0.0f, 0.0f, 0.0f);
@@ -138,7 +178,7 @@ CAnimBlendNode::GetCurrentTranslation(CVector &trans, float weight)
 	if(blend > 0.0f){
 		KeyFrameTrans *kfA = (KeyFrameTrans*)sequence->GetKeyFrame(frameA);
 		KeyFrameTrans *kfB = (KeyFrameTrans*)sequence->GetKeyFrame(frameB);
-		float t = (kfA->deltaTime - remainingTime)/kfA->deltaTime;
+		float t = kfA->deltaTime == 0.0f ? 0.0f : (kfA->deltaTime - remainingTime)/kfA->deltaTime;
 		if(sequence->type & CAnimBlendSequence::KF_TRANS){
 			trans = kfB->translation + t*(kfA->translation - kfB->translation);
 			trans *= blend;
diff --git a/src/animation/AnimBlendNode.h b/src/animation/AnimBlendNode.h
index 89924d6a..9446e1ae 100644
--- a/src/animation/AnimBlendNode.h
+++ b/src/animation/AnimBlendNode.h
@@ -22,7 +22,9 @@ public:
 	bool Update(CVector &trans, CQuaternion &rot, float weight);
 	bool NextKeyFrame(void);
 	bool FindKeyFrame(float t);
+	bool SetupKeyFrameCompressed(void);
 	void CalcDeltas(void);
+	void CalcDeltasCompressed(void);
 	void GetCurrentTranslation(CVector &trans, float weight);
 	void GetEndTranslation(CVector &trans, float weight);
 };
diff --git a/src/animation/AnimBlendSequence.cpp b/src/animation/AnimBlendSequence.cpp
index 4578ec50..b04d6b41 100644
--- a/src/animation/AnimBlendSequence.cpp
+++ b/src/animation/AnimBlendSequence.cpp
@@ -2,6 +2,8 @@
 
 #include "AnimBlendSequence.h"
 
+//--MIAMI: file done
+
 CAnimBlendSequence::CAnimBlendSequence(void)
 {
 	type = 0;
@@ -17,6 +19,8 @@ CAnimBlendSequence::~CAnimBlendSequence(void)
 {
 	if(keyFrames)
 		RwFree(keyFrames);
+	if(keyFramesCompressed)
+		RwFree(keyFramesCompressed);
 }
 
 void
@@ -26,18 +30,21 @@ CAnimBlendSequence::SetName(char *name)
 }
 
 void
-CAnimBlendSequence::SetNumFrames(int numFrames, bool translation)
+CAnimBlendSequence::SetNumFrames(int numFrames, bool translation, bool compressed)
 {
-	int sz;
-
 	if(translation){
-		sz = sizeof(KeyFrameTrans);
 		type |= KF_ROT | KF_TRANS;
+		if(compressed)
+			keyFramesCompressed = RwMalloc(sizeof(KeyFrameTrans) * numFrames);
+		else
+			keyFrames = RwMalloc(sizeof(KeyFrameTrans) * numFrames);
 	}else{
-		sz = sizeof(KeyFrame);
 		type |= KF_ROT;
+		if(compressed)
+			keyFramesCompressed = RwMalloc(sizeof(KeyFrame) * numFrames);
+		else
+			keyFrames = RwMalloc(sizeof(KeyFrame) * numFrames);
 	}
-	keyFrames = RwMalloc(sz * numFrames);
 	this->numFrames = numFrames;
 }
 
diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index 44ac8886..6d8c98aa 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -33,13 +33,18 @@ public:
 	CAnimBlendSequence(void);
 	virtual ~CAnimBlendSequence(void);
 	void SetName(char *name);
-	void SetNumFrames(int numFrames, bool translation);
+	void SetNumFrames(int numFrames, bool translation, bool compressed);
 	void RemoveQuaternionFlips(void);
 	KeyFrame *GetKeyFrame(int n) {
 		return type & KF_TRANS ?
 			&((KeyFrameTrans*)keyFrames)[n] :
 			&((KeyFrame*)keyFrames)[n];
 	}
+	KeyFrame *GetKeyFrameCompressed(int n) {
+		return type & KF_TRANS ?
+			&((KeyFrameTrans*)keyFramesCompressed)[n] :
+			&((KeyFrame*)keyFramesCompressed)[n];
+	}
 	bool HasTranslation(void) { return !!(type & KF_TRANS); }
 	// TODO? these are unused
 //	void Uncompress(void);
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index 444b6d45..c2f1c8bc 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -10,6 +10,9 @@
 #include "AnimBlendAssociation.h"
 #include "AnimBlendAssocGroup.h"
 #include "AnimManager.h"
+#include "Streaming.h"
+
+//--MIAMI: code done (except for pointless TODO)
 
 CAnimBlock CAnimManager::ms_aAnimBlocks[NUMANIMBLOCKS];
 CAnimBlendHierarchy CAnimManager::ms_aAnimations[NUMANIMATIONS];
@@ -32,26 +35,26 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_IDLE_ARMED, ASSOC_REPEAT | ASSOC_PARTIAL },
 	{ ANIM_IDLE_CHAT, ASSOC_REPEAT | ASSOC_PARTIAL },
 	{ ANIM_IDLE_TAXI, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_KO_SHOT_FRONT1, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
-	{ ANIM_KO_SHOT_FRONT2, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
-	{ ANIM_KO_SHOT_FRONT3, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
-	{ ANIM_KO_SHOT_FRONT4, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
-	{ ANIM_KO_SHOT_FACE, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
+	{ ANIM_KO_SHOT_FRONT1, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_KO_SHOT_FRONT2, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_KO_SHOT_FRONT3, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_KO_SHOT_FRONT4, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_KO_SHOT_FACE, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
 	{ ANIM_KO_SHOT_STOM, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_KO_SHOT_ARML, ASSOC_PARTIAL | ASSOC_FRONTAL  },
-	{ ANIM_KO_SHOT_ARMR, ASSOC_PARTIAL | ASSOC_FRONTAL  },
+	{ ANIM_KO_SHOT_ARML, ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_KO_SHOT_ARMR, ASSOC_PARTIAL | ASSOC_FRONTAL },
 	{ ANIM_KO_SHOT_LEGL, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_KO_SHOT_LEGR, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_KD_LEFT, ASSOC_PARTIAL | ASSOC_FRONTAL  },
-	{ ANIM_KD_RIGHT, ASSOC_PARTIAL | ASSOC_FRONTAL  },
+	{ ANIM_KD_LEFT, ASSOC_PARTIAL | ASSOC_FRONTAL },
+	{ ANIM_KD_RIGHT, ASSOC_PARTIAL | ASSOC_FRONTAL },
 	{ ANIM_KO_SKID_FRONT, ASSOC_PARTIAL },
 	{ ANIM_KO_SPIN_R, ASSOC_PARTIAL },
-	{ ANIM_KO_SKID_BACK, ASSOC_PARTIAL | ASSOC_FRONTAL  },
+	{ ANIM_KO_SKID_BACK, ASSOC_PARTIAL | ASSOC_FRONTAL },
 	{ ANIM_KO_SPIN_L, ASSOC_PARTIAL },
-	{ ANIM_SHOT_FRONT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_SHOT_LEFT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_SHOT_BACK_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_SHOT_RIGHT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
+	{ ANIM_SHOT_FRONT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_SHOT_LEFT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_SHOT_BACK_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_SHOT_RIGHT_PARTIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
 	{ ANIM_HIT_FRONT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_HIT_LEFT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_HIT_BACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
@@ -62,29 +65,8 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_HIT_HEAD, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_HIT_WALK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_HIT_WALL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FLOOR_HIT_F, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL  },
+	{ ANIM_FLOOR_HIT_F, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
 	{ ANIM_HIT_BEHIND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_PUNCH_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_KICK_FLOOR, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_BAT_H, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_BAT_V, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_HGUN_BODY, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_WEAPON_AK_BODY, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_PUMP, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_SNIPER, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_THROW, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_THROWU, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_START_THROW, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_BOMBER, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_HGUN_RELOAD, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_AK_RELOAD, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_FPS_PUNCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_BAT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_UZI, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_PUMP, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_AK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_M16, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_FPS_ROCKET, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_FIGHT_IDLE, ASSOC_REPEAT },
 	{ ANIM_FIGHT2_IDLE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_FIGHT_SH_F, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
@@ -96,7 +78,18 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_FIGHT_PUNCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_FIGHT_ROUNDHOUSE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_FIGHT_LONGKICK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FIGHT_PPUNCH, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_NOWALK  },
+	{ ANIM_FIGHT_PPUNCH, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_FIGHT_JAB, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_ELBOW_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_ELBOW_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_BKICK_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_BKICK_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BOMBER, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_PUNCH_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_PPUNCH2, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_KICK_FLOOR, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_THROWU, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_FIGHT_SH_BACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_CAR_JACKED_RHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_CAR_LJACKED_RHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_CAR_JACKED_LHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
@@ -115,6 +108,7 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_CAR_CLOSEDOOR_LOW_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_ROLLDOOR, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_ROLLDOOR_LOW, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_CAR_JUMPIN_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_GETOUT_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_GETOUT_LOW_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_CLOSE_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
@@ -130,39 +124,41 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_CAR_CLOSEDOOR_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_SHUFFLE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_LSHUFFLE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_CAR_SIT, ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_LSIT, ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_SITP, ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_SITPLO, ASSOC_DELETEFADEDOUT },
-	{ ANIM_DRIVE_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVE_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVE_LOW_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVE_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVEBY_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT },
+	{ ANIM_CAR_SIT, ASSOC_DELETEFADEDOUT},
+	{ ANIM_CAR_LSIT, ASSOC_DELETEFADEDOUT},
+	{ ANIM_CAR_SITP, ASSOC_DELETEFADEDOUT},
+	{ ANIM_CAR_SITPLO, ASSOC_DELETEFADEDOUT},
+	{ ANIM_DRIVE_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVE_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVE_LOW_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVE_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVEBY_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVEBY_LOW_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVEBY_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
+	{ ANIM_DRIVE_BOAT_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_DRIVE_BOAT_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BOAT_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_PICKUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_PICKUP_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_PULLUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_PULLUP_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_ELBOW_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_ELBOW_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_FALL_OFF, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_BIKE_FALL_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_CAR_GETOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL },
-	{ ANIM_COACH_OPEN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_OPEN_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_IN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_IN_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_COACH_OUT_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_TRAIN_GETIN, ASSOC_PARTIAL },
-	{ ANIM_TRAIN_GETOUT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_IDLE_STANCE2, ASSOC_PARTIAL },
+	{ ANIM_IDLE_STANCE3, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_CRAWLOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_CRAWLOUT_RHS2, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_OPEN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETIN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_CLOSE_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETOUT_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_OPEN, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETIN, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_CLOSE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
-	{ ANIM_VAN_GETOUT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_CAR_ROLLOUT_LHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
+	{ ANIM_CAR_ROLLOUT_RHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
 	{ ANIM_GETUP1, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_GETUP2, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_GETUP3, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
@@ -174,33 +170,132 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_FALL_GLIDE, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_FALL_LAND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_FALL_COLLAPSE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_FALL_BACK, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_FALL_FRONT, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
 	{ ANIM_EV_STEP, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_EV_DIVE, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL  },
-	{ ANIM_XPRESS_SCRATCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_FLAG_XPRESS  },
+	{ ANIM_EV_DIVE, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
+	{ ANIM_XPRESS_SCRATCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
 	{ ANIM_ROAD_CROSS, ASSOC_REPEAT | ASSOC_PARTIAL },
 	{ ANIM_TURN_180, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_ARREST_GUN, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_DROWN, ASSOC_PARTIAL },
-	{ ANIM_CPR, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_DUCK_DOWN, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_DUCK_LOW, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_CROUCH, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_RBLOCK_CSHOOT, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
-	{ ANIM_WEAPON_THROWU2, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_HANDSUP, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
 	{ ANIM_HANDSCOWER, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
-	{ ANIM_FUCKU, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK  },
-	{ ANIM_PHONE_IN, ASSOC_PARTIAL },
+	{ ANIM_FUCKU, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_PHONE_IN, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_PHONE_OUT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_PHONE_TALK, ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+	{ ANIM_SEAT_DOWN, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_SEAT_UP, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_SEAT_IDLE, ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_SEAT_DOWN2, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ATM, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_ABSEIL, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
+};
+AnimAssocDesc aVanAnimDescs[] = {
+	{ ANIM_VAN_OPEN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_GETIN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_CLOSE_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_GETOUT_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_OPEN, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_GETIN, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_CLOSE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_VAN_GETOUT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aCoachAnimDescs[] = {
+	{ ANIM_COACH_OPEN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_COACH_OPEN_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_COACH_IN_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_COACH_IN_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_COACH_OUT_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aBikeAnimDescs[] = {
+	{ ANIM_BIKE_RIDE, ASSOC_DELETEFADEDOUT},
+	{ ANIM_BIKE_STILL, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_LEFT, ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_RIGHT, ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_BACK, ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_FWD, ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_PUSHES, ASSOC_REPEAT | ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_JUMPON_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_JUMPON_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_KICK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_HIT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_GETOFF_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_GETOFF_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_BIKE_GETOFF_BACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
+	{ ANIM_BIKE_DRIVEBY_RHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_DRIVEBY_LHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_DRIVEBY_FT, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
+	{ ANIM_BIKE_PASSENGER, ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
+};
+AnimAssocDesc aMeleeAnimDescs[] = {
+	{ ANIM_MELEE_ATTACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_MELEE_ATTACK_2ND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_MELEE_ATTACK_START, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK },
+	{ ANIM_WEAPON_CROUCHRELOAD, ASSOC_REPEAT }, // TODO(Miami): Overload that name for melee/swing
+	{ ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION }, // TODO(Miami): Overload that name for melee/swing
+};
+AnimAssocDesc aSwingAnimDescs[] = {
+	{ ANIM_MELEE_ATTACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_MELEE_ATTACK_2ND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_MELEE_ATTACK_START, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_CROUCHRELOAD, ASSOC_REPEAT }, // TODO(Miami): Overload that name for melee/swing
+	{ ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, // TODO(Miami): Overload that name for melee/swing
+};
+AnimAssocDesc aWeaponAnimDescs[] = {
+	{ ANIM_WEAPON_FIRE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_CROUCHFIRE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_RELOAD, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_CROUCHRELOAD, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aMedicAnimDescs[] = {
+	{ ANIM_CPR, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aSunbatheAnimDescs[] = {
+	{ ANIM_SUNBATHE, ASSOC_REPEAT | ASSOC_PARTIAL },
+	{ ANIM_SUNBATHE_DOWN, ASSOC_REPEAT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
+	{ ANIM_SUNBATHE_UP, ASSOC_REPEAT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
+	{ ANIM_SUNBATHE_ESCAPE, ASSOC_REPEAT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
+};
+AnimAssocDesc aPlayerIdleAnimDescs[] = {
+	{ ANIM_IDLE_STRETCH, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_IDLE_TIME, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_IDLE_SHOULDER, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_IDLE_STRETCH_LEG, ASSOC_DELETEFADEDOUT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aRiotAnimDescs[] = {
+	{ ANIM_RIOT_ANGRY, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_ANGRY_B, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_CHANT, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_PUNCHES, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_SHOUT, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_CHALLENGE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_RIOT_FUKU, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+};
+AnimAssocDesc aStripAnimDescs[] = {
+	{ ANIM_STRIP_A, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_B, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_C, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_D, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_E, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_F, ASSOC_REPEAT | ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_STRIP_G, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 };
 AnimAssocDesc aStdAnimDescsSide[] = {
-	{ ANIM_WALK, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK | ASSOC_HAS_X_TRANSLATION },
-	{ ANIM_RUN, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK | ASSOC_HAS_X_TRANSLATION },
-	{ ANIM_SPRINT, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_WALK | ASSOC_HAS_X_TRANSLATION },
+	{ ANIM_WALK, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
+	{ ANIM_RUN, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
+	{ ANIM_SPRINT, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION | ASSOC_WALK },
 	{ ANIM_IDLE_STANCE, ASSOC_REPEAT },
 	{ ANIM_WALK_START, ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION },
 };
-char const *aStdAnimations[] = {
+
+char const* aStdAnimations[] = {
 	"walk_civi",
 	"run_civi",
 	"sprint_panic",
@@ -208,7 +303,7 @@ char const *aStdAnimations[] = {
 	"walk_start",
 	"run_stop",
 	"run_stopR",
-	"idle_cam",
+	"idle_hbhb",
 	"idle_hbhb",
 	"idle_tired",
 	"idle_armed",
@@ -246,27 +341,6 @@ char const *aStdAnimations[] = {
 	"HIT_wall",
 	"FLOOR_hit_f",
 	"HIT_behind",
-	"punchR",
-	"KICK_floor",
-	"WEAPON_bat_h",
-	"WEAPON_bat_v",
-	"WEAPON_hgun_body",
-	"WEAPON_AK_body",
-	"WEAPON_pump",
-	"WEAPON_sniper",
-	"WEAPON_throw",
-	"WEAPON_throwu",
-	"WEAPON_start_throw",
-	"bomber",
-	"WEAPON_hgun_rload",
-	"WEAPON_AK_rload",
-	"FPS_PUNCH",
-	"FPS_BAT",
-	"FPS_UZI",
-	"FPS_PUMP",
-	"FPS_AK",
-	"FPS_M16",
-	"FPS_ROCKET",
 	"FIGHTIDLE",
 	"FIGHT2IDLE",
 	"FIGHTsh_F",
@@ -279,6 +353,17 @@ char const *aStdAnimations[] = {
 	"FIGHTrndhse",
 	"FIGHTlngkck",
 	"FIGHTppunch",
+	"FIGHTjab",
+	"FIGHTelbowL",
+	"FIGHTelbowR",
+	"FIGHTbkickL",
+	"FIGHTbkickR",
+	"bomber",
+	"punchR",
+	"FIGHTppunch",
+	"KICK_floor",
+	"WEAPON_throwu",
+	"FIGHTsh_back",
 	"car_jackedRHS",
 	"car_LjackedRHS",
 	"car_jackedLHS",
@@ -297,6 +382,7 @@ char const *aStdAnimations[] = {
 	"CAR_closedoorL_LHS",
 	"CAR_rolldoor",
 	"CAR_rolldoorLO",
+	"CAR_jumpin_LHS",
 	"CAR_getout_LHS",
 	"CAR_getoutL_LHS",
 	"CAR_close_LHS",
@@ -322,29 +408,31 @@ char const *aStdAnimations[] = {
 	"Drive_LO_R",
 	"Driveby_L",
 	"Driveby_R",
+	"DrivebyL_L",
+	"DrivebyL_R",
 	"CAR_LB",
 	"DRIVE_BOAT",
+	"DRIVE_BOAT_L",
+	"DRIVE_BOAT_R",
+	"DRIVE_BOAT_back",
+	"BIKE_pickupR",
+	"BIKE_pickupL",
+	"BIKE_pullupR",
+	"BIKE_pullupL",
+	"BIKE_elbowR",
+	"BIKE_elbowL",
+	"BIKE_fall_off",
+	"BIKE_fallR",
 	"CAR_getout_RHS",
 	"CAR_getoutL_RHS",
 	"CAR_close_RHS",
 	"car_hookertalk",
-	"COACH_opnL",
-	"COACH_opnR",
-	"COACH_inL",
-	"COACH_inR",
-	"COACH_outL",
-	"TRAIN_getin",
-	"TRAIN_getout",
+	"idle_stance",
+	"idle_stance",
 	"CAR_crawloutRHS",
 	"CAR_crawloutRHS",
-	"VAN_openL",
-	"VAN_getinL",
-	"VAN_closeL",
-	"VAN_getoutL",
-	"VAN_open",
-	"VAN_getin",
-	"VAN_close",
-	"VAN_getout",
+	"CAR_rollout_LHS",
+	"CAR_rollout_LHS",
 	"Getup",
 	"Getup",
 	"Getup",
@@ -356,6 +444,8 @@ char const *aStdAnimations[] = {
 	"FALL_glide",
 	"FALL_land",
 	"FALL_collapse",
+	"FALL_back",
+	"FALL_front",
 	"EV_step",
 	"EV_dive",
 	"XPRESSscratch",
@@ -363,201 +453,515 @@ char const *aStdAnimations[] = {
 	"TURN_180",
 	"ARRESTgun",
 	"DROWN",
-	"CPR",
 	"DUCK_down",
 	"DUCK_low",
+	"WEAPON_crouch",
 	"RBLOCK_Cshoot",
-	"WEAPON_throwu",
 	"handsup",
 	"handsCOWER",
 	"FUCKU",
 	"PHONE_in",
 	"PHONE_out",
 	"PHONE_talk",
+	"SEAT_down",
+	"SEAT_up",
+	"SEAT_idle",
+	"SEAT_down",
+	"ATM",
+	"abseil",
+};
+char const* aVanAnimations[] = {
+	"VAN_openL",
+	"VAN_getinL",
+	"VAN_closeL",
+	"VAN_getoutL",
+	"VAN_open",
+	"VAN_getin",
+	"VAN_close",
+	"VAN_getout",
+};
+char const* aCoachAnimations[] = {
+	"COACH_opnL",
+	"COACH_opnL",
+	"COACH_inL",
+	"COACH_inL",
+	"COACH_outL",
+};
+char const* aBikesAnimations[] = {
+	"BIKEs_Ride",
+	"BIKEs_Still",
+	"BIKEs_Left",
+	"BIKEs_Right",
+	"BIKEs_Back",
+	"BIKEs_Fwd",
+	"BIKEs_pushes",
+	"BIKEs_jumponR",
+	"BIKEs_jumponL",
+	"BIKEs_kick",
+	"BIKEs_hit",
+	"BIKEs_getoffRHS",
+	"BIKEs_getoffLHS",
+	"BIKEs_getoffBACK",
+	"BIKEs_drivebyLHS",
+	"BIKEs_drivebyRHS",
+	"BIKEs_drivebyFT",
+	"BIKEs_passenger",
+};
+char const* aBikevAnimations[] = {
+	"BIKEv_Ride",
+	"BIKEv_Still",
+	"BIKEv_Left",
+	"BIKEv_Right",
+	"BIKEv_Back",
+	"BIKEv_Fwd",
+	"BIKEv_pushes",
+	"BIKEv_jumponR",
+	"BIKEv_jumponL",
+	"BIKEv_kick",
+	"BIKEv_hit",
+	"BIKEv_getoffRHS",
+	"BIKEv_getoffLHS",
+	"BIKEv_getoffBACK",
+	"BIKEv_drivebyLHS",
+	"BIKEv_drivebyRHS",
+	"BIKEv_drivebyFT",
+	"BIKEv_passenger",
+};
+char const* aBikehAnimations[] = {
+	"BIKEh_Ride",
+	"BIKEh_Still",
+	"BIKEh_Left",
+	"BIKEh_Right",
+	"BIKEh_Back",
+	"BIKEh_Fwd",
+	"BIKEh_pushes",
+	"BIKEh_jumponR",
+	"BIKEh_jumponL",
+	"BIKEh_kick",
+	"BIKEh_hit",
+	"BIKEh_getoffRHS",
+	"BIKEh_getoffLHS",
+	"BIKEh_getoffBACK",
+	"BIKEh_drivebyLHS",
+	"BIKEh_drivebyRHS",
+	"BIKEh_drivebyFT",
+	"BIKEh_passenger",
+};
+char const* aBikedAnimations[] = {
+	"BIKEd_Ride",
+	"BIKEd_Still",
+	"BIKEd_Left",
+	"BIKEd_Right",
+	"BIKEd_Back",
+	"BIKEd_Fwd",
+	"BIKEd_pushes",
+	"BIKEd_jumponR",
+	"BIKEd_jumponL",
+	"BIKEd_kick",
+	"BIKEd_hit",
+	"BIKEd_getoffRHS",
+	"BIKEd_getoffLHS",
+	"BIKEd_getoffBACK",
+	"BIKEd_drivebyLHS",
+	"BIKEd_drivebyRHS",
+	"BIKEd_drivebyFT",
+	"BIKEd_passenger",
+};
+char const* aUnarmedAnimations[] = {
+	"punchR",
+	"KICK_floor",
+	"FIGHTppunch",
+};
+char const* aScrewdriverAnimations[] = {
+	"FIGHTbodyblow",
+	"FIGHTbodyblow",
+	"FIGHTppunch",
+	"FIGHTIDLE",
+	"FIGHTbodyblow",
+};
+char const* aKnifeAnimations[] = {
+	"WEAPON_knife_1",
+	"WEAPON_knife_2",
+	"knife_part",
+	"WEAPON_knifeidle",
+	"WEAPON_knife_3",
+};
+char const* aBaseballbatAnimations[] = {
+	"WEAPON_bat_h",
+	"WEAPON_bat_v",
+	"BAT_PART",
+	"WEAPON_bat_h",
+	"WEAPON_golfclub",
+};
+char const* aGolfclubAnimations[] = {
+	"WEAPON_bat_h",
+	"WEAPON_golfclub",
+	"BAT_PART",
+	"WEAPON_bat_h",
+	"WEAPON_bat_v",
 };
-char const *aPlayerAnimations[] = {
+char const* aChainsawAnimations[] = {
+	"WEAPON_csaw",
+	"WEAPON_csawlo",
+	"csaw_part",
+};
+char const* aPythonAnimations[] = {
+	"python_fire",
+	"python_crouchfire",
+	"python_reload",
+	"python_crouchreload",
+};
+char const* aColtAnimations[] = {
+	"colt45_fire",
+	"colt45_crouchfire",
+	"colt45_reload",
+	"colt45_crouchreload",
+	"colt45_cop",
+};
+char const* aShotgunAnimations[] = {
+	"shotgun_fire",
+	"shotgun_crouchfire",
+};
+char const* aBuddyAnimations[] = {
+	"buddy_fire",
+	"buddy_crouchfire",
+};
+char const* aTecAnimations[] = {
+	"TEC_fire",
+	"TEC_crouchfire",
+	"TEC_reload",
+	"TEC_crouchreload",
+};
+char const* aUziAnimations[] = {
+	"UZI_fire",
+	"UZI_crouchfire",
+	"UZI_reload",
+	"UZI_crouchreload",
+};
+char const* aRifleAnimations[] = {
+	"RIFLE_fire",
+	"RIFLE_crouchfire",
+	"RIFLE_load",
+	"RIFLE_crouchload",
+};
+char const* aM60Animations[] = {
+	"M60_fire",
+	"M60_fire",
+	"M60_reload",
+};
+char const* aSniperAnimations[] = {
+	"WEAPON_sniper",
+};
+char const* aThrowAnimations[] = {
+	"WEAPON_throw",
+	"WEAPON_throwu",
+	"WEAPON_start_throw",
+};
+char const* aFlamethrowerAnimations[] = {
+	"FLAME_fire",
+};
+char const* aMedicAnimations[] = {
+	"CPR",
+};
+char const* aSunbatheAnimations[] = {
+	"bather",
+	"batherdown",
+	"batherup",
+	"batherscape",
+};
+char const* aPlayerIdleAnimations[] = {
+	"stretch",
+	"time",
+	"shldr",
+	"strleg",
+};
+char const* aRiotAnimations[] = {
+	"riot_angry",
+	"riot_angry_b",
+	"riot_chant",
+	"riot_punches",
+	"riot_shout",
+	"riot_challenge",
+	"riot_fuku",
+};
+char const* aStripAnimations[] = {
+	"strip_A",
+	"strip_B",
+	"strip_C",
+	"strip_D",
+	"strip_E",
+	"strip_F",
+	"strip_G",
+};
+char const* aLanceAnimations[] = {
+	"lance",
+};
+char const* aPlayerAnimations[] = {
 	"walk_player",
 	"run_player",
 	"SPRINT_civi",
 	"IDLE_STANCE",
 	"walk_start",
 };
-char const *aPlayerWithRocketAnimations[] = {
+char const* aPlayerWithRocketAnimations[] = {
 	"walk_rocket",
 	"run_rocket",
 	"run_rocket",
 	"idle_rocket",
 	"walk_start_rocket",
 };
-char const *aPlayer1ArmedAnimations[] = {
+char const* aPlayer1ArmedAnimations[] = {
 	"walk_player",
 	"run_1armed",
 	"SPRINT_civi",
 	"IDLE_STANCE",
 	"walk_start",
 };
-char const *aPlayer2ArmedAnimations[] = {
-	"walk_player",
+char const* aPlayer2ArmedAnimations[] = {
+	"walk_armed",
 	"run_armed",
 	"run_armed",
-	"idle_stance",
-	"walk_start",
+	"idle_armed",
+	"walk_start_armed",
 };
-char const *aPlayerBBBatAnimations[] = {
+char const* aPlayerBBBatAnimations[] = {
 	"walk_player",
 	"run_player",
 	"run_player",
 	"IDLE_STANCE",
 	"walk_start",
 };
-char const *aShuffleAnimations[] = {
+char const* aPlayerChainsawAnimations[] = {
+	"walk_csaw",
+	"run_csaw",
+	"run_csaw",
+	"IDLE_csaw",
+	"walk_start_csaw",
+};
+char const* aShuffleAnimations[] = {
 	"WALK_shuffle",
 	"RUN_civi",
 	"SPRINT_civi",
 	"IDLE_STANCE",
 };
-char const *aOldAnimations[] = {
+char const* aOldAnimations[] = {
 	"walk_old",
 	"run_civi",
 	"sprint_civi",
 	"idle_stance",
 };
-char const *aGang1Animations[] = {
+char const* aGang1Animations[] = {
 	"walk_gang1",
 	"run_gang1",
 	"sprint_civi",
 	"idle_stance",
 };
-char const *aGang2Animations[] = {
+char const* aGang2Animations[] = {
 	"walk_gang2",
 	"run_gang1",
 	"sprint_civi",
 	"idle_stance",
 };
-char const *aFatAnimations[] = {
+char const* aFatAnimations[] = {
 	"walk_fat",
 	"run_civi",
 	"woman_runpanic",
 	"idle_stance",
 };
-char const *aOldFatAnimations[] = {
+char const* aOldFatAnimations[] = {
 	"walk_fatold",
 	"run_fatold",
 	"woman_runpanic",
 	"idle_stance",
 };
-char const *aStdWomanAnimations[] = {
+char const* aJoggerAnimations[] = {
+	"JOG_maleA",
+	"run_civi",
+	"sprint_civi",
+	"idle_stance",
+};
+char const* aStdWomanAnimations[] = {
 	"woman_walknorm",
 	"woman_run",
 	"woman_runpanic",
 	"woman_idlestance",
 };
-char const *aWomanShopAnimations[] = {
+char const* aWomanShopAnimations[] = {
 	"woman_walkshop",
 	"woman_run",
 	"woman_run",
 	"woman_idlestance",
 };
-char const *aBusyWomanAnimations[] = {
+char const* aBusyWomanAnimations[] = {
 	"woman_walkbusy",
 	"woman_run",
 	"woman_runpanic",
 	"woman_idlestance",
 };
-char const *aSexyWomanAnimations[] = {
+char const* aSexyWomanAnimations[] = {
 	"woman_walksexy",
 	"woman_run",
 	"woman_runpanic",
 	"woman_idlestance",
 };
-char const *aOldWomanAnimations[] = {
+char const* aFatWomanAnimations[] = {
+	"walk_fat",
+	"woman_run",
+	"woman_runpanic",
+	"woman_idlestance",
+};
+char const* aOldWomanAnimations[] = {
 	"woman_walkold",
 	"woman_run",
 	"woman_runpanic",
 	"woman_idlestance",
 };
-char const *aFatWomanAnimations[] = {
-	"walk_fat",
+char const* aJoggerWomanAnimations[] = {
+	"JOG_maleB",
 	"woman_run",
 	"woman_runpanic",
 	"woman_idlestance",
 };
-char const *aPanicChunkyAnimations[] = {
+char const* aPanicChunkyAnimations[] = {
 	"run_fatold",
 	"woman_runpanic",
 	"woman_runpanic",
 	"idle_stance",
 };
-char const *aPlayerStrafeBackAnimations[] = {
-	"walk_player_back",
-	"run_player_back",
-	"run_player_back",
+char const* aSkateAnimations[] = {
+	"skate_run",
+	"skate_sprint",
+	"skate_sprint",
+	"skate_idle",
+};
+char const* aPlayerStrafeBackAnimations[] = {
+	"walk_back",
+	"run_back",
+	"run_back",
 	"IDLE_STANCE",
 	"walk_start_back",
 };
-char const *aPlayerStrafeLeftAnimations[] = {
-	"walk_player_left",
+char const* aPlayerStrafeLeftAnimations[] = {
+	"walk_left",
 	"run_left",
 	"run_left",
 	"IDLE_STANCE",
 	"walk_start_left",
 };
-char const *aPlayerStrafeRightAnimations[] = {
-	"walk_player_right",
+char const* aPlayerStrafeRightAnimations[] = {
+	"walk_right",
 	"run_right",
 	"run_right",
 	"IDLE_STANCE",
 	"walk_start_right",
 };
-char const *aRocketStrafeBackAnimations[] = {
+char const* aRocketStrafeBackAnimations[] = {
 	"walk_rocket_back",
 	"run_rocket_back",
 	"run_rocket_back",
 	"idle_rocket",
 	"walkst_rocket_back",
 };
-char const *aRocketStrafeLeftAnimations[] = {
+char const* aRocketStrafeLeftAnimations[] = {
 	"walk_rocket_left",
 	"run_rocket_left",
 	"run_rocket_left",
 	"idle_rocket",
 	"walkst_rocket_left",
 };
-char const *aRocketStrafeRightAnimations[] = {
+char const* aRocketStrafeRightAnimations[] = {
 	"walk_rocket_right",
 	"run_rocket_right",
 	"run_rocket_right",
 	"idle_rocket",
 	"walkst_rocket_right",
 };
+char const* aChainsawStrafeBackAnimations[] = {
+	"walk_csaw_back",
+	"run_csaw_back",
+	"run_csaw_back",
+	"idle_csaw",
+	"walkst_csaw_back",
+};
+char const* aChainsawStrafeLeftAnimations[] = {
+	"walk_csaw_left",
+	"run_csaw_left",
+	"run_csaw_left",
+	"idle_csaw",
+	"walkst_csaw_left",
+};
+char const* aChainsawStrafeRightAnimations[] = {
+	"walk_csaw_right",
+	"run_csaw_right",
+	"run_csaw_right",
+	"idle_csaw",
+	"walkst_csaw_right",
+};
+
 
 #define awc(a) ARRAY_SIZE(a), a
 const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS] = {
 	{ "man", "ped", MI_COP, awc(aStdAnimations), aStdAnimDescs },
+	{ "van", "van", MI_COP, awc(aVanAnimations), aVanAnimDescs },
+	{ "coach", "coach", MI_COP, awc(aCoachAnimations), aCoachAnimDescs },
+	{ "bikes", "bikes", MI_COP, awc(aBikesAnimations), aBikeAnimDescs },
+	{ "bikev", "bikev", MI_COP, awc(aBikevAnimations), aBikeAnimDescs },
+	{ "bikeh", "bikeh", MI_COP, awc(aBikehAnimations), aBikeAnimDescs },
+	{ "biked", "biked", MI_COP, awc(aBikedAnimations), aBikeAnimDescs },
+	{ "unarmed", "ped", MI_COP, awc(aUnarmedAnimations), aMeleeAnimDescs },
+	{ "screwdrv", "ped", MI_COP, awc(aScrewdriverAnimations), aMeleeAnimDescs },
+	{ "knife", "knife", MI_COP, awc(aKnifeAnimations), aMeleeAnimDescs },
+	{ "baseball", "baseball", MI_COP, awc(aBaseballbatAnimations), aSwingAnimDescs },
+	{ "golfclub", "baseball", MI_COP, awc(aGolfclubAnimations), aSwingAnimDescs },
+	{ "chainsaw", "chainsaw", MI_COP, awc(aChainsawAnimations), aMeleeAnimDescs },
+	{ "python", "python", MI_COP, awc(aPythonAnimations), aWeaponAnimDescs },
+	{ "colt45", "colt45", MI_COP, awc(aColtAnimations), aWeaponAnimDescs },
+	{ "shotgun", "shotgun", MI_COP, awc(aShotgunAnimations), aWeaponAnimDescs },
+	{ "buddy", "buddy", MI_COP, awc(aBuddyAnimations), aWeaponAnimDescs },
+	{ "tec", "tec", MI_COP, awc(aTecAnimations), aWeaponAnimDescs },
+	{ "uzi", "uzi", MI_COP, awc(aUziAnimations), aWeaponAnimDescs },
+	{ "rifle", "rifle", MI_COP, awc(aRifleAnimations), aWeaponAnimDescs },
+	{ "m60", "m60", MI_COP, awc(aM60Animations), aWeaponAnimDescs },
+	{ "sniper", "sniper", MI_COP, awc(aSniperAnimations), aWeaponAnimDescs },
+	{ "grenade", "grenade", MI_COP, awc(aThrowAnimations), aWeaponAnimDescs },
+	{ "flame", "flame", MI_COP, awc(aFlamethrowerAnimations), aWeaponAnimDescs },
+	{ "medic", "medic", MI_COP, awc(aMedicAnimations), aMedicAnimDescs },
+	{ "sunbathe", "sunbathe", MI_COP, 1, aSunbatheAnimations, aSunbatheAnimDescs },	// NB: not using awc here!
+	{ "playidles", "playidles", MI_COP, awc(aPlayerIdleAnimations), aPlayerIdleAnimDescs },
+	{ "riot", "riot", MI_COP, awc(aRiotAnimations), aRiotAnimDescs },
+	{ "strip", "strip", MI_COP, awc(aStripAnimations), aStripAnimDescs },
+	{ "lance", "lance", MI_COP, awc(aLanceAnimations), aSunbatheAnimDescs },
 	{ "player", "ped", MI_COP, awc(aPlayerAnimations), aStdAnimDescs },
 	{ "playerrocket", "ped", MI_COP, awc(aPlayerWithRocketAnimations), aStdAnimDescs },
 	{ "player1armed", "ped", MI_COP, awc(aPlayer1ArmedAnimations), aStdAnimDescs },
 	{ "player2armed", "ped", MI_COP, awc(aPlayer2ArmedAnimations), aStdAnimDescs },
 	{ "playerBBBat", "ped", MI_COP, awc(aPlayerBBBatAnimations), aStdAnimDescs },
+	{ "playercsaw", "ped", MI_COP, awc(aPlayerChainsawAnimations), aStdAnimDescs },
 	{ "shuffle", "ped", MI_COP, awc(aShuffleAnimations), aStdAnimDescs },
 	{ "oldman", "ped", MI_COP, awc(aOldAnimations), aStdAnimDescs },
 	{ "gang1", "ped", MI_COP, awc(aGang1Animations), aStdAnimDescs },
 	{ "gang2", "ped", MI_COP, awc(aGang2Animations), aStdAnimDescs },
 	{ "fatman", "ped", MI_COP, awc(aFatAnimations), aStdAnimDescs },
 	{ "oldfatman", "ped", MI_COP, awc(aOldFatAnimations), aStdAnimDescs },
+	{ "jogger", "ped", MI_COP, awc(aJoggerAnimations), aStdAnimDescs },
 	{ "woman", "ped", MI_COP, awc(aStdWomanAnimations), aStdAnimDescs },
 	{ "shopping", "ped", MI_COP, awc(aWomanShopAnimations), aStdAnimDescs },
 	{ "busywoman", "ped", MI_COP, awc(aBusyWomanAnimations), aStdAnimDescs },
 	{ "sexywoman", "ped", MI_COP, awc(aSexyWomanAnimations), aStdAnimDescs },
-	{ "oldwoman", "ped", MI_COP, awc(aOldWomanAnimations), aStdAnimDescs },
 	{ "fatwoman", "ped", MI_COP, awc(aFatWomanAnimations), aStdAnimDescs },
+	{ "oldwoman", "ped", MI_COP, awc(aOldWomanAnimations), aStdAnimDescs },
+	{ "jogwoman", "ped", MI_COP, awc(aJoggerWomanAnimations), aStdAnimDescs },
 	{ "panicchunky", "ped", MI_COP, awc(aPanicChunkyAnimations), aStdAnimDescs },
+	{ "skate", "skate", MI_COP, awc(aSkateAnimations), aStdAnimDescs },
 	{ "playerback", "ped", MI_COP, awc(aPlayerStrafeBackAnimations), aStdAnimDescs },
 	{ "playerleft", "ped", MI_COP, awc(aPlayerStrafeLeftAnimations), aStdAnimDescsSide },
 	{ "playerright", "ped", MI_COP, awc(aPlayerStrafeRightAnimations), aStdAnimDescsSide },
 	{ "rocketback", "ped", MI_COP, awc(aRocketStrafeBackAnimations), aStdAnimDescs },
 	{ "rocketleft", "ped", MI_COP, awc(aRocketStrafeLeftAnimations), aStdAnimDescsSide },
 	{ "rocketright", "ped", MI_COP, awc(aRocketStrafeRightAnimations), aStdAnimDescsSide },
+	{ "csawback", "ped", MI_COP, awc(aChainsawStrafeBackAnimations), aStdAnimDescs },
+	{ "csawleft", "ped", MI_COP, awc(aChainsawStrafeLeftAnimations), aStdAnimDescsSide },
+	{ "csawright", "ped", MI_COP, awc(aChainsawStrafeRightAnimations), aStdAnimDescsSide },
 };
 #undef awc
 
@@ -567,8 +971,6 @@ CAnimManager::Initialise(void)
 	ms_numAnimations = 0;
 	ms_numAnimBlocks = 0;
 	ms_animCache.Init(25);
-
-//	dumpanimdata();
 }
 
 void
@@ -576,31 +978,48 @@ CAnimManager::Shutdown(void)
 {
 	int i;
 
-	ms_animCache.Shutdown();
+	for(i = 0; i < NUMANIMBLOCKS; i++)
+		CStreaming::RemoveAnim(i);
 
 	for(i = 0; i < ms_numAnimations; i++)
 		ms_aAnimations[i].Shutdown();
 
+	ms_animCache.Shutdown();
+
 	delete[] ms_aAnimAssocGroups;
 }
 
 void
 CAnimManager::UncompressAnimation(CAnimBlendHierarchy *hier)
 {
-	if(!hier->compressed){
-		if(hier->linkPtr){
-			hier->linkPtr->Remove();
-			ms_animCache.head.Insert(hier->linkPtr);
-		}
+	if(hier->compressed2){
+		if(hier->totalLength == 0.0f)
+			hier->CalcTotalTimeCompressed();
 	}else{
-		CLink<CAnimBlendHierarchy*> *link = ms_animCache.Insert(hier);
-		if(link == nil){
-			ms_animCache.tail.prev->item->RemoveUncompressedData();
-			ms_animCache.Remove(ms_animCache.tail.prev);
-			link = ms_animCache.Insert(hier);
+		if(!hier->compressed){
+			if(hier->linkPtr){
+				hier->linkPtr->Remove();
+				ms_animCache.head.Insert(hier->linkPtr);
+			}
+		}else{
+			CLink<CAnimBlendHierarchy*> *link = ms_animCache.Insert(hier);
+			if(link == nil){
+				ms_animCache.tail.prev->item->RemoveUncompressedData();
+				ms_animCache.Remove(ms_animCache.tail.prev);
+				link = ms_animCache.Insert(hier);
+			}
+			hier->linkPtr = link;
+			hier->Uncompress();
 		}
-		hier->linkPtr = link;
-		hier->Uncompress();
+	}
+}
+
+void
+CAnimManager::RemoveFromUncompressedCache(CAnimBlendHierarchy *hier)
+{
+	if(hier->linkPtr){
+		ms_animCache.Remove(hier->linkPtr);
+		hier->linkPtr = nil;
 	}
 }
 
@@ -615,6 +1034,73 @@ CAnimManager::GetAnimationBlock(const char *name)
 	return nil;
 }
 
+int32
+CAnimManager::GetAnimationBlockIndex(const char *name)
+{
+	int i;
+
+	for(i = 0; i < ms_numAnimBlocks; i++)
+		if(strcasecmp(ms_aAnimBlocks[i].name, name) == 0)
+			return i;
+	return -1;
+}
+
+int32
+CAnimManager::RegisterAnimBlock(const char *name)
+{
+	CAnimBlock *animBlock = GetAnimationBlock(name);
+	if(animBlock == nil){
+		animBlock = &ms_aAnimBlocks[ms_numAnimBlocks++];
+		strncpy(animBlock->name, name, MAX_ANIMBLOCK_NAME);
+		animBlock->numAnims = 0;
+		assert(animBlock->refCount == 0);
+	}
+	return animBlock - ms_aAnimBlocks;
+}
+
+int32
+CAnimManager::GetNumRefsToAnimBlock(int32 block)
+{
+	return ms_aAnimBlocks[block].refCount;
+}
+
+void
+CAnimManager::AddAnimBlockRef(int32 block)
+{
+	ms_aAnimBlocks[block].refCount++;
+}
+
+void
+CAnimManager::RemoveAnimBlockRefWithoutDelete(int32 block)
+{
+	ms_aAnimBlocks[block].refCount--;
+}
+
+void
+CAnimManager::RemoveAnimBlockRef(int32 block)
+{
+	ms_aAnimBlocks[block].refCount--;
+	if(ms_aAnimBlocks[block].refCount == 0)
+		CStreaming::RemoveAnim(block);
+}
+
+void
+CAnimManager::RemoveAnimBlock(int32 block)
+{
+	int i;
+	CAnimBlock *animblock;
+
+	animblock = &ms_aAnimBlocks[block];
+	debug("Removing ANIMS %s\n", animblock->name);
+	for(i = 0; i < NUM_ANIM_ASSOC_GROUPS; i++)
+		if(ms_aAnimAssocGroups[i].animBlock == animblock)
+			ms_aAnimAssocGroups[i].DestroyAssociations();
+	for(i = 0; i < animblock->numAnims; i++)
+		ms_aAnimations[animblock->firstIndex + i].Shutdown();
+	animblock->isLoaded = false;
+	animblock->refCount = 0;
+}
+
 CAnimBlendHierarchy*
 CAnimManager::GetAnimation(const char *name, CAnimBlock *animBlock)
 {
@@ -622,7 +1108,7 @@ CAnimManager::GetAnimation(const char *name, CAnimBlock *animBlock)
 	CAnimBlendHierarchy *hier = &ms_aAnimations[animBlock->firstIndex];
 
 	for(i = 0; i < animBlock->numAnims; i++){
-		if(!CGeneral::faststricmp(hier->name, name))
+		if(strcasecmp(hier->name, name) == 0)
 			return hier;
 		hier++;
 	}
@@ -743,23 +1229,34 @@ CAnimManager::BlendAnimation(RpClump *clump, AssocGroupId groupId, AnimationId a
 void
 CAnimManager::LoadAnimFiles(void)
 {
-	int i, j;
-
 	LoadAnimFile("ANIM\\PED.IFP");
-
-	// Create all assoc groups
 	ms_aAnimAssocGroups = new CAnimBlendAssocGroup[NUM_ANIM_ASSOC_GROUPS];
+	CreateAnimAssocGroups();
+}
+
+void
+CAnimManager::CreateAnimAssocGroups(void)
+{
+	int i, j;
+
 	for(i = 0; i < NUM_ANIM_ASSOC_GROUPS; i++){
+		CAnimBlock *block = GetAnimationBlock(ms_aAnimAssocDefinitions[i].blockName);
+		if(block == nil || !block->isLoaded || ms_aAnimAssocGroups[i].assocList)
+			continue;
+
 		CBaseModelInfo *mi = CModelInfo::GetModelInfo(ms_aAnimAssocDefinitions[i].modelIndex);
 		RpClump *clump = (RpClump*)mi->CreateInstance();
 		RpAnimBlendClumpInit(clump);
 		CAnimBlendAssocGroup *group = &ms_aAnimAssocGroups[i];
 		const AnimAssocDefinition *def = &ms_aAnimAssocDefinitions[i];
+		group->groupId = i;
+		group->firstAnimId = def->animDescs[0].animId;
 		group->CreateAssociations(def->blockName, clump, def->animNames, def->numAnims);
 		for(j = 0; j < group->numAssociations; j++)
-			group->GetAnimation(j)->flags |= def->animDescs[j].flags;
+
+			// GetAnimation(i) in III (but it's in LoadAnimFiles), GetAnimation(group->animDesc[j].animId) in VC
+			group->GetAnimation(def->animDescs[j].animId)->flags |= def->animDescs[j].flags;
 #ifdef PED_SKIN
-		// forgot on xbox/android
 		if(IsClumpSkinned(clump))
 			RpClumpForAllAtomics(clump, AtomicRemoveAnimFromSkinCB, nil);
 #endif
@@ -770,15 +1267,16 @@ CAnimManager::LoadAnimFiles(void)
 void
 CAnimManager::LoadAnimFile(const char *filename)
 {
-	int fd;
-	fd = CFileMgr::OpenFile(filename, "rb");
-	assert(fd > 0);
-	LoadAnimFile(fd, true);
-	CFileMgr::CloseFile(fd);
+	RwStream *stream;
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, filename);
+	assert(stream);
+	LoadAnimFile(stream, true);
+	RwStreamClose(stream, nil);
 }
 
+//--MIAMI: done (except maybe implement some unimplemented compression?)
 void
-CAnimManager::LoadAnimFile(int fd, bool compress)
+CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*somename)[32])
 {
 	#define ROUNDSIZE(x) if((x) & 3) (x) += 4 - ((x)&3)
 	struct IfpHeader {
@@ -786,127 +1284,122 @@ CAnimManager::LoadAnimFile(int fd, bool compress)
 		uint32 size;
 	};
 	IfpHeader anpk, info, name, dgan, cpan, anim;
-	int numANPK;
 	char buf[256];
-	int i, j, k, l;
+	int j, k, l;
 	float *fbuf = (float*)buf;
 
-	CFileMgr::Read(fd, (char*)&anpk, sizeof(IfpHeader));
-	if(strncmp(anpk.ident, "ANLF", 4) == 0){
-		ROUNDSIZE(anpk.size);
-		CFileMgr::Read(fd, buf, anpk.size);
-		numANPK = *(int*)buf;
-	}else if(strncmp(anpk.ident, "ANPK", 4) == 0){
-		CFileMgr::Seek(fd, -8, 1);
-		numANPK = 1;
+	// block name
+	RwStreamRead(stream, &anpk, sizeof(IfpHeader));
+	ROUNDSIZE(anpk.size);
+	RwStreamRead(stream, &info, sizeof(IfpHeader));
+	ROUNDSIZE(info.size);
+	RwStreamRead(stream, buf, info.size);
+	CAnimBlock *animBlock = GetAnimationBlock(buf+4);
+	if(animBlock){
+		if(animBlock->numAnims == 0){
+			animBlock->numAnims = *(int*)buf;
+			animBlock->firstIndex = ms_numAnimations;
+		}
+	}else{
+		animBlock = &ms_aAnimBlocks[ms_numAnimBlocks++];
+		strncpy(animBlock->name, buf+4, MAX_ANIMBLOCK_NAME);
+		animBlock->numAnims = *(int*)buf;
+		animBlock->firstIndex = ms_numAnimations;
 	}
 
-	for(i = 0; i < numANPK; i++){
-		// block name
-		CFileMgr::Read(fd, (char*)&anpk, sizeof(IfpHeader));
-		ROUNDSIZE(anpk.size);
-		CFileMgr::Read(fd, (char*)&info, sizeof(IfpHeader));
-		ROUNDSIZE(info.size);
-		CFileMgr::Read(fd, buf, info.size);
-		CAnimBlock *animBlock = &ms_aAnimBlocks[ms_numAnimBlocks++];
-		strncpy(animBlock->name, buf+4, 24);
-		animBlock->numAnims = *(int*)buf;
+	debug("Loading ANIMS %s\n", animBlock->name);
+	animBlock->isLoaded = true;
 
-		animBlock->firstIndex = ms_numAnimations;
+	int animIndex = animBlock->firstIndex;
+	for(j = 0; j < animBlock->numAnims; j++){
+		assert(animIndex < ARRAY_SIZE(ms_aAnimations));
+		CAnimBlendHierarchy *hier = &ms_aAnimations[animIndex++];
 
-		for(j = 0; j < animBlock->numAnims; j++){
-			CAnimBlendHierarchy *hier = &ms_aAnimations[ms_numAnimations++];
+		// animation name
+		RwStreamRead(stream, &name, sizeof(IfpHeader));
+		ROUNDSIZE(name.size);
+		RwStreamRead(stream, buf, name.size);
+		hier->SetName(buf);
 
-			// animation name
-			CFileMgr::Read(fd, (char*)&name, sizeof(IfpHeader));
-			ROUNDSIZE(name.size);
-			CFileMgr::Read(fd, buf, name.size);
-			hier->SetName(buf);
+		// TODO(MIAMI)? some unused crap here
+		hier->compressed = false;
+		hier->compressed2 = false;
 
-			// DG info has number of nodes/sequences
-			CFileMgr::Read(fd, (char*)&dgan, sizeof(IfpHeader));
+		// DG info has number of nodes/sequences
+		RwStreamRead(stream, (char*)&dgan, sizeof(IfpHeader));
+		ROUNDSIZE(dgan.size);
+		RwStreamRead(stream, (char*)&info, sizeof(IfpHeader));
+		ROUNDSIZE(info.size);
+		RwStreamRead(stream, buf, info.size);
+		hier->numSequences = *(int*)buf;
+		hier->sequences = new CAnimBlendSequence[hier->numSequences];
+
+		CAnimBlendSequence *seq = hier->sequences;
+		for(k = 0; k < hier->numSequences; k++, seq++){
+			// Each node has a name and key frames
+			RwStreamRead(stream, &cpan, sizeof(IfpHeader));
 			ROUNDSIZE(dgan.size);
-			CFileMgr::Read(fd, (char*)&info, sizeof(IfpHeader));
-			ROUNDSIZE(info.size);
-			CFileMgr::Read(fd, buf, info.size);
-			hier->numSequences = *(int*)buf;
-			hier->sequences = new CAnimBlendSequence[hier->numSequences];
-
-			CAnimBlendSequence *seq = hier->sequences;
-			for(k = 0; k < hier->numSequences; k++, seq++){
-				// Each node has a name and key frames
-				CFileMgr::Read(fd, (char*)&cpan, sizeof(IfpHeader));
-				ROUNDSIZE(dgan.size);
-				CFileMgr::Read(fd, (char*)&anim, sizeof(IfpHeader));
-				ROUNDSIZE(anim.size);
-				CFileMgr::Read(fd, buf, anim.size);
-				int numFrames = *(int*)(buf+28);
+			RwStreamRead(stream, &anim, sizeof(IfpHeader));
+			ROUNDSIZE(anim.size);
+			RwStreamRead(stream, buf, anim.size);
+			int numFrames = *(int*)(buf+28);
 #ifdef PED_SKIN
-				if(anim.size == 44)
-					seq->SetBoneTag(*(int*)(buf+40));
+			if(anim.size == 44)
+				seq->SetBoneTag(*(int*)(buf+40));
 #endif
-				seq->SetName(buf);
-				if(numFrames == 0)
-					continue;
-
-				CFileMgr::Read(fd, (char*)&info, sizeof(info));
-				if(strncmp(info.ident, "KR00", 4) == 0){
-					seq->SetNumFrames(numFrames, false);
-					KeyFrame *kf = seq->GetKeyFrame(0);
-					for(l = 0; l < numFrames; l++, kf++){
-						CFileMgr::Read(fd, buf, 0x14);
-						kf->rotation.x = -fbuf[0];
-						kf->rotation.y = -fbuf[1];
-						kf->rotation.z = -fbuf[2];
-						kf->rotation.w = fbuf[3];
-						kf->deltaTime = fbuf[4];	// absolute time here
-					}
-				}else if(strncmp(info.ident, "KRT0", 4) == 0){
-					seq->SetNumFrames(numFrames, true);
-					KeyFrameTrans *kf = (KeyFrameTrans*)seq->GetKeyFrame(0);
-					for(l = 0; l < numFrames; l++, kf++){
-						CFileMgr::Read(fd, buf, 0x20);
-						kf->rotation.x = -fbuf[0];
-						kf->rotation.y = -fbuf[1];
-						kf->rotation.z = -fbuf[2];
-						kf->rotation.w = fbuf[3];
-						kf->translation.x = fbuf[4];
-						kf->translation.y = fbuf[5];
-						kf->translation.z = fbuf[6];
-						kf->deltaTime = fbuf[7];	// absolute time here
-					}
-				}else if(strncmp(info.ident, "KRTS", 4) == 0){
-					seq->SetNumFrames(numFrames, true);
-					KeyFrameTrans *kf = (KeyFrameTrans*)seq->GetKeyFrame(0);
-					for(l = 0; l < numFrames; l++, kf++){
-						CFileMgr::Read(fd, buf, 0x2C);
-						kf->rotation.x = -fbuf[0];
-						kf->rotation.y = -fbuf[1];
-						kf->rotation.z = -fbuf[2];
-						kf->rotation.w = fbuf[3];
-						kf->translation.x = fbuf[4];
-						kf->translation.y = fbuf[5];
-						kf->translation.z = fbuf[6];
-						// scaling ignored
-						kf->deltaTime = fbuf[10];	// absolute time here
-					}
-				}
+			seq->SetName(buf);
+			if(numFrames == 0)
+				continue;
 
-				// convert absolute time to deltas
-				for(l = seq->numFrames-1; l > 0; l--){
-					KeyFrame *kf1 = seq->GetKeyFrame(l);
-					KeyFrame *kf2 = seq->GetKeyFrame(l-1);
-					kf1->deltaTime -= kf2->deltaTime;
+			RwStreamRead(stream, &info, sizeof(info));
+			if(strncmp(info.ident, "KR00", 4) == 0){
+				seq->SetNumFrames(numFrames, false, false);
+				KeyFrame *kf = seq->GetKeyFrame(0);
+				for(l = 0; l < numFrames; l++, kf++){
+					RwStreamRead(stream, buf, 0x14);
+					kf->rotation.x = -fbuf[0];
+					kf->rotation.y = -fbuf[1];
+					kf->rotation.z = -fbuf[2];
+					kf->rotation.w = fbuf[3];
+					kf->deltaTime = fbuf[4];	// absolute time here
+				}
+			}else if(strncmp(info.ident, "KRT0", 4) == 0){
+				seq->SetNumFrames(numFrames, true, false);
+				KeyFrameTrans *kf = (KeyFrameTrans*)seq->GetKeyFrame(0);
+				for(l = 0; l < numFrames; l++, kf++){
+					RwStreamRead(stream, buf, 0x20);
+					kf->rotation.x = -fbuf[0];
+					kf->rotation.y = -fbuf[1];
+					kf->rotation.z = -fbuf[2];
+					kf->rotation.w = fbuf[3];
+					kf->translation.x = fbuf[4];
+					kf->translation.y = fbuf[5];
+					kf->translation.z = fbuf[6];
+					kf->deltaTime = fbuf[7];	// absolute time here
+				}
+			}else if(strncmp(info.ident, "KRTS", 4) == 0){
+				seq->SetNumFrames(numFrames, true, false);
+				KeyFrameTrans *kf = (KeyFrameTrans*)seq->GetKeyFrame(0);
+				for(l = 0; l < numFrames; l++, kf++){
+					RwStreamRead(stream, buf, 0x2C);
+					kf->rotation.x = -fbuf[0];
+					kf->rotation.y = -fbuf[1];
+					kf->rotation.z = -fbuf[2];
+					kf->rotation.w = fbuf[3];
+					kf->translation.x = fbuf[4];
+					kf->translation.y = fbuf[5];
+					kf->translation.z = fbuf[6];
+					// scaling ignored
+					kf->deltaTime = fbuf[10];	// absolute time here
 				}
 			}
-
-			hier->RemoveQuaternionFlips();
-			if(compress)
-				hier->RemoveUncompressedData();
-			else
-				hier->CalcTotalTime();
 		}
+
+		hier->RemoveQuaternionFlips();
+		hier->CalcTotalTime();
 	}
+	if(animIndex > ms_numAnimations)
+		ms_numAnimations = animIndex;
 }
 
 void
@@ -916,5 +1409,6 @@ CAnimManager::RemoveLastAnimFile(void)
 	ms_numAnimBlocks--;
 	ms_numAnimations = ms_aAnimBlocks[ms_numAnimBlocks].firstIndex;
 	for(i = 0; i < ms_aAnimBlocks[ms_numAnimBlocks].numAnims; i++)
-		ms_aAnimations[ms_aAnimBlocks[ms_numAnimBlocks].firstIndex + i].RemoveAnimSequences();
+		ms_aAnimations[ms_aAnimBlocks[ms_numAnimBlocks].firstIndex + i].Shutdown();
+	ms_aAnimBlocks[ms_numAnimBlocks].isLoaded = false;
 }
diff --git a/src/animation/AnimManager.h b/src/animation/AnimManager.h
index de15602c..8658c056 100644
--- a/src/animation/AnimManager.h
+++ b/src/animation/AnimManager.h
@@ -6,30 +6,66 @@
 enum AssocGroupId
 {
 	ASSOCGRP_STD,
+	ASSOCGRP_VAN,
+	ASSOCGRP_COACH,
+	ASSOCGRP_BIKE_STANDARD,
+	ASSOCGRP_BIKE_VESPA,
+	ASSOCGRP_BIKE_HARLEY,
+	ASSOCGRP_BIKE_DIRT,
+	ASSOCGRP_UNARMED,
+	ASSOCGRP_SCREWDRIVER,
+	ASSOCGRP_KNIFE,
+	ASSOCGRP_BASEBALLBAT,
+	ASSOCGRP_GOLFCLUB,
+	ASSOCGRP_CHAINSAW,
+	ASSOCGRP_PYTHON,
+	ASSOCGRP_COLT,
+	ASSOCGRP_SHOTGUN,
+	ASSOCGRP_BUDDY,
+	ASSOCGRP_TEC,
+	ASSOCGRP_UZI,
+	ASSOCGRP_RIFLE,
+	ASSOCGRP_M60,
+	ASSOCGRP_SNIPER,
+	ASSOCGRP_THROW,
+	ASSOCGRP_FLAMETHROWER,
+	ASSOCGRP_MEDIC,
+	ASSOCGRP_SUNBATHE,
+	ASSOCGRP_PLAYER_IDLE,
+	ASSOCGRP_RIOT,
+	ASSOCGRP_STRIP,
+	ASSOCGRP_LANCE,
 	ASSOCGRP_PLAYER,
 	ASSOCGRP_PLAYERROCKET,
 	ASSOCGRP_PLAYER1ARMED,
 	ASSOCGRP_PLAYER2ARMED,
 	ASSOCGRP_PLAYERBBBAT,
+	ASSOCGRP_PLAYERCHAINSAW,
 	ASSOCGRP_SHUFFLE,
 	ASSOCGRP_OLD,
 	ASSOCGRP_GANG1,
 	ASSOCGRP_GANG2,
 	ASSOCGRP_FAT,
 	ASSOCGRP_OLDFAT,
+	ASSOCGRP_JOGGER,
 	ASSOCGRP_WOMAN,
 	ASSOCGRP_WOMANSHOP,
 	ASSOCGRP_BUSYWOMAN,
 	ASSOCGRP_SEXYWOMAN,
-	ASSOCGRP_OLDWOMAN,
 	ASSOCGRP_FATWOMAN,
+	ASSOCGRP_OLDWOMAN,
+	ASSOCGRP_JOGWOMAN,
 	ASSOCGRP_PANICCHUNKY,
+	ASSOCGRP_SKATE,
 	ASSOCGRP_PLAYERBACK,
 	ASSOCGRP_PLAYERLEFT,
 	ASSOCGRP_PLAYERRIGHT,
 	ASSOCGRP_ROCKETBACK,
 	ASSOCGRP_ROCKETLEFT,
 	ASSOCGRP_ROCKETRIGHT,
+	ASSOCGRP_CHAINSAWBACK,
+	ASSOCGRP_CHAINSAWLEFT,
+	ASSOCGRP_CHAINSAWRIGHT,
 
 	NUM_ANIM_ASSOC_GROUPS
 };
@@ -37,11 +73,15 @@ enum AssocGroupId
 class CAnimBlendAssociation;
 class CAnimBlendAssocGroup;
 
+#define MAX_ANIMBLOCK_NAME 20
+
 // A block of hierarchies
 struct CAnimBlock
 {
-	char name[24];
-	int32 firstIndex;
+	char name[MAX_ANIMBLOCK_NAME];
+	bool isLoaded;
+	int16 refCount;
+	int32 firstIndex;	// first animtion in ms_aAnimations
 	int32 numAnims;
 };
 
@@ -75,7 +115,16 @@ public:
 	static void Initialise(void);
 	static void Shutdown(void);
 	static void UncompressAnimation(CAnimBlendHierarchy *anim);
+	static void RemoveFromUncompressedCache(CAnimBlendHierarchy *hier);
+	static CAnimBlock *GetAnimationBlock(int32 block) { return &ms_aAnimBlocks[block]; }
 	static CAnimBlock *GetAnimationBlock(const char *name);
+	static int32 GetAnimationBlockIndex(const char *name);
+	static int32 RegisterAnimBlock(const char *name);
+	static int32 GetNumRefsToAnimBlock(int32 block);
+	static void AddAnimBlockRef(int32 block);
+	static void RemoveAnimBlockRefWithoutDelete(int32 block);
+	static void RemoveAnimBlockRef(int32 block);
+	static void RemoveAnimBlock(int32 block);
 	static CAnimBlendHierarchy *GetAnimation(const char *name, CAnimBlock *animBlock);
 	static CAnimBlendHierarchy *GetAnimation(int32 n) { return &ms_aAnimations[n]; }
 	static const char *GetAnimGroupName(AssocGroupId groupId);
@@ -87,6 +136,7 @@ public:
 	static CAnimBlendAssociation *BlendAnimation(RpClump *clump, AssocGroupId groupId, AnimationId animId, float delta);
 	static void LoadAnimFiles(void);
 	static void LoadAnimFile(const char *filename);
-	static void LoadAnimFile(int fd, bool compress);
+	static void LoadAnimFile(RwStream *stream, bool compress, char (*somename)[32] = nil);
+	static void CreateAnimAssocGroups(void);
 	static void RemoveLastAnimFile(void);
 };
diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h
index 82fed8bd..9cf470e0 100644
--- a/src/animation/AnimationId.h
+++ b/src/animation/AnimationId.h
@@ -47,27 +47,6 @@ enum AnimationId
 	ANIM_HIT_WALL,
 	ANIM_FLOOR_HIT_F,
 	ANIM_HIT_BEHIND,
-	ANIM_PUNCH_R,
-	ANIM_KICK_FLOOR,
-	ANIM_WEAPON_BAT_H,
-	ANIM_WEAPON_BAT_V,
-	ANIM_WEAPON_HGUN_BODY,
-	ANIM_WEAPON_AK_BODY,
-	ANIM_WEAPON_PUMP,
-	ANIM_WEAPON_SNIPER,
-	ANIM_WEAPON_THROW,
-	ANIM_WEAPON_THROWU,
-	ANIM_WEAPON_START_THROW,
-	ANIM_BOMBER,
-	ANIM_HGUN_RELOAD,
-	ANIM_AK_RELOAD,
-	ANIM_FPS_PUNCH,
-	ANIM_FPS_BAT,
-	ANIM_FPS_UZI,
-	ANIM_FPS_PUMP,
-	ANIM_FPS_AK,
-	ANIM_FPS_M16,
-	ANIM_FPS_ROCKET,
 	ANIM_FIGHT_IDLE,
 	ANIM_FIGHT2_IDLE,
 	ANIM_FIGHT_SH_F,
@@ -80,6 +59,21 @@ enum AnimationId
 	ANIM_FIGHT_ROUNDHOUSE,
 	ANIM_FIGHT_LONGKICK,
 	ANIM_FIGHT_PPUNCH,
+
+	ANIM_FIGHT_JAB,
+	ANIM_FIGHT_ELBOW_L,
+	ANIM_FIGHT_ELBOW_R,
+	ANIM_FIGHT_BKICK_L,
+	ANIM_FIGHT_BKICK_R,
+
+	ANIM_BOMBER,
+	ANIM_PUNCH_R,
+	ANIM_FIGHT_PPUNCH2,
+	ANIM_KICK_FLOOR,
+
+	ANIM_WEAPON_THROWU,
+	ANIM_FIGHT_SH_BACK,
+
 	ANIM_CAR_JACKED_RHS,
 	ANIM_CAR_LJACKED_RHS,
 	ANIM_CAR_JACKED_LHS,
@@ -98,6 +92,7 @@ enum AnimationId
 	ANIM_CAR_CLOSEDOOR_LOW_LHS,
 	ANIM_CAR_ROLLDOOR,
 	ANIM_CAR_ROLLDOOR_LOW,
+	ANIM_CAR_JUMPIN_LHS,
 	ANIM_CAR_GETOUT_LHS,
 	ANIM_CAR_GETOUT_LOW_LHS,
 	ANIM_CAR_CLOSE_LHS,
@@ -123,29 +118,36 @@ enum AnimationId
 	ANIM_DRIVE_LOW_R,
 	ANIM_DRIVEBY_L,
 	ANIM_DRIVEBY_R,
+	ANIM_DRIVEBY_LOW_L,
+	ANIM_DRIVEBY_LOW_R,
 	ANIM_CAR_LB,
 	ANIM_DRIVE_BOAT,
+	ANIM_DRIVE_BOAT_L,
+	ANIM_DRIVE_BOAT_R,
+	ANIM_BOAT_LB,
+
+	ANIM_BIKE_PICKUP_R,
+	ANIM_BIKE_PICKUP_L,
+	ANIM_BIKE_PULLUP_R,
+	ANIM_BIKE_PULLUP_L,
+	ANIM_BIKE_ELBOW_R,
+	ANIM_BIKE_ELBOW_L,
+	ANIM_BIKE_FALL_OFF,
+	ANIM_BIKE_FALL_R,
+
 	ANIM_CAR_GETOUT_RHS,
 	ANIM_CAR_GETOUT_LOW_RHS,
 	ANIM_CAR_CLOSE_RHS,
 	ANIM_CAR_HOOKERTALK,
-	ANIM_COACH_OPEN_L,
-	ANIM_COACH_OPEN_R,
-	ANIM_COACH_IN_L,
-	ANIM_COACH_IN_R,
-	ANIM_COACH_OUT_L,
-	ANIM_TRAIN_GETIN,
-	ANIM_TRAIN_GETOUT,
+
+	ANIM_IDLE_STANCE2,
+	ANIM_IDLE_STANCE3,
+
 	ANIM_CAR_CRAWLOUT_RHS,
 	ANIM_CAR_CRAWLOUT_RHS2,
-	ANIM_VAN_OPEN_L,
-	ANIM_VAN_GETIN_L,
-	ANIM_VAN_CLOSE_L,
-	ANIM_VAN_GETOUT_L,
-	ANIM_VAN_OPEN,
-	ANIM_VAN_GETIN,
-	ANIM_VAN_CLOSE,
-	ANIM_VAN_GETOUT,
+	ANIM_CAR_ROLLOUT_LHS,
+	ANIM_CAR_ROLLOUT_RHS,
+
 	ANIM_GETUP1,
 	ANIM_GETUP2,
 	ANIM_GETUP3,
@@ -157,6 +159,9 @@ enum AnimationId
 	ANIM_FALL_GLIDE,
 	ANIM_FALL_LAND,
 	ANIM_FALL_COLLAPSE,
+	ANIM_FALL_BACK,
+	ANIM_FALL_FRONT,
+
 	ANIM_EV_STEP,
 	ANIM_EV_DIVE,
 	ANIM_XPRESS_SCRATCH,
@@ -164,11 +169,12 @@ enum AnimationId
 	ANIM_TURN_180,
 	ANIM_ARREST_GUN,
 	ANIM_DROWN,
-	ANIM_CPR,
 	ANIM_DUCK_DOWN,
 	ANIM_DUCK_LOW,
+
+	ANIM_WEAPON_CROUCH,
+
 	ANIM_RBLOCK_CSHOOT,
-	ANIM_WEAPON_THROWU2,
 	ANIM_HANDSUP,
 	ANIM_HANDSCOWER,
 	ANIM_FUCKU,
@@ -176,5 +182,90 @@ enum AnimationId
 	ANIM_PHONE_OUT,
 	ANIM_PHONE_TALK,
 
+	ANIM_SEAT_DOWN,
+	ANIM_SEAT_UP,
+	ANIM_SEAT_IDLE,
+	ANIM_SEAT_DOWN2,
+	ANIM_ATM,
+	ANIM_ABSEIL,
+
+	NUM_STD_ANIMS,
+
+	ANIM_VAN_OPEN_L,
+	ANIM_VAN_GETIN_L,
+	ANIM_VAN_CLOSE_L,
+	ANIM_VAN_GETOUT_L,
+	ANIM_VAN_OPEN,
+	ANIM_VAN_GETIN,
+	ANIM_VAN_CLOSE,
+	ANIM_VAN_GETOUT,
+
+	ANIM_COACH_OPEN_L,
+	ANIM_COACH_OPEN_R,
+	ANIM_COACH_IN_L,
+	ANIM_COACH_IN_R,
+	ANIM_COACH_OUT_L,
+
+	ANIM_BIKE_RIDE,
+	ANIM_BIKE_STILL,
+	ANIM_BIKE_LEFT,
+	ANIM_BIKE_RIGHT,
+	ANIM_BIKE_BACK,
+	ANIM_BIKE_FWD,
+	ANIM_BIKE_PUSHES,
+	ANIM_BIKE_JUMPON_R,
+	ANIM_BIKE_JUMPON_L,
+	ANIM_BIKE_KICK,
+	ANIM_BIKE_HIT,
+	ANIM_BIKE_GETOFF_RHS,
+	ANIM_BIKE_GETOFF_LHS,
+	ANIM_BIKE_GETOFF_BACK,
+	ANIM_BIKE_DRIVEBY_RHS,
+	ANIM_BIKE_DRIVEBY_LHS,
+	ANIM_BIKE_DRIVEBY_FT,
+	ANIM_BIKE_PASSENGER,
+
+	ANIM_WEAPON_FIRE,
+	ANIM_WEAPON_CROUCHFIRE,
+	ANIM_WEAPON_RELOAD,
+	ANIM_WEAPON_CROUCHRELOAD,
+	ANIM_WEAPON_SPECIAL,
+	ANIM_MELEE_ATTACK = ANIM_WEAPON_FIRE,
+	ANIM_MELEE_ATTACK_2ND,
+	ANIM_MELEE_ATTACK_START,
+	ANIM_THROWABLE_THROW = ANIM_WEAPON_FIRE,
+	ANIM_THROWABLE_THROWU,
+	ANIM_THROWABLE_START_THROW,
+	ANIM_WEAPON_FIRE_2ND = ANIM_WEAPON_CROUCHFIRE,
+	ANIM_WEAPON_FIRE_3RD = ANIM_WEAPON_SPECIAL,
+
+	ANIM_SUNBATHE,
+	ANIM_SUNBATHE_DOWN,
+	ANIM_SUNBATHE_UP,
+	ANIM_SUNBATHE_ESCAPE,
+
+	ANIM_CPR,
+
+	ANIM_IDLE_STRETCH,
+	ANIM_IDLE_TIME,
+	ANIM_IDLE_SHOULDER,
+	ANIM_IDLE_STRETCH_LEG,
+
+	ANIM_RIOT_ANGRY,
+	ANIM_RIOT_ANGRY_B,
+	ANIM_RIOT_CHANT,
+	ANIM_RIOT_PUNCHES,
+	ANIM_RIOT_SHOUT,
+	ANIM_RIOT_CHALLENGE,
+	ANIM_RIOT_FUKU,
+
+	ANIM_STRIP_A,
+	ANIM_STRIP_B,
+	ANIM_STRIP_C,
+	ANIM_STRIP_D,
+	ANIM_STRIP_E,
+	ANIM_STRIP_F,
+	ANIM_STRIP_G,
+
 	NUM_ANIMS
 };
\ No newline at end of file
diff --git a/src/animation/Bones.cpp b/src/animation/Bones.cpp
index 1608449d..87f3b6e7 100644
--- a/src/animation/Bones.cpp
+++ b/src/animation/Bones.cpp
@@ -2,26 +2,29 @@
 #include "PedModelInfo.h"
 #include "Bones.h"
 
-#ifdef PED_SKIN
-
 int
 ConvertPedNode2BoneTag(int node)
 {
 	switch(node){
-	case PED_TORSO:	return BONE_waist;
-	case PED_MID:	return BONE_torso;	// this is what Xbox/Mobile use
-	//		return BONE_mid;	// this is what PS2/PC use
-	case PED_HEAD:		return BONE_head;
-	case PED_UPPERARML:	return BONE_upperarml;
-	case PED_UPPERARMR:	return BONE_upperarmr;
-	case PED_HANDL:		return BONE_Lhand;
-	case PED_HANDR:		return BONE_Rhand;
-	case PED_UPPERLEGL:	return BONE_upperlegl;
-	case PED_UPPERLEGR:	return BONE_upperlegr;
-	case PED_FOOTL:		return BONE_footl;
-	case PED_FOOTR:		return BONE_footr;
-	case PED_LOWERLEGR:	return BONE_lowerlegl;
+	case PED_MID:	return BONE_spine1;
+	case PED_HEAD:	return BONE_head;
+	case PED_UPPERARML:	return BONE_l_upperarm;
+	case PED_UPPERARMR:	return BONE_r_upperarm;
+	case PED_HANDL:	return BONE_l_hand;
+	case PED_HANDR:	return BONE_r_hand;
+	case PED_UPPERLEGL:	return BONE_l_thigh;
+	case PED_UPPERLEGR:	return BONE_r_thigh;
+	case PED_FOOTL:	return BONE_l_foot;
+	case PED_FOOTR:	return BONE_r_foot;
+	case PED_LOWERLEGR:	return BONE_r_calf;
+	case PED_LOWERLEGL:	return BONE_l_calf;
+	case PED_FOREARML:	return BONE_l_forearm;
+	case PED_FOREARMR:	return BONE_r_forearm;
+	case PED_CLAVICLEL:	return BONE_l_clavicle;
+	case PED_CLAVICLER:	return BONE_r_clavicle;
+	case PED_NECK:	return BONE_neck;
 	}
+	assert(0 && "this node has no bone");
 	return -1;
 }
 
@@ -29,24 +32,28 @@ const char*
 ConvertBoneTag2BoneName(int tag)
 {
 	switch(tag){
-	case BONE_waist:	return "Swaist";
-	case BONE_upperlegr:	return "Supperlegr";
-	case BONE_lowerlegr:	return "Slowerlegr";
-	case BONE_footr:	return "Sfootr";
-	case BONE_upperlegl:	return "Supperlegl";
-	case BONE_lowerlegl:	return "Slowerlegl";
-	case BONE_footl:	return "Sfootl";
-	case BONE_mid:	return "Smid";
-	case BONE_torso:	return "Storso";
-	case BONE_head:	return "Shead";
-	case BONE_upperarmr:	return "Supperarmr";
-	case BONE_lowerarmr:	return "Slowerarmr";
-	case BONE_Rhand:	return "SRhand";
-	case BONE_upperarml:	return "Supperarml";
-	case BONE_lowerarml:	return "Slowerarml";
-	case BONE_Lhand:	return "SLhand";
+	case BONE_root:	return "Root";
+	case BONE_pelvis:	return "Pelvis";
+	case BONE_spine:	return "Spine";
+	case BONE_spine1:	return "Spine1";
+	case BONE_neck:	return "Neck";
+	case BONE_head:	return "Head";
+	case BONE_r_clavicle:	return "Bip01 R Clavicle";
+	case BONE_r_upperarm:	return "R UpperArm";
+	case BONE_r_forearm:	return "R Forearm";
+	case BONE_r_hand:	return "R Hand";
+	case BONE_r_finger:	return "R Fingers";
+	case BONE_l_clavicle:	return "Bip01 L Clavicle";
+	case BONE_l_upperarm:	return "L UpperArm";
+	case BONE_l_forearm:	return "L Forearm";
+	case BONE_l_hand:	return "L Hand";
+	case BONE_l_finger:	return "L Fingers";
+	case BONE_l_thigh:	return "L Thigh";
+	case BONE_l_calf:	return "L Calf";
+	case BONE_l_foot:	return "L Foot";
+	case BONE_r_thigh:	return "R Thigh";
+	case BONE_r_calf:	return "R Calf";
+	case BONE_r_foot:	return "R Foot";
 	}
 	return nil;
 }
-
-#endif
diff --git a/src/animation/Bones.h b/src/animation/Bones.h
index 38d91ba3..e133fd7f 100644
--- a/src/animation/Bones.h
+++ b/src/animation/Bones.h
@@ -2,22 +2,28 @@
 
 enum BoneTag
 {
-	BONE_waist,
-	BONE_upperlegr,
-	BONE_lowerlegr,
-	BONE_footr,
-	BONE_upperlegl,
-	BONE_lowerlegl,
-	BONE_footl,
-	BONE_mid,
-	BONE_torso,
-	BONE_head,
-	BONE_upperarmr,
-	BONE_lowerarmr,
-	BONE_Rhand,
-	BONE_upperarml,
-	BONE_lowerarml,
-	BONE_Lhand,
+	BONE_root = 0,
+	BONE_pelvis = 1,
+	BONE_spine = 2,
+	BONE_spine1 = 3,
+	BONE_neck = 4,
+	BONE_head = 5,
+	BONE_l_clavicle = 31,
+	BONE_l_upperarm = 32,
+	BONE_l_forearm = 33,
+	BONE_l_hand = 34,
+	BONE_l_finger = 35,
+	BONE_r_clavicle = 21,
+	BONE_r_upperarm = 22,
+	BONE_r_forearm = 23,
+	BONE_r_hand = 24,
+	BONE_r_finger = 25,
+	BONE_l_thigh = 41,
+	BONE_l_calf = 42,
+	BONE_l_foot = 43,
+	BONE_r_thigh = 51,
+	BONE_r_calf = 52,
+	BONE_r_foot = 53,
 };
 
 int ConvertPedNode2BoneTag(int node);
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 230e22fb..8f2a9892 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -16,7 +16,6 @@
 #include "World.h"
 #include "PlayerPed.h"
 #include "Wanted.h"
-#include "CutsceneHead.h"
 #include "RpAnimBlend.h"
 #include "ModelIndices.h"
 #include "TempColModels.h"
@@ -25,85 +24,81 @@ const struct {
 	const char *szTrackName;
 	int iTrackId;
 } musicNameIdAssoc[] = {
-	{ "JB",			STREAMED_SOUND_NEWS_INTRO },
-	{ "BET",		STREAMED_SOUND_BANK_INTRO },
-	{ "L1_LG",		STREAMED_SOUND_CUTSCENE_LUIGI1_LG },
-	{ "L2_DSB",		STREAMED_SOUND_CUTSCENE_LUIGI2_DSB },
-	{ "L3_DM",		STREAMED_SOUND_CUTSCENE_LUIGI3_DM },
-	{ "L4_PAP",		STREAMED_SOUND_CUTSCENE_LUIGI4_PAP },
-	{ "L5_TFB",		STREAMED_SOUND_CUTSCENE_LUIGI5_TFB },
-	{ "J0_DM2",		STREAMED_SOUND_CUTSCENE_JOEY0_DM2 },
-	{ "J1_LFL",		STREAMED_SOUND_CUTSCENE_JOEY1_LFL },
-	{ "J2_KCL",		STREAMED_SOUND_CUTSCENE_JOEY2_KCL },
-	{ "J3_VH",		STREAMED_SOUND_CUTSCENE_JOEY3_VH },
-	{ "J4_ETH",		STREAMED_SOUND_CUTSCENE_JOEY4_ETH },
-	{ "J5_DST",		STREAMED_SOUND_CUTSCENE_JOEY5_DST },
-	{ "J6_TBJ",		STREAMED_SOUND_CUTSCENE_JOEY6_TBJ },
-	{ "T1_TOL",		STREAMED_SOUND_CUTSCENE_TONI1_TOL },
-	{ "T2_TPU",		STREAMED_SOUND_CUTSCENE_TONI2_TPU },
-	{ "T3_MAS",		STREAMED_SOUND_CUTSCENE_TONI3_MAS },
-	{ "T4_TAT",		STREAMED_SOUND_CUTSCENE_TONI4_TAT },
-	{ "T5_BF",		STREAMED_SOUND_CUTSCENE_TONI5_BF },
-	{ "S0_MAS",		STREAMED_SOUND_CUTSCENE_SAL0_MAS },
-	{ "S1_PF",		STREAMED_SOUND_CUTSCENE_SAL1_PF },
-	{ "S2_CTG",		STREAMED_SOUND_CUTSCENE_SAL2_CTG },
-	{ "S3_RTC",		STREAMED_SOUND_CUTSCENE_SAL3_RTC },
-	{ "S5_LRQ",		STREAMED_SOUND_CUTSCENE_SAL5_LRQ },
-	{ "S4_BDBA",	STREAMED_SOUND_CUTSCENE_SAL4_BDBA },
-	{ "S4_BDBB",	STREAMED_SOUND_CUTSCENE_SAL4_BDBB },
-	{ "S2_CTG2",	STREAMED_SOUND_CUTSCENE_SAL2_CTG2 },
-	{ "S4_BDBD",	STREAMED_SOUND_CUTSCENE_SAL4_BDBD },
-	{ "S5_LRQB",	STREAMED_SOUND_CUTSCENE_SAL5_LRQB },
-	{ "S5_LRQC",	STREAMED_SOUND_CUTSCENE_SAL5_LRQC },
-	{ "A1_SS0",		STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO },
-	{ "A2_PP",		STREAMED_SOUND_CUTSCENE_ASUKA_2_PP },
-	{ "A3_SS",		STREAMED_SOUND_CUTSCENE_ASUKA_3_SS },
-	{ "A4_PDR",		STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR },
-	{ "A5_K2FT",	STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT},
-	{ "K1_KBO",		STREAMED_SOUND_CUTSCENE_KENJI1_KBO },
-	{ "K2_GIS",		STREAMED_SOUND_CUTSCENE_KENJI2_GIS },
-	{ "K3_DS",		STREAMED_SOUND_CUTSCENE_KENJI3_DS },
-	{ "K4_SHI",		STREAMED_SOUND_CUTSCENE_KENJI4_SHI },
-	{ "K5_SD",		STREAMED_SOUND_CUTSCENE_KENJI5_SD },
-	{ "R0_PDR2",	STREAMED_SOUND_CUTSCENE_RAY0_PDR2 },
-	{ "R1_SW",		STREAMED_SOUND_CUTSCENE_RAY1_SW },
-	{ "R2_AP",		STREAMED_SOUND_CUTSCENE_RAY2_AP },
-	{ "R3_ED",		STREAMED_SOUND_CUTSCENE_RAY3_ED },
-	{ "R4_GF",		STREAMED_SOUND_CUTSCENE_RAY4_GF },
-	{ "R5_PB",		STREAMED_SOUND_CUTSCENE_RAY5_PB },
-	{ "R6_MM",		STREAMED_SOUND_CUTSCENE_RAY6_MM },
-	{ "D1_STOG",	STREAMED_SOUND_CUTSCENE_DONALD1_STOG },
-	{ "D2_KK",		STREAMED_SOUND_CUTSCENE_DONALD2_KK },
-	{ "D3_ADO",		STREAMED_SOUND_CUTSCENE_DONALD3_ADO },
-	{ "D5_ES",		STREAMED_SOUND_CUTSCENE_DONALD5_ES },
-	{ "D7_MLD",		STREAMED_SOUND_CUTSCENE_DONALD7_MLD },
-	{ "D4_GTA",		STREAMED_SOUND_CUTSCENE_DONALD4_GTA },
-	{ "D4_GTA2",	STREAMED_SOUND_CUTSCENE_DONALD4_GTA2 },
-	{ "D6_STS",		STREAMED_SOUND_CUTSCENE_DONALD6_STS },
-	{ "A6_BAIT",	STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT },
-	{ "A7_ETG",		STREAMED_SOUND_CUTSCENE_ASUKA7_ETG },
-	{ "A8_PS",		STREAMED_SOUND_CUTSCENE_ASUKA8_PS },
-	{ "A9_ASD",		STREAMED_SOUND_CUTSCENE_ASUKA9_ASD },
-	{ "K4_SHI2",	STREAMED_SOUND_CUTSCENE_KENJI4_SHI2 },
-	{ "C1_TEX",		STREAMED_SOUND_CUTSCENE_CATALINA1_TEX },
-	{ "EL_PH1",		STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 },
-	{ "EL_PH2",		STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 },
-	{ "EL_PH3",		STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3 },
-	{ "EL_PH4",		STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4 },
-	{ "YD_PH1",		STREAMED_SOUND_CUTSCENE_YARDIE_PH1 },
-	{ "YD_PH2",		STREAMED_SOUND_CUTSCENE_YARDIE_PH2 },
-	{ "YD_PH3",		STREAMED_SOUND_CUTSCENE_YARDIE_PH3 },
-	{ "YD_PH4",		STREAMED_SOUND_CUTSCENE_YARDIE_PH4 },
-	{ "HD_PH1",		STREAMED_SOUND_CUTSCENE_HOODS_PH1 },
-	{ "HD_PH2",		STREAMED_SOUND_CUTSCENE_HOODS_PH2 },
-	{ "HD_PH3",		STREAMED_SOUND_CUTSCENE_HOODS_PH3 },
-	{ "HD_PH4",		STREAMED_SOUND_CUTSCENE_HOODS_PH4 },
-	{ "HD_PH5",		STREAMED_SOUND_CUTSCENE_HOODS_PH5 },
-	{ "MT_PH1",		STREAMED_SOUND_CUTSCENE_MARTY_PH1 },
-	{ "MT_PH2",		STREAMED_SOUND_CUTSCENE_MARTY_PH2 },
-	{ "MT_PH3",		STREAMED_SOUND_CUTSCENE_MARTY_PH3 },
-	{ "MT_PH4",		STREAMED_SOUND_CUTSCENE_MARTY_PH4 },
-	{ NULL,			0 }
+	{ "ASS_1", STREAMED_SOUND_CUTSCENE_ASS_1 },
+	{ "ASS_2", STREAMED_SOUND_CUTSCENE_ASS_2 },
+	{ "BANK_1", STREAMED_SOUND_CUTSCENE_BANK_1 },
+	{ "BANK_2A", STREAMED_SOUND_CUTSCENE_BANK_2A },
+	{ "BANK_2B", STREAMED_SOUND_CUTSCENE_BANK_2B },
+	{ "BANK_3A", STREAMED_SOUND_CUTSCENE_BANK_3A },
+	{ "BANK_3B", STREAMED_SOUND_CUTSCENE_BANK_3B },
+	{ "BANK_4", STREAMED_SOUND_CUTSCENE_BANK_4 },
+	{ "BIKE_1", STREAMED_SOUND_CUTSCENE_BIKE_1 },
+	{ "BIKE_2", STREAMED_SOUND_CUTSCENE_BIKE_2 },
+	{ "BIKE_3", STREAMED_SOUND_CUTSCENE_BIKE_3 },
+	{ "BUD_1", STREAMED_SOUND_CUTSCENE_BUD_1 },
+	{ "BUD_2", STREAMED_SOUND_CUTSCENE_BUD_2 },
+	{ "BUD_3", STREAMED_SOUND_CUTSCENE_BUD_3 },
+	{ "CAP_1", STREAMED_SOUND_CUTSCENE_CAP_1 },
+	{ "CAR_1", STREAMED_SOUND_CUTSCENE_CAR_1 },
+	{ "CNT_1A", STREAMED_SOUND_CUTSCENE_CNT_1A },
+	{ "CNT_1B", STREAMED_SOUND_CUTSCENE_CNT_1B },
+	{ "CNT_2", STREAMED_SOUND_CUTSCENE_CNT_2 },
+	{ "COK_1", STREAMED_SOUND_CUTSCENE_COK_1 },
+	{ "COK_2A", STREAMED_SOUND_CUTSCENE_COK_2A },
+	{ "COK_2B", STREAMED_SOUND_CUTSCENE_COK_2B },
+	{ "COK_3", STREAMED_SOUND_CUTSCENE_COK_3 },
+	{ "COK_4A", STREAMED_SOUND_CUTSCENE_COK_4A },
+	{ "COK_4A2", STREAMED_SOUND_CUTSCENE_COK_4A2 },
+	{ "COK_4B", STREAMED_SOUND_CUTSCENE_COK_4B },
+	{ "COL_1", STREAMED_SOUND_CUTSCENE_COL_1 },
+	{ "COL_2", STREAMED_SOUND_CUTSCENE_COL_2 },
+	{ "COL_3A", STREAMED_SOUND_CUTSCENE_COL_3A },
+	{ "COL_4A", STREAMED_SOUND_CUTSCENE_COL_4A },
+	{ "COL_5A", STREAMED_SOUND_CUTSCENE_COL_5A },
+	{ "COL_5B", STREAMED_SOUND_CUTSCENE_COL_5B },
+	{ "CUB_1", STREAMED_SOUND_CUTSCENE_CUB_1 },
+	{ "CUB_2", STREAMED_SOUND_CUTSCENE_CUB_2 },
+	{ "CUB_3", STREAMED_SOUND_CUTSCENE_CUB_3 },
+	{ "CUB_4", STREAMED_SOUND_CUTSCENE_CUB_4 },
+	{ "DRUG_1", STREAMED_SOUND_CUTSCENE_DRUG_1 },
+	{ "FIN", STREAMED_SOUND_CUTSCENE_FIN },
+	{ "FIN_2", STREAMED_SOUND_CUTSCENE_FIN2 },
+	{ "FINALE", STREAMED_SOUND_CUTSCENE_FINALE },
+	{ "HAT_1", STREAMED_SOUND_CUTSCENE_HAT_1 },
+	{ "HAT_2", STREAMED_SOUND_CUTSCENE_HAT_2 },
+	{ "HAT_3", STREAMED_SOUND_CUTSCENE_HAT_3 },
+	{ "ICE_1", STREAMED_SOUND_CUTSCENE_ICE_1 },
+	{ "INT_A", STREAMED_SOUND_CUTSCENE_INT_A },
+	{ "INT_B", STREAMED_SOUND_CUTSCENE_INT_B },
+	{ "INT_D", STREAMED_SOUND_CUTSCENE_INT_D },
+	{ "INT_M", STREAMED_SOUND_CUTSCENE_INT_M },
+	{ "LAW_1A", STREAMED_SOUND_CUTSCENE_LAW_1A },
+	{ "LAW_1B", STREAMED_SOUND_CUTSCENE_LAW_1B },
+	{ "LAW_2A", STREAMED_SOUND_CUTSCENE_LAW_2A },
+	{ "LAW_2B", STREAMED_SOUND_CUTSCENE_LAW_2B },
+	{ "LAW_2C", STREAMED_SOUND_CUTSCENE_LAW_2C },
+	{ "LAW_3", STREAMED_SOUND_CUTSCENE_LAW_3 },
+	{ "LAW_4", STREAMED_SOUND_CUTSCENE_LAW_4 },
+	{ "PHIL_1", STREAMED_SOUND_CUTSCENE_PHIL_1 },
+	{ "PHIL_2", STREAMED_SOUND_CUTSCENE_PHIL_2 },
+	{ "PORN_1", STREAMED_SOUND_CUTSCENE_PORN_1 },
+	{ "PORN_2", STREAMED_SOUND_CUTSCENE_PORN_2 },
+	{ "PORN_3", STREAMED_SOUND_CUTSCENE_PORN_3 },
+	{ "PORN_4", STREAMED_SOUND_CUTSCENE_PORN_4 },
+	{ "RESC_1A", STREAMED_SOUND_CUTSCENE_RESC_1A },
+	{ "ROK_1", STREAMED_SOUND_CUTSCENE_ROK_1 },
+	{ "ROK_2", STREAMED_SOUND_CUTSCENE_ROK_2 },
+	{ "ROK_3A", STREAMED_SOUND_CUTSCENE_ROK_3A },
+	{ "STRIPA", STREAMED_SOUND_CUTSCENE_STRIPA },
+	{ "TAX_1", STREAMED_SOUND_CUTSCENE_TAX_1 },
+	{ "TEX_1", STREAMED_SOUND_CUTSCENE_TEX_1 },
+	{ "TEX_2", STREAMED_SOUND_CUTSCENE_TEX_2 },
+	{ "TEX_3", STREAMED_SOUND_CUTSCENE_TEX_3 },
+	{ "GSPOT", STREAMED_SOUND_CUTSCENE_GLIGHT },
+	{ "FIST", STREAMED_SOUND_CUTSCENE_FIST },
+	{ "EL_PH1", STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 },
+	{ "EL_PH2", STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 },
+	{ NULL, 0 }
 };
 
 int
@@ -185,23 +180,28 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
 	CGame::DrasticTidyUpMemory(true);
 
 	strcpy(ms_cutsceneName, szCutsceneName);
-	file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb");
+
+	RwStream *stream;
+	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, "ANIM\\CUTS.IMG");
+	assert(stream);
 
 	// Load animations
 	sprintf(gString, "%s.IFP", szCutsceneName);
 	if (ms_pCutsceneDir->FindItem(gString, offset, size)) {
 		CStreaming::MakeSpaceFor(size << 11);
 		CStreaming::ImGonnaUseStreamingMemory();
-		CFileMgr::Seek(file, offset << 11, SEEK_SET);
-		CAnimManager::LoadAnimFile(file, false);
+		RwStreamSkip(stream,  offset << 11);
+		CAnimManager::LoadAnimFile(stream, false);
 		ms_cutsceneAssociations.CreateAssociations(szCutsceneName);
 		CStreaming::IHaveUsedStreamingMemory();
 		ms_animLoaded = true;
 	} else {
 		ms_animLoaded = false;
 	}
+	RwStreamClose(stream, nil);
 
 	// Load camera data
+	file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb");
 	sprintf(gString, "%s.DAT", szCutsceneName);
 	if (ms_pCutsceneDir->FindItem(gString, offset, size)) {
 		CFileMgr::Seek(file, offset << 11, SEEK_SET);
@@ -235,16 +235,6 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
 }
 
 void
-CCutsceneMgr::SetHeadAnim(const char *animName, CObject *pObject)
-{
-	CCutsceneHead *pCutsceneHead = (CCutsceneHead*)pObject;
-	char szAnim[CUTSCENENAMESIZE * 2];
-
-	sprintf(szAnim, "%s_%s", ms_cutsceneName, animName);
-	pCutsceneHead->PlayAnimation(szAnim);
-}
-
-void
 CCutsceneMgr::FinishCutscene()
 {
 	CCutsceneMgr::ms_cutsceneTimer = TheCamera.GetCutSceneFinishTime() * 0.001f;
@@ -302,11 +292,7 @@ CCutsceneMgr::SetCutsceneAnim(const char *animName, CObject *pObject)
 CCutsceneHead *
 CCutsceneMgr::AddCutsceneHead(CObject *pObject, int modelId)
 {
-	CCutsceneHead *pHead = new CCutsceneHead(pObject);
-	pHead->SetModelIndex(modelId);
-	CWorld::Add(pHead);
-	ms_pCutsceneObjects[ms_numCutsceneObjs++] = pHead;
-	return pHead;
+	return nil;
 }
 
 CCutsceneObject *
diff --git a/src/animation/CutsceneMgr.h b/src/animation/CutsceneMgr.h
index bfdcdb57..18eff0e5 100644
--- a/src/animation/CutsceneMgr.h
+++ b/src/animation/CutsceneMgr.h
@@ -41,7 +41,6 @@ public:
 	static void Shutdown(void);
 	static void LoadCutsceneData(const char *szCutsceneName);
 	static void FinishCutscene(void);
-	static void SetHeadAnim(const char *animName, CObject *pObject);
 	static void SetupCutsceneToStart(void);
 	static void SetCutsceneAnim(const char *animName, CObject *pObject);
 	static CCutsceneHead *AddCutsceneHead(CObject *pObject, int modelId);
diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp
index a3a2013a..b886e95d 100644
--- a/src/animation/FrameUpdate.cpp
+++ b/src/animation/FrameUpdate.cpp
@@ -6,6 +6,8 @@
 #include "AnimBlendAssociation.h"
 #include "RpAnimBlend.h"
 
+//--MIAMI: file done
+
 CAnimBlendClumpData *gpAnimBlendClump;
 
 // PS2 names without "NonSkinned"
@@ -17,7 +19,6 @@ void FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, void *arg);
 
-
 void
 FrameUpdateCallBackNonSkinned(AnimBlendFrameData *frame, void *arg)
 {
@@ -228,8 +229,6 @@ FrameUpdateCallBackWith3dVelocityExtractionNonSkinned(AnimBlendFrameData *frame,
 	RwMatrixUpdate(mat);
 }
 
-#ifdef PED_SKIN
-
 void
 FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg)
 {
@@ -259,11 +258,9 @@ FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg)
 			(*node)->Update(vec, q, 1.0f-totalBlendAmount);
 			if((*node)->sequence->HasTranslation())
 				pos += vec;
-#ifdef FIX_BUGS
 			if(DotProduct(rot, q) < 0.0f)
 				rot -= q;
 			else
-#endif
 				rot += q;
 		}
 		++*node;
@@ -319,11 +316,9 @@ FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void
 	for(node = updateData->nodes; *node; node++){
 		if((*node)->sequence){
 			bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
-#ifdef FIX_BUGS
 			if(DotProduct(rot, q) < 0.0f)
 				rot -= q;
 			else
-#endif
 				rot += q;
 			if((*node)->sequence->HasTranslation()){
 				pos += vec;
@@ -442,4 +437,9 @@ FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, vo
 	}
 }
 
-#endif
+void
+FrameUpdateCallBackOffscreen(AnimBlendFrameData *frame, void *arg)
+{
+	if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION && gpAnimBlendClump->velocity)
+		FrameUpdateCallBackWithVelocityExtractionSkinned(frame, arg);
+}
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index be70ad66..8671e95d 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -9,9 +9,9 @@
 #include "AnimBlendHierarchy.h"
 #include "AnimBlendAssociation.h"
 #include "RpAnimBlend.h"
-#ifdef PED_SKIN
 #include "PedModelInfo.h"
-#endif
+
+//--MIAMI: file done
 
 RwInt32 ClumpOffset;
 
@@ -141,7 +141,6 @@ FrameInitCBskin(AnimBlendFrameData *frameData, void*)
 	frameData->flag = 0;
 }
 
-#ifdef PED_SKIN
 void
 RpAnimBlendClumpInitSkinned(RpClump *clump)
 {
@@ -155,7 +154,7 @@ RpAnimBlendClumpInitSkinned(RpClump *clump)
 
 	RpAnimBlendAllocateData(clump);
 	clumpData = *RPANIMBLENDCLUMPDATA(clump);
-	atomic = IsClumpSkinned(clump);
+	atomic = GetFirstAtomic(clump);
 	assert(atomic);
 	skin = RpSkinGeometryGetSkin(RpAtomicGetGeometry(atomic));
 	assert(skin);
@@ -175,7 +174,6 @@ RpAnimBlendClumpInitSkinned(RpClump *clump)
 	clumpData->ForAllFrames(FrameInitCBskin, nil);
 	clumpData->frames[0].flag |= AnimBlendFrameData::VELOCITY_EXTRACTION;
 }
-#endif
 
 void
 RpAnimBlendClumpInitNotSkinned(RpClump *clump)
@@ -199,11 +197,9 @@ RpAnimBlendClumpInitNotSkinned(RpClump *clump)
 void
 RpAnimBlendClumpInit(RpClump *clump)
 {
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clump))
 		RpAnimBlendClumpInitSkinned(clump);
 	else
-#endif
 		RpAnimBlendClumpInitNotSkinned(clump);
 }
 
@@ -363,7 +359,6 @@ FillFrameArrayCBnonskin(AnimBlendFrameData *frame, void *arg)
 	frames[CVisibilityPlugins::GetFrameHierarchyId(frame->frame)] = frame;
 }
 
-#ifdef PED_SKIN
 void
 RpAnimBlendClumpFillFrameArraySkin(RpClump *clump, AnimBlendFrameData **frames)
 {
@@ -373,22 +368,18 @@ RpAnimBlendClumpFillFrameArraySkin(RpClump *clump, AnimBlendFrameData **frames)
 	for(i = PED_MID; i < PED_NODE_MAX; i++)
 		frames[i] = &clumpData->frames[RpHAnimIDGetIndex(hier, ConvertPedNode2BoneTag(i))];
 }
-#endif
 
 void
 RpAnimBlendClumpFillFrameArray(RpClump *clump, AnimBlendFrameData **frames)
 {
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clump))
 		RpAnimBlendClumpFillFrameArraySkin(clump, frames);
 	else
-#endif
 		(*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FillFrameArrayCBnonskin, frames);
 }
 
 AnimBlendFrameData *pFrameDataFound;
 
-// FrameFindCallBack on PS2
 void
 FrameFindByNameCBnonskin(AnimBlendFrameData *frame, void *arg)
 {
@@ -397,7 +388,6 @@ FrameFindByNameCBnonskin(AnimBlendFrameData *frame, void *arg)
 		pFrameDataFound = frame;
 }
 
-#ifdef PED_SKIN
 void
 FrameFindByNameCBskin(AnimBlendFrameData *frame, void *arg)
 {
@@ -405,25 +395,55 @@ FrameFindByNameCBskin(AnimBlendFrameData *frame, void *arg)
 	if(name && CGeneral::faststricmp(name, (char*)arg) == 0)
 		pFrameDataFound = frame;
 }
-#endif
+
+void
+FrameFindByBoneCB(AnimBlendFrameData *frame, void *arg)
+{
+	if(frame->nodeID == (int32)(uintptr)arg)
+		pFrameDataFound = frame;
+}
 
 AnimBlendFrameData*
 RpAnimBlendClumpFindFrame(RpClump *clump, const char *name)
 {
 	pFrameDataFound = nil;
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clump))
 		(*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByNameCBskin, (void*)name);
 	else
-#endif
 		(*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByNameCBnonskin, (void*)name);
 	return pFrameDataFound;
 }
 
+AnimBlendFrameData*
+RpAnimBlendClumpFindBone(RpClump *clump, uint32 boneTag)
+{
+	pFrameDataFound = nil;
+	(*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByBoneCB, (void*)boneTag);
+	return pFrameDataFound;
+}
+
 void
-RpAnimBlendClumpUpdateAnimations(RpClump *clump, float timeDelta)
+RpAnimBlendNodeUpdateKeyframes(AnimBlendFrameData *frames, AnimBlendFrameUpdateData *updateData, int32 numNodes)
 {
+	CAnimBlendNode **node;
 	int i;
+
+	for(node = updateData->nodes; *node; node++){
+		CAnimBlendAssociation *a = (*node)->association;
+		for(i = 0; i < numNodes; i++)
+			if((frames[i].flag & AnimBlendFrameData::VELOCITY_EXTRACTION) == 0 ||
+			   gpAnimBlendClump->velocity == nil){
+				if((*node)[i].sequence)
+					(*node)[i].FindKeyFrame(a->currentTime - a->timeStep);
+			}
+	}
+}
+
+void
+RpAnimBlendClumpUpdateAnimations(RpClump *clump, float timeDelta, bool doRender)
+{
+	int i;
+	CAnimBlendAssociation *assoc;
 	AnimBlendFrameUpdateData updateData;
 	float totalLength = 0.0f;
 	float totalBlend = 0.0f;
@@ -439,30 +459,45 @@ RpAnimBlendClumpUpdateAnimations(RpClump *clump, float timeDelta)
 	updateData.foobar = 0;
 	for(link = clumpData->link.next; link; link = next){
 		next = link->next;
-		CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
+		assoc = CAnimBlendAssociation::FromLink(link);
 		if(assoc->UpdateBlend(timeDelta)){
-			// CAnimManager::UncompressAnimation(v6->hierarchy)
-			updateData.nodes[i++] = assoc->GetNode(0);
-			if(assoc->flags & ASSOC_MOVEMENT){
-				totalLength += assoc->hierarchy->totalLength/assoc->speed * assoc->blendAmount;
-				totalBlend += assoc->blendAmount;
+			if(assoc->hierarchy->sequences){
+				//CAnimManager::UncompressAnimation(v6->hierarchy)
+				if(i < 11)
+					updateData.nodes[i++] = assoc->GetNode(0);
+				if(assoc->flags & ASSOC_MOVEMENT){
+					totalLength += assoc->hierarchy->totalLength/assoc->speed * assoc->blendAmount;
+					totalBlend += assoc->blendAmount;
+				}else
+					updateData.foobar = 1;
 			}else
-				updateData.foobar = 1;
+				debug("anim %s is not loaded\n", assoc->hierarchy->name);
 		}
 	}
+
+	for(link = clumpData->link.next; link; link = link->next){
+		assoc = CAnimBlendAssociation::FromLink(link);
+		assoc->UpdateTimeStep(timeDelta, totalLength == 0.0f ? 1.0f : totalBlend/totalLength);
+	}
+
 	updateData.nodes[i] = nil;
 
-#ifdef PED_SKIN
-	if(IsClumpSkinned(clump))
-		clumpData->ForAllFrames(FrameUpdateCallBackSkinned, &updateData);
-	else
-#endif
-		clumpData->ForAllFrames(FrameUpdateCallBackNonSkinned, &updateData);
+	if(doRender){
+		if(clumpData->frames[0].flag & AnimBlendFrameData::UPDATE_KEYFRAMES)
+			RpAnimBlendNodeUpdateKeyframes(clumpData->frames, &updateData, clumpData->numFrames);
+		if(IsClumpSkinned(clump))
+			clumpData->ForAllFrames(FrameUpdateCallBackSkinned, &updateData);
+		else
+			clumpData->ForAllFrames(FrameUpdateCallBackNonSkinned, &updateData);
+		clumpData->frames[0].flag &= ~AnimBlendFrameData::UPDATE_KEYFRAMES;
+	}else{
+		clumpData->ForAllFrames(FrameUpdateCallBackOffscreen, &updateData);
+		clumpData->frames[0].flag |= AnimBlendFrameData::UPDATE_KEYFRAMES;
+	}
 
 	for(link = clumpData->link.next; link; link = link->next){
-		CAnimBlendAssociation *assoc = CAnimBlendAssociation::FromLink(link);
-		float relSpeed = totalLength == 0.0f ? 1.0f : totalBlend/totalLength;
-		assoc->UpdateTime(timeDelta, relSpeed);
+		assoc = CAnimBlendAssociation::FromLink(link);
+		assoc->UpdateTime(timeDelta, totalLength == 0.0f ? 1.0f : totalBlend/totalLength);
 	}
 	RwFrameUpdateObjects(RpClumpGetFrame(clump));
 }
diff --git a/src/animation/RpAnimBlend.h b/src/animation/RpAnimBlend.h
index 838c8816..d0f7a114 100644
--- a/src/animation/RpAnimBlend.h
+++ b/src/animation/RpAnimBlend.h
@@ -26,6 +26,7 @@ void RpAnimBlendClumpInit(RpClump *clump);
 bool RpAnimBlendClumpIsInitialized(RpClump *clump);
 void RpAnimBlendClumpFillFrameArray(RpClump* clump, AnimBlendFrameData** frames);
 AnimBlendFrameData *RpAnimBlendClumpFindFrame(RpClump *clump, const char *name);
+AnimBlendFrameData *RpAnimBlendClumpFindBone(RpClump *clump, uint32 boneTag);
 void FillFrameArrayCallBack(AnimBlendFrameData *frame, void *arg);
 CAnimBlendAssociation *RpAnimBlendClumpGetAssociation(RpClump *clump, uint32 id);
 CAnimBlendAssociation *RpAnimBlendClumpGetMainAssociation(RpClump *clump, CAnimBlendAssociation **assocRet, float *blendRet);
@@ -34,9 +35,11 @@ CAnimBlendAssociation *RpAnimBlendClumpGetMainAssociation_N(RpClump *clump, int
 CAnimBlendAssociation *RpAnimBlendClumpGetMainPartialAssociation_N(RpClump *clump, int n);
 CAnimBlendAssociation *RpAnimBlendClumpGetFirstAssociation(RpClump *clump, uint32 mask);
 CAnimBlendAssociation *RpAnimBlendClumpGetFirstAssociation(RpClump *clump);
-void RpAnimBlendClumpUpdateAnimations(RpClump* clump, float timeDelta);
+void RpAnimBlendNodeUpdateKeyframes(AnimBlendFrameData *frames, AnimBlendFrameUpdateData *updateData, int32 numNodes);
+void RpAnimBlendClumpUpdateAnimations(RpClump* clump, float timeDelta, bool doRender = true);
 
 
 extern CAnimBlendClumpData *gpAnimBlendClump;
 void FrameUpdateCallBackNonSkinned(AnimBlendFrameData *frame, void *arg);
 void FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg);
+void FrameUpdateCallBackOffscreen(AnimBlendFrameData *frame, void *arg);
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index ec193bc8..59e855d7 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -314,24 +314,26 @@ cAudioManager::ProcessEntity(int32 id)
 				ProcessWeather(id);
 			}
 			break;
-		case AUDIOTYPE_CRANE:
+/*		case AUDIOTYPE_CRANE:
 			if (!m_nUserPause) {
 				m_sQueueSample.m_bReverbFlag = true;
 				ProcessCrane();
 			}
-			break;
+			break;*/
 		case AUDIOTYPE_SCRIPTOBJECT:
 			if (!m_nUserPause) {
 				m_sQueueSample.m_bReverbFlag = true;
 				ProcessScriptObject(id);
 			}
 			break;
+#ifdef GTA_BRIDGE
 		case AUDIOTYPE_BRIDGE:
 			if (!m_nUserPause) {
 				m_sQueueSample.m_bReverbFlag = true;
 				ProcessBridge();
 			}
 			break;
+#endif
 		case AUDIOTYPE_FRONTEND:
 			m_sQueueSample.m_bReverbFlag = false;
 			ProcessFrontEnd();
@@ -390,13 +392,13 @@ enum eVehicleModel {
 	LINERUN,
 	PEREN,
 	SENTINEL,
-	PATRIOT,
+	RIO,
 	FIRETRUK,
 	TRASH,
 	STRETCH,
 	MANANA,
 	INFERNUS,
-	BLISTA,
+	VOODOO,
 	PONY,
 	MULE,
 	CHEETAH,
@@ -405,11 +407,11 @@ enum eVehicleModel {
 	MOONBEAM,
 	ESPERANT,
 	TAXI,
-	KURUMA,
+	WASHING,
 	BOBCAT,
 	MRWHOOP,
 	BFINJECT,
-	CORPSE,
+	HUNTER,
 	POLICE,
 	ENFORCER,
 	SECURICA,
@@ -418,43 +420,83 @@ enum eVehicleModel {
 	BUS,
 	RHINO,
 	BARRACKS,
-	TRAIN,
+	CUBAN,
 	CHOPPER,
-	DODO,
+	ANGEL,
 	COACH,
 	CABBIE,
 	STALLION,
 	RUMPO,
 	RCBANDIT,
-	BELLYUP,
-	MRWONGS,
-	MAFIA,
-	YARDIE,
-	YAKUZA,
-	DIABLOS,
-	COLUMB,
-	HOODS,
+	ROMERO,
+	PACKER,
+	SENTXS,
+	ADMIRAL,
+	SQUALO,
+	SEASPAR,
+	PIZZABOY,
+	GANGBUR,
 	AIRTRAIN,
 	DEADDODO,
 	SPEEDER,
 	REEFER,
-	PANLANT,
+	TROPIC,
 	FLATBED,
 	YANKEE,
-	ESCAPE,
-	BORGNINE,
-	TOYZ,
-	GHOST,
-	CAR151,
-	CAR152,
-	CAR153,
-	CAR154,
-	CAR155,
-	CAR156,
-	CAR157,
-	CAR158,
-	CAR159,
-	MAX_CARS
+	CADDY,
+	ZEBRA,
+	TOPFUN,
+	SKIMMER,
+	PCJ600,
+	FAGGIO,
+	FREEWAY,
+	RCBARON,
+	RCRAIDER,
+	GLENDALE,
+	OCEANIC,
+	SANCHEZ,
+	SPARROW,
+	PATRIOT,
+	LOVEFIST,
+	COASTG,
+	DINGHY,
+	HERMES,
+	SABRE,
+	SABRETUR,
+	PHEONIX,
+	WALTON,
+	REGINA,
+	COMET,
+	DELUXO,
+	BURRITO,
+	SPAND,
+	MARQUIS,
+	BAGGAGE,
+	KAUFMAN,
+	MAVERICK,
+	VCNMAV,
+	RANCHER,
+	FBIRANCH,
+	VIRGO,
+	GREENWOO,
+	JETMAX,
+	HOTRING,
+	SANDKING,
+	BLISTAC,
+	POLMAV,
+	BOXVILLE,
+	BENSON,
+	MESA,
+	RCGOBLIN,
+	HOTRINA,
+	HOTRINB,
+	BLOODRA,
+	BLOODRB,
+	VICECHEE,
+
+	// HACK so this compiles
+	// TODO(MIAMI): check it out
+	DODO = -1
 };
 
 enum
@@ -476,77 +518,116 @@ struct tVehicleSampleData {
 	uint8 m_bDoorType;
 };
 
-const tVehicleSampleData aVehicleSettings[MAX_CARS] = {
-    {SFX_CAR_REV_2, SAMPLEBANK_CAR_PATHFINDER, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_8, SAMPLEBANK_CAR_COBRA, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_ALARM_1, 10928, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 12893, SFX_CAR_ALARM_1, 8941, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_CAR_ALARM_1, 11922, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_ALARM_1, 7948, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_POLICE_SIREN_SLOW, 11556, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_ALARM_1, 8941, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_BMW328, 9538, SFX_CAR_ALARM_1, 12220, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_3, SAMPLEBANK_CAR_PORSCHE, SFX_CAR_HORN_BMW328, 12017, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_2, SAMPLEBANK_CAR_PATHFINDER, SFX_CAR_HORN_JEEP, 22295, SFX_CAR_ALARM_1, 12200, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_ALARM_1, 13400, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_3, SAMPLEBANK_CAR_PORSCHE, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_ALARM_1, 13600, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_JEEP, 22295, SFX_AMBULANCE_SIREN_SLOW, 8795, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_PORSCHE, 9271, SFX_POLICE_SIREN_SLOW, 16168, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 12170, SFX_CAR_ALARM_1, 8000, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_BUS2, 12345, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_2, SAMPLEBANK_CAR_PATHFINDER, SFX_CAR_HORN_BMW328, 10796, SFX_CAR_ALARM_1, 8543, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_PORSCHE, 9271, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_2, SAMPLEBANK_CAR_PATHFINDER, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_PICKUP, 11025, SFX_ICE_CREAM_TUNE, 11025, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_7, SAMPLEBANK_CAR_HOTROD, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 10000, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_BMW328, 10706, SFX_POLICE_SIREN_SLOW, 13596, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_BUS, 17260, SFX_POLICE_SIREN_SLOW, 13000, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_8, SAMPLEBANK_CAR_COBRA, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_ALARM_1, 10123, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 13596, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_BUS2, 11652, SFX_CAR_ALARM_1, 10554, DOOR_TYPE_AIRBREAK},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_ALARM_1, 8000, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_1, SAMPLEBANK_MAIN, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_AIRBREAK},
-    {SFX_CAR_REV_1, SAMPLEBANK_MAIN, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CESNA_IDLE, SAMPLEBANK_MAIN, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_BUS, 16291, SFX_CAR_ALARM_1, 7500, DOOR_TYPE_AIRBREAK},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 10233, SFX_CAR_ALARM_1, 8935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_ALARM_1, 8935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_MAIN, SFX_CAR_HORN_PICKUP, 2000, SFX_CAR_ALARM_1, 17000, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_BMW328, 9003, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_2, SAMPLEBANK_CAR_PATHFINDER, SFX_CAR_HORN_PORSCHE, 12375, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_5, SAMPLEBANK_CAR_MERC, SFX_CAR_HORN_BUS2, 15554, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_7, SAMPLEBANK_CAR_HOTROD, SFX_CAR_HORN_BUS2, 13857, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_7, SAMPLEBANK_CAR_HOTROD, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_1, SAMPLEBANK_MAIN, SFX_CAR_HORN_JEEP, 20143, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_MAIN, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9000, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_6, SAMPLEBANK_CAR_MACKTRUCK, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_BUS, 18286, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_TRUCK},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_4, SAMPLEBANK_CAR_SPIDER, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_ALARM_1, 13400, DOOR_TYPE_NEW},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD},
-    {SFX_CAR_REV_1, SAMPLEBANK_CAR_PACARD, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, DOOR_TYPE_OLD}};
+const tVehicleSampleData aVehicleSettings[110] = { {SFX_CAR_REV_2, 2, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_8, 8, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 10928, 1},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 12893, SFX_CAR_HORN_JEEP, 8941, 0},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_BMW328, 10706, SFX_CAR_HORN_JEEP, 11922, 1},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 7948, 2},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 29711, SFX_POLICE_SIREN_SLOW, 11556, 2},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 31478, SFX_CAR_HORN_JEEP, 8941, 2},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_BMW328, 9538, SFX_CAR_HORN_JEEP, 12220, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_3, 3, SFX_CAR_HORN_BMW328, 12017, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_2, 2, SFX_CAR_HORN_JEEP, 22295, SFX_CAR_HORN_JEEP, 12200, 1},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 13400, 1},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_3, 3, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_HORN_JEEP, 13600, 1},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_JEEP, 22295, SFX_AMBULANCE_SIREN_SLOW, 8795, 2},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_PORSCHE, 9271, SFX_POLICE_SIREN_SLOW, 16168, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 12170, SFX_CAR_HORN_JEEP, 8000, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_BUS2, 12345, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_2, 2, SFX_CAR_HORN_BMW328, 10796, SFX_CAR_HORN_JEEP, 8543, 1},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_PORSCHE, 9271, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_2, 2, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_PICKUP, 11025, SFX_ICE_CREAM_TUNE, 11025, 0},
+												 {SFX_CAR_REV_7, 7, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 10000, 0},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_BMW328, 10706, SFX_POLICE_SIREN_SLOW, 13596, 1},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_BUS, 17260, SFX_POLICE_SIREN_SLOW, 13000, 2},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_8, 8, SFX_CAR_HORN_PORSCHE, 10400, SFX_CAR_HORN_JEEP, 10123, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 26513, SFX_POLICE_SIREN_SLOW, 13596, 0},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_BUS2, 11652, SFX_CAR_HORN_JEEP, 10554, 3},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 8000, 2},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_1, 0, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_HORN_JEEP, 9935, 3},
+												 {SFX_CAR_REV_1, 0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CESNA_IDLE, 0, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_BUS, 16291, SFX_CAR_HORN_JEEP, 7500, 3},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 10233, SFX_CAR_HORN_JEEP, 8935, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_PICKUP, 8670, SFX_CAR_HORN_JEEP, 8935, 0},
+												 {SFX_CAR_REV_1, 0, SFX_CAR_HORN_PICKUP, 2000, SFX_CAR_HORN_JEEP, 17000, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_BMW328, 9003, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_2, 2, SFX_CAR_HORN_PORSCHE, 12375, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_5, 5, SFX_CAR_HORN_BUS2, 15554, SFX_CAR_HORN_JEEP, 9935, 1},
+												 {SFX_CAR_REV_7, 7, SFX_CAR_HORN_BUS2, 13857, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_7, 7, SFX_CAR_HORN_PICKUP, 10924, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_1, 0, SFX_CAR_HORN_JEEP, 20143, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 0, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9000, 0},
+												 {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 28043, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_BUS, 18286, SFX_CAR_HORN_JEEP, 9935, 2},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 10842, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_4, 4, SFX_CAR_HORN_BUS2, 18000, SFX_CAR_HORN_JEEP, 13400, 1},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0},
+												 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_HORN_JEEP, 9935, 0} };
 
 
 bool bPlayerJustEnteredCar;
@@ -643,10 +724,12 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 		ProcessBoatMovingOverWater(&params);
 		ProcessVehicleOneShots(&params);
 		break;
+#ifdef GTA_TRAIN
 	case VEHICLE_TYPE_TRAIN:
 		ProcessTrainNoise(&params);
 		ProcessVehicleOneShots(&params);
 		break;
+#endif
 	case VEHICLE_TYPE_HELI:
 		ProcessHelicopter(&params);
 		ProcessVehicleOneShots(&params);
@@ -751,10 +834,11 @@ cAudioManager::ProcessReverseGear(cVehicleParams *params)
 	return true;
 }
 
+// TODO(Miami): this becomes ProcessModelVehicle
 void
 cAudioManager::ProcessModelCarEngine(cVehicleParams *params)
 {
-	const float SOUND_INTENSITY = 30.0f;
+/*	const float SOUND_INTENSITY = 30.0f;
 	CAutomobile *automobile;
 	float allowedVelocity;
 	int32 emittingVol;
@@ -801,7 +885,7 @@ cAudioManager::ProcessModelCarEngine(cVehicleParams *params)
 				}
 			}
 		}
-	}
+	}*/
 }
 
 
@@ -1630,8 +1714,16 @@ cAudioManager::ProcessVehicleSirenOrAlarm(cVehicleParams *params)
 		if (veh->m_bSirenOrAlarm == false && !veh->IsAlarmOn())
 			return true;
 
+		if (veh->IsAlarmOn()) {
+			if (CTimer::GetTimeInMilliseconds() > veh->m_bRainAudioCounter)
+				veh->m_bRainAudioCounter = CTimer::GetTimeInMilliseconds() + 750;
+
+			if (veh->m_bRainAudioCounter < CTimer::GetTimeInMilliseconds() + 375)
+				return true;
+		}
+
 		CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
-		m_sQueueSample.m_nVolume = ComputeVolume(80, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
+		m_sQueueSample.m_nVolume = ComputeVolume(veh->bIsDrowning ? 20 : 80, SOUND_INTENSITY, m_sQueueSample.m_fDistance);
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 5;
 			if (UsesSiren(params->m_nIndex)) {
@@ -2111,7 +2203,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
 			maxDist = SQR(SOUND_INTENSITY);
 			break;
 		}
-		case SOUND_BOAT_SLOWDOWN: {
+		/*case SOUND_17: {
 			const float SOUND_INTENSITY = 50.0f;
 			m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_THUMB_OFF;
 			m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
@@ -2123,7 +2215,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
 			emittingVol = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i];
 			maxDist = SQR(SOUND_INTENSITY);
 			break;
-		}
+		}*/
 		case SOUND_TRAIN_DOOR_CLOSE:
 		case SOUND_TRAIN_DOOR_OPEN: {
 			const float SOUND_INTENSITY = 35.0f;
@@ -2215,7 +2307,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
 			break;
 		}
 		case SOUND_BOMB_TIMED_ACTIVATED:
-		case SOUND_55:
+		case SOUND_91:
 		case SOUND_BOMB_ONIGNITION_ACTIVATED:
 		case SOUND_BOMB_TICK: {
 			const float SOUND_INTENSITY = 50.0f;
@@ -2239,14 +2331,14 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
 			pedParams.m_fDistance = params->m_fDistance;
 			SetupPedComments(&pedParams, SOUND_PED_HELI_PLAYER_FOUND);
 			continue;
-		case SOUND_PED_BODYCAST_HIT:
+		/* case SOUND_PED_BODYCAST_HIT:
 			pedParams.m_pPed = nil;
 			pedParams.m_bDistanceCalculated = false;
 			pedParams.m_fDistance = 0.0f;
 			pedParams.m_bDistanceCalculated = params->m_bDistanceCalculated;
 			pedParams.m_fDistance = params->m_fDistance;
 			SetupPedComments(&pedParams, SOUND_PED_BODYCAST_HIT);
-			continue;
+			continue; */
 		case SOUND_WATER_FALL: {
 			const float SOUND_INTENSITY = 40.0f;
 			m_sQueueSample.m_nSampleIndex = SFX_SPLASH_1;
@@ -2318,7 +2410,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
 		}
 	}
 }
-
+#ifdef GTA_TRAIN
 bool
 cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 {
@@ -2384,7 +2476,7 @@ cAudioManager::ProcessTrainNoise(cVehicleParams *params)
 	}
 	return true;
 }
-
+#endif
 bool
 cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 {
@@ -2451,7 +2543,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 			if (!m_sQueueSample.m_nVolume)
 				return true;
 			m_sQueueSample.m_nCounter = 40;
-			m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
+			m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 			m_sQueueSample.m_nFrequency += (m_sQueueSample.m_nEntityIndex * 65536) % 1000;
 			m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 			m_sQueueSample.m_bIs2D = false;
@@ -2476,7 +2568,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					emittingVol = 45 - 45 * padAccelerate / 40;
 					m_sQueueSample.m_nFrequency = 100 * padAccelerate + 11025;
 					m_sQueueSample.m_nCounter = 39;
-					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_IDLE;
+					m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 					if (LastAccel > 20) {
 						oneShotVol = LastVol;
 						PlayOneShot(m_sQueueSample.m_nEntityIndex, SOUND_BOAT_SLOWDOWN, oneShotVol);
@@ -2487,7 +2579,7 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					if (!boat->m_bIsAnchored)
 						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_nCounter = 40;
-					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
+					m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 				}
 				LastVol = emittingVol;
 				LastAccel = padAccelerate;
@@ -2497,14 +2589,14 @@ cAudioManager::ProcessBoatEngine(cVehicleParams *params)
 					m_sQueueSample.m_nFrequency = 11025;
 					emittingVol = 45;
 					m_sQueueSample.m_nCounter = 39;
-					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_IDLE;
+					m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 				} else {
 					emittingVol = (105.f * gasPedal) + 15;
 					m_sQueueSample.m_nFrequency = (4000.f * gasPedal) + 8000;
 					if (!boat->m_bIsAnchored)
 						m_sQueueSample.m_nFrequency = 11 * m_sQueueSample.m_nFrequency / 10;
 					m_sQueueSample.m_nCounter = 40;
-					m_sQueueSample.m_nSampleIndex = SFX_POLICE_BOAT_ACCEL;
+					m_sQueueSample.m_nSampleIndex = SFX_FISHING_BOAT_IDLE;
 				}
 			}
 			CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
@@ -2959,63 +3051,10 @@ cAudioManager::ProcessPed(CPhysical *ped)
 	// params.m_bDistanceCalculated = false;
 	params.m_pPed = (CPed *)ped;
 	params.m_fDistance = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (ped->GetModelIndex() == MI_FATMALE02)
-		ProcessPedHeadphones(&params);
 	ProcessPedOneShots(&params);
 }
 
 void
-cAudioManager::ProcessPedHeadphones(cPedParams *params)
-{
-	CPed *ped;
-	CAutomobile *veh;
-	uint8 emittingVol;
-
-	if (params->m_fDistance < SQR(7)) {
-		ped = params->m_pPed;
-		if (!ped->bIsAimingGun || ped->m_bodyPartBleeding != PED_HEAD) {
-			CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
-			if (ped->bInVehicle && ped->m_nPedState == PED_DRIVING) {
-				emittingVol = 10;
-				veh = (CAutomobile *)ped->m_pMyVehicle;
-				if (veh && veh->IsCar()) {
-					for (int32 i = DOOR_FRONT_LEFT; i < ARRAY_SIZE(veh->Doors); i++) {
-						if (!veh->IsDoorClosed((eDoors)i) || veh->IsDoorMissing((eDoors)i)) {
-							emittingVol = 42;
-							break;
-						}
-					}
-				}
-			} else {
-				emittingVol = 42;
-			}
-
-			m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, 7.f, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nCounter = 64;
-				m_sQueueSample.m_nSampleIndex = SFX_HEADPHONES;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nReleasingVolumeModificator = 5;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_HEADPHONES);
-				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_fSpeedMultiplier = 4.0f;
-				m_sQueueSample.m_fSoundIntensity = 7.0f;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_nReleasingVolumeDivider = 5;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-			}
-			return;
-		}
-	}
-}
-
-void
 cAudioManager::ProcessPedOneShots(cPedParams *params)
 {
 	uint8 emittingVol;
@@ -3474,7 +3513,7 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				else
 					noReflection = true;
 				break;
-			case WEAPONTYPE_AK47:
+			case WEAPONTYPE_RUGER:
 				m_sQueueSample.m_nSampleIndex = SFX_AK47_LEFT;
 				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 				m_sQueueSample.m_nCounter = iSound++;
@@ -3493,12 +3532,12 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_bIs2D = false;
 				m_sQueueSample.m_bReleasingSoundFlag = true;
 				break;
-			case WEAPONTYPE_M16:
-				m_sQueueSample.m_nSampleIndex = SFX_M16_LEFT;
+			case WEAPONTYPE_M4:
+				m_sQueueSample.m_nSampleIndex = SFX_M60_LEFT;
 				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 				m_sQueueSample.m_nCounter = iSound++;
 				stereo = true;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_M16_LEFT);
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_M60_LEFT);
 				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 32);
 				m_sQueueSample.m_nReleasingVolumeModificator = 3;
 				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
@@ -3593,20 +3632,20 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PISTOL_RELOAD) + RandomDisplacement(300);
 				break;
 			case WEAPONTYPE_UZI:
-				m_sQueueSample.m_nSampleIndex = SFX_M16_RELOAD;
+				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
 				m_sQueueSample.m_nFrequency = 39243;
 				break;
 			case WEAPONTYPE_SHOTGUN:
 				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
 				m_sQueueSample.m_nFrequency = 30290;
 				break;
-			case WEAPONTYPE_AK47:
+			case WEAPONTYPE_RUGER:
 				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
 				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_AK47_RELOAD);
 				break;
-			case WEAPONTYPE_M16:
-				m_sQueueSample.m_nSampleIndex = SFX_M16_RELOAD;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_M16_RELOAD);
+			case WEAPONTYPE_M4:
+				m_sQueueSample.m_nSampleIndex = SFX_AK47_RELOAD;
+				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_AK47_RELOAD);
 				break;
 			case WEAPONTYPE_SNIPERRIFLE:
 				m_sQueueSample.m_nSampleIndex = SFX_RIFLE_RELOAD;
@@ -3637,8 +3676,6 @@ cAudioManager::ProcessPedOneShots(cPedParams *params)
 			m_sQueueSample.m_bRequireReflection = true;
 			break;
 		case SOUND_WEAPON_AK47_BULLET_ECHO:
-		case SOUND_WEAPON_UZI_BULLET_ECHO:
-		case SOUND_WEAPON_M16_BULLET_ECHO:
 			m_sQueueSample.m_nSampleIndex = SFX_UZI_END_LEFT;
 			m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
 			m_sQueueSample.m_nCounter = iSound++;
@@ -3766,7 +3803,7 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 
 	if (ped != nil) {
 		switch (sound) {
-		case SOUND_AMMUNATION_WELCOME_1:
+		/*case SOUND_AMMUNATION_WELCOME_1:
 			pedComment.m_nSampleIndex = SFX_AMMU_D;
 			break;
 		case SOUND_AMMUNATION_WELCOME_2:
@@ -3774,7 +3811,7 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 			break;
 		case SOUND_AMMUNATION_WELCOME_3:
 			pedComment.m_nSampleIndex = SFX_AMMU_F;
-			break;
+			break;*/
 		default:
 			pedComment.m_nSampleIndex = GetPedCommentSfx(ped, sound);
 			if (pedComment.m_nSampleIndex == NO_SAMPLE)
@@ -3785,7 +3822,7 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 		soundIntensity = 50.0f;
 	} else {
 		switch (sound) {
-		case SOUND_PED_HELI_PLAYER_FOUND:
+		/*case SOUND_PED_HELI_PLAYER_FOUND:
 			soundIntensity = 400.0f;
 			pedComment.m_nSampleIndex = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_POLICE_HELI_1, SFX_POLICE_HELI_29);
 			break;
@@ -3804,7 +3841,7 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 		case SOUND_INJURED_PED_FEMALE:
 			soundIntensity = 50.0f;
 			pedComment.m_nSampleIndex = GetRandomNumberInRange(m_sQueueSample.m_nEntityIndex % 4, SFX_GENERIC_FEMALE_GRUNT_1, SFX_GENERIC_FEMALE_GRUNT_11);
-			break;
+			break;*/
 		default:
 			return;
 		}
@@ -3814,11 +3851,11 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 		CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
 		if (sound != SOUND_PAGER) {
 			switch (sound) {
-			case SOUND_AMMUNATION_WELCOME_1:
+			/*case SOUND_AMMUNATION_WELCOME_1:
 			case SOUND_AMMUNATION_WELCOME_2:
 			case SOUND_AMMUNATION_WELCOME_3:
 				emittingVol = MAX_VOLUME;
-				break;
+				break; */
 			default:
 				if (CWorld::GetIsLineOfSightClear(TheCamera.GetPosition(), m_sQueueSample.m_vecPos, true, false, false, false, false, false))
 					emittingVol = MAX_VOLUME;
@@ -3842,158 +3879,12 @@ cAudioManager::SetupPedComments(cPedParams *params, uint32 sound)
 int32
 cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
 {
-	if (ped->IsPlayer())
-		return GetPlayerTalkSfx(sound);
-
-	switch (ped->GetModelIndex()) {
-	case MI_COP:
-		return GetCopTalkSfx(sound);
-	case MI_SWAT:
-		return GetSwatTalkSfx(sound);
-	case MI_FBI:
-		return GetFBITalkSfx(sound);
-	case MI_ARMY:
-		return GetArmyTalkSfx(sound);
-	case MI_MEDIC:
-		return GetMedicTalkSfx(sound);
-	case MI_FIREMAN:
-		return GetFiremanTalkSfx(sound);
-	case MI_MALE01:
-		return GetNormalMaleTalkSfx(sound);
-	case MI_TAXI_D:
-		return GetTaxiDriverTalkSfx(sound);
-	case MI_PIMP:
-		return GetPimpTalkSfx(sound);
-	case MI_GANG01:
-	case MI_GANG02:
-		return GetMafiaTalkSfx(sound);
-	case MI_GANG03:
-	case MI_GANG04:
-		return GetTriadTalkSfx(sound);
-	case MI_GANG05:
-	case MI_GANG06:
-		return GetDiabloTalkSfx(sound);
-	case MI_GANG07:
-	case MI_GANG08:
-		return GetYakuzaTalkSfx(sound);
-	case MI_GANG09:
-	case MI_GANG10:
-		return GetYardieTalkSfx(sound);
-	case MI_GANG11:
-	case MI_GANG12:
-		return GetColumbianTalkSfx(sound);
-	case MI_GANG13:
-	case MI_GANG14:
-		return GetHoodTalkSfx(sound);
-	case MI_CRIMINAL01:
-		return GetBlackCriminalTalkSfx(sound);
-	case MI_CRIMINAL02:
-		return GetWhiteCriminalTalkSfx(sound);
-	case MI_SPECIAL01:
-	case MI_SPECIAL02:
-	case MI_SPECIAL03:
-	case MI_SPECIAL04:
-		return GetSpecialCharacterTalkSfx(ped->GetModelIndex(), sound);
-	case MI_MALE02:
-		return GetMaleNo2TalkSfx(sound);
-	case MI_MALE03:
-	case MI_P_MAN1:
-	case MI_P_MAN2:
-		return GetBlackProjectMaleTalkSfx(sound, ped->GetModelIndex());
-	case MI_FATMALE01:
-		return GetWhiteFatMaleTalkSfx(sound);
-	case MI_FATMALE02:
-		return GetBlackFatMaleTalkSfx(sound);
-	case MI_FEMALE01:
-		return GetBlackCasualFemaleTalkSfx(sound);
-	case MI_FEMALE02:
-	case MI_CAS_WOM:
-		return GetWhiteCasualFemaleTalkSfx(sound);
-	case MI_FEMALE03:
-		return GetFemaleNo3TalkSfx(sound);
-	case MI_FATFEMALE01:
-		return GetBlackFatFemaleTalkSfx(sound);
-	case MI_FATFEMALE02:
-		return GetWhiteFatFemaleTalkSfx(sound);
-	case MI_PROSTITUTE:
-		return GetBlackFemaleProstituteTalkSfx(sound);
-	case MI_PROSTITUTE2:
-		return GetWhiteFemaleProstituteTalkSfx(sound);
-	case MI_P_WOM1:
-		return GetBlackProjectFemaleOldTalkSfx(sound);
-	case MI_P_WOM2:
-		return GetBlackProjectFemaleYoungTalkSfx(sound);
-	case MI_CT_MAN1:
-		return GetChinatownMaleOldTalkSfx(sound);
-	case MI_CT_MAN2:
-		return GetChinatownMaleYoungTalkSfx(sound);
-	case MI_CT_WOM1:
-		return GetChinatownFemaleOldTalkSfx(sound);
-	case MI_CT_WOM2:
-		return GetChinatownFemaleYoungTalkSfx(sound);
-	case MI_LI_MAN1:
-	case MI_LI_MAN2:
-		return GetLittleItalyMaleTalkSfx(sound);
-	case MI_LI_WOM1:
-		return GetLittleItalyFemaleOldTalkSfx(sound);
-	case MI_LI_WOM2:
-		return GetLittleItalyFemaleYoungTalkSfx(sound);
-	case MI_DOCKER1:
-		return GetWhiteDockerMaleTalkSfx(sound);
-	case MI_DOCKER2:
-		return GetBlackDockerMaleTalkSfx(sound);
-	case MI_SCUM_MAN:
-		return GetScumMaleTalkSfx(sound);
-	case MI_SCUM_WOM:
-		return GetScumFemaleTalkSfx(sound);
-	case MI_WORKER1:
-		return GetWhiteWorkerMaleTalkSfx(sound);
-	case MI_WORKER2:
-		return GetBlackWorkerMaleTalkSfx(sound);
-	case MI_B_MAN1:
-	case MI_B_MAN3:
-		return GetBusinessMaleYoungTalkSfx(sound, ped->GetModelIndex());
-	case MI_B_MAN2:
-		return GetBusinessMaleOldTalkSfx(sound);
-	case MI_B_WOM1:
-	case MI_B_WOM2:
-		return GetWhiteBusinessFemaleTalkSfx(sound, ped->GetModelIndex());
-	case MI_B_WOM3:
-		return GetBlackBusinessFemaleTalkSfx(sound);
-	case MI_MOD_MAN:
-		return GetSupermodelMaleTalkSfx(sound);
-	case MI_MOD_WOM:
-		return GetSupermodelFemaleTalkSfx(sound);
-	case MI_ST_MAN:
-		return GetStewardMaleTalkSfx(sound);
-	case MI_ST_WOM:
-		return GetStewardFemaleTalkSfx(sound);
-	case MI_FAN_MAN1:
-	case MI_FAN_MAN2:
-		return GetFanMaleTalkSfx(sound, ped->GetModelIndex());
-	case MI_FAN_WOM:
-		return GetFanFemaleTalkSfx(sound);
-	case MI_HOS_MAN:
-		return GetHospitalMaleTalkSfx(sound);
-	case MI_HOS_WOM:
-		return GetHospitalFemaleTalkSfx(sound);
-	case MI_CONST1:
-		return GetWhiteConstructionWorkerTalkSfx(sound);
-	case MI_CONST2:
-		return GetBlackConstructionWorkerTalkSfx(sound);
-	case MI_SHOPPER1:
-	case MI_SHOPPER2:
-	case MI_SHOPPER3:
-		return GetShopperFemaleTalkSfx(sound, ped->GetModelIndex());
-	case MI_STUD_MAN:
-		return GetStudentMaleTalkSfx(sound);
-	case MI_STUD_WOM:
-		return GetStudentFemaleTalkSfx(sound);
-	case MI_CAS_MAN:
-		return GetCasualMaleOldTalkSfx(sound);
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
+	//if (ped->IsPlayer())
+	//	return GetPlayerTalkSfx(sound);
+
+	// TODO(Miami): ped comments
+
+	return NO_SAMPLE;
 }
 
 void
@@ -4009,2238 +3900,7 @@ cAudioManager::GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint
 }
 
 #pragma region PED_COMMENTS
-
-uint32
-cAudioManager::GetPlayerTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_DAMAGE:
-		GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_HIGH_DAMAGE_GRUNT_1, 11);
-		break;
-	case SOUND_PED_HIT:
-		GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_LOW_DAMAGE_GRUNT_1, 10);
-		break;
-	case SOUND_PED_LAND:
-		GetPhrase(&sfx, &lastSfx, SFX_CLAUDE_HIT_GROUND_GRUNT_1, 6);
-		break;
-	default:
-		sfx = NO_SAMPLE;
-		break;
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetCopTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	PedState pedState;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ARREST_COP:
-		GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_ARREST_1, 6);
-		break;
-	case SOUND_PED_PURSUIT_COP:
-		pedState = FindPlayerPed()->m_nPedState;
-		if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, SFX_COP_VOICE_1_CHASE_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return (SFX_COP_VOICE_2_ARREST_1 - SFX_COP_VOICE_1_ARREST_1) * (m_sQueueSample.m_nEntityIndex % 5) + sfx;
-}
-
-uint32
-cAudioManager::GetSwatTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	PedState pedState;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ARREST_SWAT:
-		GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
-		break;
-	case SOUND_PED_PURSUIT_SWAT:
-		pedState = FindPlayerPed()->m_nPedState;
-		if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, SFX_SWAT_VOICE_1_CHASE_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return (SFX_SWAT_VOICE_2_CHASE_1 - SFX_SWAT_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 4) + sfx;
-}
-
-uint32
-cAudioManager::GetFBITalkSfx(int16 sound)
-{
-	uint32 sfx;
-	PedState pedState;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ARREST_FBI:
-		GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
-		break;
-	case SOUND_PED_PURSUIT_FBI:
-		pedState = FindPlayerPed()->m_nPedState;
-		if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, SFX_FBI_VOICE_1_CHASE_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return (SFX_FBI_VOICE_2_CHASE_1 - SFX_FBI_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
-}
-
-uint32
-cAudioManager::GetArmyTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	PedState pedState;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_PURSUIT_ARMY:
-		pedState = FindPlayerPed()->m_nPedState;
-		if (pedState == PED_ARRESTED || pedState == PED_DEAD || pedState == PED_DIE)
-			return NO_SAMPLE;
-		GetPhrase(&sfx, &lastSfx, SFX_ARMY_VOICE_1_CHASE_1, 15);
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return (SFX_ARMY_VOICE_2_CHASE_1 - SFX_ARMY_VOICE_1_CHASE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetMedicTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_GUN_PANIC_1, 5);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_CARJACKED_1, 5);
-		break;
-	case SOUND_PED_HEALING:
-		GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_AT_VICTIM_1, 12);
-		break;
-	case SOUND_PED_LEAVE_VEHICLE:
-		GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_1, 9);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_MEDIC_VOICE_2_GUN_PANIC_1 - SFX_MEDIC_VOICE_1_GUN_PANIC_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetFiremanTalkSfx(int16 sound)
-{
-	return GetGenericMaleTalkSfx(sound);
-}
-
-uint32
-cAudioManager::GetNormalMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_GUN_PANIC_1, 7);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_CARJACKED_1, 7);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_DODGE_1, 9);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_RUN_FROM_FIGHT_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_DRIVER_ABUSE_1, 12);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_EYING_1, 8);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_SHOCKED_1, 10);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_NORMAL_MALE_CHAT_1, 25);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetTaxiDriverTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1, 7);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return (SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_1 - SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetPimpTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_GUN_COOL_1, 7);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_CARJACKED_1, 4);
-		break;
-	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_FIGHT_1, 9);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_PIMP_CHAT_1, 17);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetMafiaTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_MAFIA_MALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 3) + sfx;
-}
-
-uint32
-cAudioManager::GetTriadTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_GUN_COOL_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_TRIAD_MALE_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetDiabloTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_GUN_COOL_1, 4);
-		break;
-	case SOUND_PED_HANDS_COWER:
-		sound = SOUND_PED_FLEE_SPRINT;
-		return GetGenericMaleTalkSfx(sound);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_EYING_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_DIABLO_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_DIABLO_MALE_VOICE_2_CHAT_1 - SFX_DIABLO_MALE_VOICE_1_CHAT_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetYakuzaTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_YAKUZA_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetYardieTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		sfx = SFX_YARDIE_MALE_VOICE_1_GUN_COOL_1;
-		break;
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		sfx = SFX_YARDIE_MALE_VOICE_1_CARJACKED_1;
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_EYING_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_YARDIE_MALE_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetColumbianTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_EYING_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_COLUMBIAN_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetHoodTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_GUN_COOL_1, 5);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CARJACKING_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_EYING_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_HOOD_MALE_VOICE_1_CHAT_1, 6);
-		break;
-
-	default:
-		return GetGenericMaleTalkSfx(sound);
-		break;
-	}
-	return (SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetBlackCriminalTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_1, 4);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		sfx = SFX_BLACK_CRIMINAL_VOICE_1_CARJACKING_1;
-		break;
-	case SOUND_PED_MUGGING:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-		break;
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteCriminalTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKING:
-		sfx = SFX_WHITE_CRIMINAL_VOICE_1_CARJACKING_1;
-		break;
-	case SOUND_PED_MUGGING:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-		break;
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetMaleNo2TalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_1, 3);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_1, 4);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_EYING_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackProjectMaleTalkSfx(int16 sound, int32 model)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_1, 6);
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	if (model == MI_P_MAN2)
-		sfx += (SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_1);
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteFatMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_1, 3);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_DODGE_1, 9);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_1, 9);
-		break;
-	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_LOST_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_MALE_VOICE_1_CHAT_1, 9);
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackFatMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_DODGE_1, 7);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_LOST_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_MALE_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackCasualFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_GUN_PANIC_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_1, 2);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_1_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteCasualFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		sfx = SFX_WHITE_CASUAL_FEMALE_VOICE_1_MUGGED_1;
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_1, 3);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 2);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 8);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetFemaleNo3TalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_GUN_PANIC_1, 5);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_CARJACKED_1, 3);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_FEMALE_3_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackFatFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteFatFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 8);
-		break;
-	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_1, 2);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackFemaleProstituteTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		sfx = SFX_BLACK_PROSTITUTE_VOICE_1_MUGGED_1;
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_1, 3);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_1, 8);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return (SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_1 - SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetWhiteFemaleProstituteTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_1, 3);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_SOLICIT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_1, 8);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return (SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_1 - SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetBlackProjectFemaleOldTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_1, 6);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_1, 10);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_1, 10);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackProjectFemaleYoungTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		sfx = SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CARJACKED_1;
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetChinatownMaleOldTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetChinatownMaleYoungTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_1, 2);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetChinatownFemaleOldTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		sfx = SFX_CHINATOWN_OLD_FEMALE_VOICE_1_SHOCKED_1;
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetChinatownFemaleYoungTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetLittleItalyMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return (SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetLittleItalyFemaleOldTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetLittleItalyFemaleYoungTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_1, 7);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteDockerMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackDockerMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_DOCKER_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetScumMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_GUN_PANIC_1, 5);
-		break;
-	case SOUND_PED_ROBBED:
-		sfx = SFX_SCUM_MALE_VOICE_1_MUGGED_1;
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_FIGHT_1, 10);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_WAIT_DOUBLEBACK:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_LOST_1, 3);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_EYING_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_MALE_VOICE_1_CHAT_1, 9);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetScumFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_DODGE_1, 8);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_SCUM_FEMALE_VOICE_1_CHAT_1, 13);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteWorkerMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_EYING_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackWorkerMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_1, 3);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBusinessMaleYoungTalkSfx(int16 sound, int32 model)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	if (model == MI_B_MAN3)
-		sfx += (SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_1 - SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1);
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBusinessMaleOldTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteBusinessFemaleTalkSfx(int16 sound, int32 model)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-
-	if (model == MI_B_WOM2)
-		sfx += (SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_1 - SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1);
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackBusinessFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1, 5);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetSupermodelMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_MALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetSupermodelFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_MUGGED_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_SHOCKED_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_MODEL_FEMALE_VOICE_1_CHAT_1, 8);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetStewardMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_DODGE_1, 3);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_MALE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetStewardFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_STEWARD_FEMALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return (SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_1 - SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetFanMaleTalkSfx(int16 sound, int32 model)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_FIGHT_1, 3);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_MALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	if (model == MI_FAN_MAN2)
-		sfx += (SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_1 - SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_1);
-	return sfx;
-}
-
-uint32
-cAudioManager::GetFanFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_ROBBED:
-		sfx = SFX_FOOTBALL_FEMALE_VOICE_1_MUGGED_1;
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return (SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_1 - SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_1) * (m_sQueueSample.m_nEntityIndex % 2) + sfx;
-}
-
-uint32
-cAudioManager::GetHospitalMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetHospitalFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_1, 6);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetWhiteConstructionWorkerTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		sfx = SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CARJACKED_1;
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetBlackConstructionWorkerTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_1, 3);
-		break;
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_1, 5);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_1, 5);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_1, 5);
-		break;
-	case SOUND_PED_CHAT_SEXY:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetShopperFemaleTalkSfx(int16 sound, int32 model)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_CAR_JACKED:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_CARJACKED_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_DODGE_1, 6);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1, 7);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_SHOCKED_1, 4);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_SHOPPER_VOICE_1_CHAT_1, 7);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-
-	if (model == MI_SHOPPER2) {
-		sfx += (SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_1 - SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1);
-	} else if (model == MI_SHOPPER3) {
-		sfx += (SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_1 - SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetStudentMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_SHOCKED_1, 3);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_MALE_VOICE_1_CHAT_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetStudentFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_COWER:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_DODGE_1, 4);
-		break;
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_1, 4);
-		break;
-	case SOUND_PED_CHAT_EVENT:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_1, 2);
-		break;
-	case SOUND_PED_CHAT:
-		GetPhrase(&sfx, &lastSfx, SFX_STUDENT_FEMALE_VOICE_1_CHAT_1, 4);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetCasualMaleOldTalkSfx(int16 sound)
-{
-	return GetGenericMaleTalkSfx(sound);
-}
-
-uint32
-cAudioManager::GetSpecialCharacterTalkSfx(int32 modelIndex, int32 sound)
-{
-	char *modelName = CModelInfo::GetModelInfo(modelIndex)->GetName();
-	if (!CGeneral::faststricmp(modelName, "eight") || !CGeneral::faststricmp(modelName, "eight2")) {
-		return GetEightTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "frankie")) {
-		return GetFrankieTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "misty")) {
-		return GetMistyTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "ojg") || !CGeneral::faststricmp(modelName, "ojg_p")) {
-		return GetOJGTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "cat")) {
-		return GetCatatalinaTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "bomber")) {
-		return GetBomberTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "s_guard")) {
-		return GetSecurityGuardTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "chunky")) {
-		return GetChunkyTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "asuka")) {
-		return GetGenericFemaleTalkSfx(sound);
-	}
-	if (!CGeneral::faststricmp(modelName, "maria")) {
-		return GetGenericFemaleTalkSfx(sound);
-	}
-
-	return GetGenericMaleTalkSfx(sound);
-}
-uint32
-cAudioManager::GetEightTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_8BALL_GUN_COOL_1, 2);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_8BALL_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_8BALL_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_8BALL_DODGE_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetFrankieTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_GUN_COOL_1, 4);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_FIGHT_1, 6);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_SALVATORE_DODGE_1, 3);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetMistyTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_MISTY_GUN_COOL_1, 5);
-		break;
-	case SOUND_PED_ROBBED:
-		GetPhrase(&sfx, &lastSfx, SFX_MISTY_MUGGED_1, 2);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_MISTY_FIGHT_1, 4);
-		break;
-	case SOUND_PED_EVADE:
-		GetPhrase(&sfx, &lastSfx, SFX_MISTY_DODGE_1, 5);
-		break;
-	case SOUND_PED_TAXI_CALL:
-		GetPhrase(&sfx, &lastSfx, SFX_MISTY_HERE_1, 4);
-		break;
-	default:
-		return GetGenericFemaleTalkSfx(sound);
-		break;
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetOJGTalkSfx(int16 sound)
-{
-	return GetGenericMaleTalkSfx(sound);
-}
-
-uint32
-cAudioManager::GetCatatalinaTalkSfx(int16 sound)
-{
-	return GetGenericFemaleTalkSfx(sound);
-}
-
-uint32
-cAudioManager::GetBomberTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound)
-	{
-	case SOUND_PED_BOMBER:
-		GetPhrase(&sfx, &lastSfx, SFX_BOMBERMAN_1, 7);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetSecurityGuardTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_HANDS_UP:
-		GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_1, 2);
-		break;
-	case SOUND_PED_HANDS_COWER:
-		sfx = SFX_SECURITY_GUARD_VOICE_1_GUN_PANIC_1;
-		break;
-	case SOUND_PED_CAR_JACKED:
-	case SOUND_PED_CAR_COLLISION:
-		GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1, 6);
-		break;
-	case SOUND_PED_ATTACK:
-		GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_FIGHT_1, 2);
-		break;
-	case SOUND_PED_FLEE_RUN:
-#ifdef FIX_BUGS
-		sfx = SFX_SECURITY_GUARD_VOICE_1_RUN_FROM_FIGHT_1;
-#else
-		GetPhrase(&sfx, &lastSfx, SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1, 12);
-#endif
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetChunkyTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound)
-	{
-	case SOUND_PED_DEATH:
-		return SFX_CHUNKY_DEATH;
-	case SOUND_PED_FLEE_RUN:
-		GetPhrase(&sfx, &lastSfx, SFX_CHUNKY_RUN_1, 5);
-		break;
-	default:
-		return GetGenericMaleTalkSfx(sound);
-	}
-
-	return sfx;
-}
-
-uint32
-cAudioManager::GetGenericMaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_DEATH:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_DEATH_1, 8);
-		break;
-	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_GRUNT_1, 15);
-		break;
-	case SOUND_PED_BURNING:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_FIRE_1, 8);
-		break;
-	case SOUND_PED_FLEE_SPRINT:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_MALE_PANIC_1, 6);
-		break;
-	default:
-		return NO_SAMPLE;
-	}
-	return sfx;
-}
-
-uint32
-cAudioManager::GetGenericFemaleTalkSfx(int16 sound)
-{
-	uint32 sfx;
-	static uint32 lastSfx = NO_SAMPLE;
-
-	switch (sound) {
-	case SOUND_PED_DEATH:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_DEATH_1, 10);
-		break;
-	case SOUND_PED_BULLET_HIT:
-	case SOUND_PED_DEFEND:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_GRUNT_1, 11);
-		break;
-	case SOUND_PED_BURNING:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_FIRE_1, 9);
-		break;
-	case SOUND_PED_FLEE_SPRINT:
-		GetPhrase(&sfx, &lastSfx, SFX_GENERIC_FEMALE_PANIC_1, 8);
-		break;
-	default:
-		return NO_SAMPLE;
-	}
-	return sfx;
-}
-
+// TODO: all the ped comment funcs should follow here
 void
 cPedComments::Add(tPedComment *com)
 {
@@ -6298,11 +3958,11 @@ cPedComments::Process()
 		AudioManager.m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
 		AudioManager.m_sQueueSample.m_fSpeedMultiplier = 3.0f;
 		switch (sampleIndex) {
-		case SFX_POLICE_HELI_1:
-		case SFX_POLICE_HELI_2:
-		case SFX_POLICE_HELI_3:
-			AudioManager.m_sQueueSample.m_fSoundIntensity = 400.0f;
-			break;
+		//case SFX_POLICE_HELI_1:
+		//case SFX_POLICE_HELI_2:
+		//case SFX_POLICE_HELI_3:
+		//	AudioManager.m_sQueueSample.m_fSoundIntensity = 400.0f;
+		//	break;
 		default:
 			AudioManager.m_sQueueSample.m_fSoundIntensity = 50.0f;
 			break;
@@ -6310,10 +3970,10 @@ cPedComments::Process()
 		AudioManager.m_sQueueSample.m_bReleasingSoundFlag = true;
 		AudioManager.m_sQueueSample.m_vecPos = m_asPedComments[m_nActiveBank][m_nIndexMap[m_nActiveBank][0]].m_vecPos;
 
-		if (sampleIndex >= SFX_AMMU_D && sampleIndex <= SFX_AMMU_F) {
+		/*if (sampleIndex >= SFX_AMMU_D && sampleIndex <= SFX_AMMU_F) {
 			AudioManager.m_sQueueSample.m_bReverbFlag = false;
 			AudioManager.m_sQueueSample.m_bRequireReflection = false;
-		} else {
+		} else*/ {
 			AudioManager.m_sQueueSample.m_bReverbFlag = true;
 			AudioManager.m_sQueueSample.m_bRequireReflection = true;
 		}
@@ -6602,6 +4262,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_bIs2D = false;
 		emittingVolume = m_anRandomTable[2] % 20 + 90;
 		break;
+	/*
 	case SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_1:
 	case SCRIPT_SOUND_TRAIN_ANNOUNCEMENT_2:
 		if (!SampleManager.IsSampleBankLoaded(SAMPLEBANK_TRAIN))
@@ -6614,7 +4275,7 @@ cAudioManager::ProcessOneShotScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeModificator = 0;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 		m_sQueueSample.m_bIs2D = false;
-		break;
+		break;*/
 	case SCRIPT_SOUND_PAYPHONE_RINGING:
 		m_sQueueSample.m_fSoundIntensity = 80.0f;
 		m_sQueueSample.m_nSampleIndex = SFX_PHONE_RING;
@@ -6882,368 +4543,6 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 		break;
-	case SCRIPT_SOUND_PARTY_5_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_5;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_5;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_5);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_5_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_5;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_5;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_5);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_6_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_6;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_6;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_6);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_6_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_6;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_6;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_6);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_7_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_7;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_7;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_7);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_7_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_7;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_7;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_7);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_8_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_8;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_8;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_8);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_8_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_8;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_8;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_8);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_9_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_9;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_9;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_9);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_9_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_9;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_9;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_9);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_10_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_10;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_10;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_10);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_10_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_10;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_10;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_10);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_11_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_11;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_11;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_11);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_11_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_11;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_11;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_11);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_12_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_12;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_12;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_12);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_12_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_12;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_12;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_12);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_13_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_RAGGA;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_RAGGA;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_RAGGA);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_PARTY_13_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_CLUB_RAGGA;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CLUB_RAGGA;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_CLUB_RAGGA);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_STRIP_CLUB_1;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_STRIP_CLUB_1;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_2;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_STRIP_CLUB_2;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_2);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_STRIP_CLUB_2;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_STRIP_CLUB_2;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_STRIP_CLUB_2);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_WORK_SHOP_LOOP_S:
-	case SCRIPT_SOUND_WORK_SHOP_LOOP_L:
-		ProcessWorkShopScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_SAWMILL_LOOP_S:
-	case SCRIPT_SOUND_SAWMILL_LOOP_L:
-		ProcessSawMillScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_38:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_DOG_FOOD_FACTORY;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_DOG_FOOD_FACTORY;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOG_FOOD_FACTORY);
-		m_sQueueSample.m_nReleasingVolumeModificator = 6;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_39:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_DOG_FOOD_FACTORY;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_DOG_FOOD_FACTORY;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOG_FOOD_FACTORY);
-		m_sQueueSample.m_nReleasingVolumeModificator = 6;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_LAUNDERETTE_LOOP_S:
-	case SCRIPT_SOUND_LAUNDERETTE_LOOP_L:
-		ProcessLaunderetteScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_CHINATOWN_RESTAURANT_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_CHINATOWN;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_CHINATOWN;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_CHINATOWN);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_CHINATOWN_RESTAURANT_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_CHINATOWN;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_CHINATOWN;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_CHINATOWN);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_CIPRIANI_RESAURANT_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_ITALY;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_ITALY;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_ITALY);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_CIPRIANI_RESAURANT_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_ITALY;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_ITALY;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_ITALY);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_46_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_1;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_47_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_1;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_MARCO_BISTRO_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_2;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_2;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_2);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_MARCO_BISTRO_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RESTAURANT_GENERIC_2;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RESTAURANT_GENERIC_2;
-		emittingVolume = 110;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RESTAURANT_GENERIC_2);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_AIRPORT_LOOP_S:
-	case SCRIPT_SOUND_AIRPORT_LOOP_L:
-		ProcessAirportScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_SHOP_LOOP_S:
-	case SCRIPT_SOUND_SHOP_LOOP_L:
-		ProcessShopScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_CINEMA_LOOP_S:
-	case SCRIPT_SOUND_CINEMA_LOOP_L:
-		ProcessCinemaScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_DOCKS_LOOP_S:
-	case SCRIPT_SOUND_DOCKS_LOOP_L:
-		ProcessDocksScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_HOME_LOOP_S:
-	case SCRIPT_SOUND_HOME_LOOP_L:
-		ProcessHomeScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_FRANKIE_PIANO:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_PIANO_BAR_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PIANO_BAR;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_PIANO_BAR_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
 	case SCRIPT_SOUND_PARTY_1_LOOP:
 		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
 		m_sQueueSample.m_nSampleIndex = SFX_CLUB_1;
@@ -7254,122 +4553,6 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		m_sQueueSample.m_nReleasingVolumeDivider = 3;
 		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
 		break;
-	case SCRIPT_SOUND_PORN_CINEMA_1_S:
-	case SCRIPT_SOUND_PORN_CINEMA_1_L:
-	case SCRIPT_SOUND_PORN_CINEMA_2_S:
-	case SCRIPT_SOUND_PORN_CINEMA_2_L:
-	case SCRIPT_SOUND_PORN_CINEMA_3_S:
-	case SCRIPT_SOUND_PORN_CINEMA_3_L:
-	case SCRIPT_SOUND_MISTY_SEX_S:
-	case SCRIPT_SOUND_MISTY_SEX_L:
-		ProcessPornCinema(sound);
-		return;
-	case SCRIPT_SOUND_BANK_ALARM_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_BANK_ALARM_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_BANK_ALARM;
-		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BANK_ALARM_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 2;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_BANK_ALARM_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_BANK_ALARM_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_BANK_ALARM;
-		emittingVolume = 90;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_BANK_ALARM_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 2;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_POLICE_BALL_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_POLICE_BALL_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_POLICE_BALL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_BALL_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 2;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_POLICE_BALL_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_POLICE_BALL_1;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_POLICE_BALL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_POLICE_BALL_1);
-		m_sQueueSample.m_nReleasingVolumeModificator = 2;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_INDUSTRIAL;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_INDUSTRIAL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_INDUSTRIAL);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_INDUSTRIAL;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_INDUSTRIAL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_INDUSTRIAL);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S:
-	case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L:
-		ProcessPoliceCellBeatingScriptObject(sound);
-		return;
-	case SCRIPT_SOUND_RAVE_1_LOOP_S:
-	case SCRIPT_SOUND_RAVE_2_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_COMMERCIAL;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_COMMERCIAL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_RAVE_1_LOOP_L:
-	case SCRIPT_SOUND_RAVE_2_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_COMMERCIAL;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_COMMERCIAL;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_RAVE_3_LOOP_S:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_SUBURBAN;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_SUBURBAN;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_SUBURBAN);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
-	case SCRIPT_SOUND_RAVE_3_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		m_sQueueSample.m_nSampleIndex = SFX_RAVE_SUBURBAN;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_RAVE_SUBURBAN;
-		emittingVolume = MAX_VOLUME;
-		m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_RAVE_SUBURBAN);
-		m_sQueueSample.m_nReleasingVolumeModificator = 3;
-		m_sQueueSample.m_nReleasingVolumeDivider = 3;
-		m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-		break;
 	case SCRIPT_SOUND_PRETEND_FIRE_LOOP:
 		m_sQueueSample.m_fSoundIntensity = 50.0f;
 		m_sQueueSample.m_nSampleIndex = SFX_CAR_ON_FIRE;
@@ -7402,560 +4585,6 @@ cAudioManager::ProcessLoopingScriptObject(uint8 sound)
 		}
 	}
 }
-
-void
-cAudioManager::ProcessPornCinema(uint8 sound)
-{
-
-	eSfxSample sample;
-	uint32 time;
-	int32 rand;
-	float distSquared;
-
-	switch (sound) {
-	case SCRIPT_SOUND_PORN_CINEMA_1_S:
-	case SCRIPT_SOUND_MISTY_SEX_S:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_1_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_1;
-		sample = SFX_PORN_1_GROAN_1;
-		m_sQueueSample.m_fSoundIntensity = 20.0f;
-		break;
-	case SCRIPT_SOUND_PORN_CINEMA_1_L:
-	case SCRIPT_SOUND_MISTY_SEX_L:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_1_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_1;
-		sample = SFX_PORN_1_GROAN_1;
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		break;
-	case SCRIPT_SOUND_PORN_CINEMA_2_S:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_2_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_2;
-		sample = SFX_PORN_2_GROAN_1;
-		m_sQueueSample.m_fSoundIntensity = 20.0f;
-		break;
-	case SCRIPT_SOUND_PORN_CINEMA_2_L:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_2_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_2;
-		sample = SFX_PORN_2_GROAN_1;
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		break;
-	case SCRIPT_SOUND_PORN_CINEMA_3_S:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_3_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_3;
-		m_sQueueSample.m_fSoundIntensity = 20.0f;
-		sample = SFX_PORN_3_GROAN_1;
-		break;
-	case SCRIPT_SOUND_PORN_CINEMA_3_L:
-		m_sQueueSample.m_nSampleIndex = SFX_PORN_3_LOOP;
-		m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_PORN_3;
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-		sample = SFX_PORN_3_GROAN_1;
-		break;
-	default:
-		return;
-	}
-	distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		if (sound != SCRIPT_SOUND_MISTY_SEX_S && sound != SCRIPT_SOUND_MISTY_SEX_L) {
-			m_sQueueSample.m_nVolume = ComputeVolume(MAX_VOLUME, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nCounter = 0;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 0;
-				m_sQueueSample.m_bReleasingSoundFlag = false;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nEmittingVolume = MAX_VOLUME;
-				m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-			}
-		}
-
-		time = CTimer::GetTimeInMilliseconds();
-		if (time > gPornNextTime) {
-			m_sQueueSample.m_nVolume = ComputeVolume(90, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				rand = m_anRandomTable[1] & 1;
-				m_sQueueSample.m_nSampleIndex = rand + sample;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
-				m_sQueueSample.m_nCounter = rand + 1;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 6;
-				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gPornNextTime = time + 2000 + m_anRandomTable[3] % 6000;
-			}
-		}
-	}
-}
-
-void
-cAudioManager::ProcessWorkShopScriptObject(uint8 sound)
-{
-	float distSquared;
-
-	switch (sound) {
-	case SCRIPT_SOUND_WORK_SHOP_LOOP_S:
-	case SCRIPT_SOUND_WORK_SHOP_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = 20.0f;
-		break;
-	default:
-		return;
-	}
-	distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_nVolume = ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-		if (m_sQueueSample.m_nVolume != 0) {
-			m_sQueueSample.m_nSampleIndex = SFX_WORKSHOP_1;
-			m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_WORKSHOP;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_WORKSHOP_1);
-			m_sQueueSample.m_nCounter = 0;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_nReleasingVolumeModificator = 5;
-			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-			m_sQueueSample.m_nEmittingVolume = 30;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
-			AddSampleToRequestedQueue();
-		}
-	}
-}
-
-void
-cAudioManager::ProcessSawMillScriptObject(uint8 sound)
-{
-
-	uint32 time;
-	float distSquared;
-
-	switch (sound) {
-	case SCRIPT_SOUND_SAWMILL_LOOP_S:
-	case SCRIPT_SOUND_SAWMILL_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		break;
-	default:
-		return;
-	}
-	distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_nVolume = ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-		if (m_sQueueSample.m_nVolume != 0) {
-			m_sQueueSample.m_nSampleIndex = SFX_SAWMILL_LOOP;
-			m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_SAWMILL;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SAWMILL_LOOP);
-			m_sQueueSample.m_nCounter = 0;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_nReleasingVolumeModificator = 5;
-			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-			m_sQueueSample.m_nEmittingVolume = 30;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
-			AddSampleToRequestedQueue();
-		}
-		time = CTimer::GetTimeInMilliseconds();
-		if (time > gSawMillNextTime) {
-			m_sQueueSample.m_nVolume = ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nSampleIndex = SFX_SAWMILL_CUT_WOOD;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_SAWMILL;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nCounter = 1;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gSawMillNextTime = time + 2000 + m_anRandomTable[3] % 4000;
-			}
-		}
-	}
-}
-
-void
-cAudioManager::ProcessLaunderetteScriptObject(uint8 sound)
-{
-	switch (sound) {
-	case SCRIPT_SOUND_LAUNDERETTE_LOOP_S:
-	case SCRIPT_SOUND_LAUNDERETTE_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		break;
-	default:
-		return;
-	}
-	float distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_nVolume = ComputeVolume(45, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-		if (m_sQueueSample.m_nVolume != 0) {
-			m_sQueueSample.m_nSampleIndex = SFX_LAUNDERETTE_LOOP;
-			m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_LAUNDERETTE;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_LAUNDERETTE_LOOP);
-			m_sQueueSample.m_nCounter = 0;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_nReleasingVolumeModificator = 5;
-			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-			m_sQueueSample.m_nEmittingVolume = 45;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
-			AddSampleToRequestedQueue();
-		}
-		m_sQueueSample.m_nVolume = ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-		if (m_sQueueSample.m_nVolume != 0) {
-			m_sQueueSample.m_nSampleIndex = SFX_LAUNDERETTE_SONG_LOOP;
-			m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_LAUNDERETTE;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_LAUNDERETTE_SONG_LOOP);
-			m_sQueueSample.m_nCounter = 1;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_nReleasingVolumeModificator = 3;
-			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-			m_sQueueSample.m_nEmittingVolume = 110;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
-			AddSampleToRequestedQueue();
-		}
-	}
-}
-
-void
-cAudioManager::ProcessShopScriptObject(uint8 sound)
-{
-	uint32 time;
-	int32 rand;
-	float distSquared;
-
-	switch (sound) {
-	case SCRIPT_SOUND_SHOP_LOOP_S:
-	case SCRIPT_SOUND_SHOP_LOOP_L:
-		m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-		break;
-	default:
-		return;
-	}
-	distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-	if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-		m_sQueueSample.m_fDistance = Sqrt(distSquared);
-		m_sQueueSample.m_nVolume = ComputeVolume(30, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-		if (m_sQueueSample.m_nVolume != 0) {
-			m_sQueueSample.m_nSampleIndex = SFX_SHOP_LOOP;
-			m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_SHOP;
-			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_SHOP_LOOP);
-			m_sQueueSample.m_nCounter = 0;
-			m_sQueueSample.m_bIs2D = false;
-			m_sQueueSample.m_nLoopCount = 0;
-			m_sQueueSample.m_bReleasingSoundFlag = false;
-			m_sQueueSample.m_nReleasingVolumeModificator = 5;
-			m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-			m_sQueueSample.m_nEmittingVolume = 30;
-			m_sQueueSample.m_nLoopStart = SampleManager.GetSampleLoopStartOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_nLoopEnd = SampleManager.GetSampleLoopEndOffset(m_sQueueSample.m_nSampleIndex);
-			m_sQueueSample.m_bReverbFlag = true;
-			m_sQueueSample.m_bRequireReflection = false;
-			AddSampleToRequestedQueue();
-		}
-		time = CTimer::GetTimeInMilliseconds();
-		if (time > gShopNextTime) {
-			m_sQueueSample.m_nVolume = ComputeVolume(70, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				rand = m_anRandomTable[1] & 1;
-				m_sQueueSample.m_nSampleIndex = rand + SFX_SHOP_TILL_1;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_SHOP;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nCounter = rand + 1;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nEmittingVolume = 70;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gShopNextTime = time + 3000 + m_anRandomTable[3] % 7000;
-			}
-		}
-	}
-}
-
-void
-cAudioManager::ProcessAirportScriptObject(uint8 sound)
-{
-	static uint8 iSound = 0;
-
-	uint32 time = CTimer::GetTimeInMilliseconds();
-	if (time > gAirportNextTime) {
-		switch (sound) {
-		case SCRIPT_SOUND_AIRPORT_LOOP_S:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-			break;
-		case SCRIPT_SOUND_AIRPORT_LOOP_L:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-			break;
-		default:
-			return;
-		}
-		float distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-			m_sQueueSample.m_fDistance = Sqrt(distSquared);
-			m_sQueueSample.m_nVolume = ComputeVolume(110, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nSampleIndex = (m_anRandomTable[1] & 3) + SFX_AIRPORT_ANNOUNCEMENT_1;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_AIRPORT;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nCounter = iSound++;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nEmittingVolume = 110;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gAirportNextTime = time + 10000 + m_anRandomTable[3] % 20000;
-			}
-		}
-	}
-}
-
-void
-cAudioManager::ProcessCinemaScriptObject(uint8 sound)
-{
-	uint8 rand;
-
-	static uint8 iSound = 0;
-
-	uint32 time = CTimer::GetTimeInMilliseconds();
-	if (time > gCinemaNextTime) {
-		switch (sound) {
-		case SCRIPT_SOUND_CINEMA_LOOP_S:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-			break;
-		case SCRIPT_SOUND_CINEMA_LOOP_L:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-			break;
-		default:
-			return;
-		}
-		float distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-			m_sQueueSample.m_fDistance = Sqrt(distSquared);
-			rand = m_anRandomTable[0] % 90 + 30;
-			m_sQueueSample.m_nVolume = ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nSampleIndex = iSound % 3 + SFX_CINEMA_BASS_1;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_CINEMA;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 4);
-				m_sQueueSample.m_nCounter = iSound++;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nEmittingVolume = rand;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gCinemaNextTime = time + 1000 + m_anRandomTable[3] % 4000;
-			}
-		}
-	}
-}
-
-void
-cAudioManager::ProcessDocksScriptObject(uint8 sound)
-{
-	uint32 time;
-	uint8 rand;
-	float distSquared;
-
-	static uint8 iSound = 0;
-
-	time = CTimer::GetTimeInMilliseconds();
-	if (time > gDocksNextTime) {
-		switch (sound) {
-		case SCRIPT_SOUND_DOCKS_LOOP_S:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-			break;
-		case SCRIPT_SOUND_DOCKS_LOOP_L:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-			break;
-		default:
-			return;
-		}
-		distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-			m_sQueueSample.m_fDistance = Sqrt(distSquared);
-			rand = m_anRandomTable[0] % 60 + 40;
-			m_sQueueSample.m_nVolume = ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nSampleIndex = SFX_DOCKS_FOGHORN;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_DOCKS;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(SFX_DOCKS_FOGHORN);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 8);
-				m_sQueueSample.m_nCounter = iSound++;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 2.0f;
-				m_sQueueSample.m_nEmittingVolume = rand;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				gDocksNextTime = time + 10000 + m_anRandomTable[3] % 40000;
-			}
-		}
-	}
-}
-void
-cAudioManager::ProcessHomeScriptObject(uint8 sound)
-{
-	uint32 time;
-	uint8 rand;
-	float dist;
-
-	static uint8 iSound = 0;
-
-	time = CTimer::GetTimeInMilliseconds();
-	if (time > gHomeNextTime) {
-		switch (sound) {
-		case SCRIPT_SOUND_HOME_LOOP_S:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-			break;
-		case SCRIPT_SOUND_HOME_LOOP_L:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-			break;
-		default:
-			return;
-		}
-		dist = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (dist < SQR(m_sQueueSample.m_fSoundIntensity)) {
-			m_sQueueSample.m_fDistance = Sqrt(dist);
-			rand = m_anRandomTable[0] % 30 + 40;
-			m_sQueueSample.m_nVolume = ComputeVolume(rand, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 5 + SFX_HOME_1;
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_BUILDING_HOME;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
-				m_sQueueSample.m_nCounter = iSound++;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-				m_sQueueSample.m_nEmittingVolume = rand;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = true;
-				AddSampleToRequestedQueue();
-				gHomeNextTime = time + 1000 + m_anRandomTable[3] % 4000;
-			}
-		}
-	}
-}
-void
-cAudioManager::ProcessPoliceCellBeatingScriptObject(uint8 sound)
-{
-	uint32 time = CTimer::GetTimeInMilliseconds();
-	int32 sampleIndex;
-	uint8 emittingVol;
-	float distSquared;
-	cPedParams params;
-
-	static uint8 iSound = 0;
-
-	if (time > gCellNextTime) {
-		switch (sound) {
-		case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_S;
-			break;
-		case SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L:
-			m_sQueueSample.m_fSoundIntensity = SCRIPT_OBJECT_INTENSITY_L;
-			break;
-		default:
-			return;
-		}
-		distSquared = GetDistanceSquared(m_sQueueSample.m_vecPos);
-		if (distSquared < SQR(m_sQueueSample.m_fSoundIntensity)) {
-			m_sQueueSample.m_fDistance = Sqrt(distSquared);
-			if (m_FrameCounter & 1)
-				sampleIndex = (m_anRandomTable[1] & 3) + SFX_FIGHT_1;
-			else
-				sampleIndex = (m_anRandomTable[3] & 1) + SFX_BAT_HIT_LEFT;
-			m_sQueueSample.m_nSampleIndex = sampleIndex;
-			emittingVol = m_anRandomTable[0] % 50 + 55;
-			m_sQueueSample.m_nVolume = ComputeVolume(emittingVol, m_sQueueSample.m_fSoundIntensity, m_sQueueSample.m_fDistance);
-			if (m_sQueueSample.m_nVolume != 0) {
-				m_sQueueSample.m_nBankIndex = SAMPLEBANK_MAIN;
-				m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
-				m_sQueueSample.m_nFrequency += RandomDisplacement(m_sQueueSample.m_nFrequency / 16);
-				m_sQueueSample.m_nCounter = iSound++;
-				m_sQueueSample.m_bIs2D = false;
-				m_sQueueSample.m_nLoopCount = 1;
-				m_sQueueSample.m_bReleasingSoundFlag = true;
-				m_sQueueSample.m_nReleasingVolumeModificator = 3;
-				m_sQueueSample.m_fSpeedMultiplier = 0.0f;
-				m_sQueueSample.m_nEmittingVolume = emittingVol;
-				m_sQueueSample.m_nLoopStart = 0;
-				m_sQueueSample.m_nLoopEnd = -1;
-				m_sQueueSample.m_bReverbFlag = true;
-				m_sQueueSample.m_bRequireReflection = false;
-				AddSampleToRequestedQueue();
-				params.m_bDistanceCalculated = true;
-				params.m_fDistance = distSquared;
-				params.m_pPed = nil;
-				SetupPedComments(&params, SOUND_INJURED_PED_MALE_PRISON);
-			}
-			gCellNextTime = time + 500 + m_anRandomTable[3] % 1500;
-		}
-	}
-}
 #pragma endregion All the code for script object audio on the map
 
 void
@@ -8040,54 +4669,53 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM:
 			m_sQueueSample.m_nSampleIndex = SFX_ERROR_FIRE_ROCKET_LAUNCHER;
 			break;
-		case SOUND_GARAGE_NO_MONEY:
-		case SOUND_GARAGE_BAD_VEHICLE:
-		case SOUND_GARAGE_BOMB_ALREADY_SET:
-			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
-			stereo = true;
-			break;
-		case SOUND_GARAGE_OPENING:
-		case SOUND_GARAGE_BOMB1_SET:
-		case SOUND_GARAGE_BOMB2_SET:
-		case SOUND_GARAGE_BOMB3_SET:
-		case SOUND_41:
-		case SOUND_GARAGE_VEHICLE_DECLINED:
-		case SOUND_GARAGE_VEHICLE_ACCEPTED:
-		case SOUND_PICKUP_HEALTH:
-		case SOUND_4B:
-		case SOUND_PICKUP_ADRENALINE:
-		case SOUND_PICKUP_ARMOUR:
-		case SOUND_EVIDENCE_PICKUP:
-		case SOUND_UNLOAD_GOLD:
-			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_2_LEFT;
-			processedPickup = true;
-			stereo = true;
-			break;
-		case SOUND_PICKUP_WEAPON_BOUGHT:
-		case SOUND_PICKUP_WEAPON:
-			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_1_LEFT;
-			processedPickup = true;
-			stereo = true;
-			break;
-		case SOUND_PICKUP_ERROR:
-			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
-			processedPickup = true;
-			stereo = true;
-			break;
-		case SOUND_PICKUP_BONUS:
-		case SOUND_PICKUP_MONEY:
-		case SOUND_PICKUP_HIDDEN_PACKAGE:
-		case SOUND_PICKUP_PACMAN_PILL:
-		case SOUND_PICKUP_PACMAN_PACKAGE:
-		case SOUND_PICKUP_FLOAT_PACKAGE:
-			m_sQueueSample.m_nSampleIndex = SFX_PICKUP_3_LEFT;
-			processedPickup = true;
-			stereo = true;
-			break;
-		case SOUND_PAGER:
-			// TODO: ps2 code
-			m_sQueueSample.m_nSampleIndex = SFX_PAGER;
-			break;
+		//case SOUND_GARAGE_NO_MONEY:
+		//case SOUND_GARAGE_BAD_VEHICLE:
+		//case SOUND_GARAGE_BOMB_ALREADY_SET:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
+		//	stereo = true;
+		//	break;
+		//case SOUND_GARAGE_OPENING:
+		//case SOUND_GARAGE_BOMB1_SET:
+		//case SOUND_GARAGE_BOMB2_SET:
+		//case SOUND_GARAGE_BOMB3_SET:
+		//case SOUND_41:
+		//case SOUND_GARAGE_VEHICLE_DECLINED:
+		//case SOUND_GARAGE_VEHICLE_ACCEPTED:
+		//case SOUND_PICKUP_HEALTH:
+		//case SOUND_4B:
+		//case SOUND_PICKUP_ADRENALINE:
+		//case SOUND_PICKUP_ARMOUR:
+		//case SOUND_EVIDENCE_PICKUP:
+		//case SOUND_UNLOAD_GOLD:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PICKUP_2_LEFT;
+		//	processedPickup = true;
+		//	stereo = true;
+		//	break;
+		//case SOUND_PICKUP_WEAPON_BOUGHT:
+		//case SOUND_PICKUP_WEAPON:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PICKUP_1_LEFT;
+		//	processedPickup = true;
+		//	stereo = true;
+		//	break;
+		//case SOUND_PICKUP_ERROR:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PICKUP_ERROR_LEFT;
+		//	processedPickup = true;
+		//	stereo = true;
+		//	break;
+		//case SOUND_PICKUP_BONUS:
+		//case SOUND_PICKUP_MONEY:
+		//case SOUND_PICKUP_HIDDEN_PACKAGE:
+		//case SOUND_PICKUP_PACMAN_PILL:
+		//case SOUND_PICKUP_PACMAN_PACKAGE:
+		//case SOUND_PICKUP_FLOAT_PACKAGE:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PICKUP_3_LEFT;
+		//	processedPickup = true;
+		//	stereo = true;
+		//	break;
+		//case SOUND_PAGER:
+		//	m_sQueueSample.m_nSampleIndex = SFX_PAGER;
+		//	break;
 		case SOUND_RACE_START_3:
 		case SOUND_RACE_START_2:
 		case SOUND_RACE_START_1:
@@ -8095,51 +4723,38 @@ cAudioManager::ProcessFrontEnd()
 			m_sQueueSample.m_nSampleIndex = SFX_TIMER_BEEP;
 			break;
 		case SOUND_RACE_START_GO:
-			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE;
+			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE_LEFT;
 			break;
 		case SOUND_PART_MISSION_COMPLETE:
-			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE;
+			m_sQueueSample.m_nSampleIndex = SFX_PART_MISSION_COMPLETE_LEFT;
 			processedMission = true;
 			break;
 		case SOUND_FRONTEND_MENU_STARTING:
-			m_sQueueSample.m_nSampleIndex = SFX_START_BUTTON_LEFT;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_HIGHLIGHT_LEFT;
 			stereo = true;
 			break;
 		case SOUND_FRONTEND_MENU_NEW_PAGE:
-			m_sQueueSample.m_nSampleIndex = SFX_PAGE_CHANGE_AND_BACK_LEFT;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_HIGHLIGHT_LEFT;
 			stereo = true;
 			frontendBank = true;
-			break;
-		case SOUND_FRONTEND_MENU_NAVIGATION:
-			m_sQueueSample.m_nSampleIndex = SFX_HIGHLIGHT_LEFT;
-			stereo = true;
 			frontendBank = true;
 			break;
 		case SOUND_FRONTEND_MENU_SETTING_CHANGE:
-			m_sQueueSample.m_nSampleIndex = SFX_SELECT_LEFT;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_SELECT_LEFT;
 			stereo = true;
 			frontendBank = true;
-			break;
-		case SOUND_FRONTEND_MENU_BACK:
-			m_sQueueSample.m_nSampleIndex = SFX_SUB_MENU_BACK_LEFT;
-			stereo = true;
-			frontendBank = true;
-			break;
-		case SOUND_9A:
-			m_sQueueSample.m_nSampleIndex = SFX_STEREO_LEFT;
-			stereo = true;
 			frontendBank = true;
-			break;
-		case SOUND_9B:
-			m_sQueueSample.m_nSampleIndex = SFX_MONO;
-			frontendBank = true;
-			break;
-		case SOUND_FRONTEND_AUDIO_TEST:
-			m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 3 + SFX_NOISE_BURST_1;
 			frontendBank = true;
 			break;
+		//case SOUND_FRONTEND_EXIT:
+		//	m_sQueueSample.m_nSampleIndex = SFX_SUB_MENU_BACK_LEFT;
+		//	stereo = true;
+		//	break;
+		//case SOUND_FRONTEND_AUDIO_TEST:
+		//	m_sQueueSample.m_nSampleIndex = m_anRandomTable[0] % 3 + SFX_NOISE_BURST_1;
+		//	break;
 		case SOUND_FRONTEND_FAIL:
-			m_sQueueSample.m_nSampleIndex = SFX_ERROR_LEFT;
+			m_sQueueSample.m_nSampleIndex = SFX_FE_ERROR_LEFT;
 			frontendBank = true;
 			stereo = true;
 			break;
@@ -8147,9 +4762,9 @@ cAudioManager::ProcessFrontEnd()
 		case SOUND_FRONTEND_RADIO_CHANGE:
 			m_sQueueSample.m_nSampleIndex = SFX_RADIO_CLICK;
 			break;
-		case SOUND_HUD:
-			m_sQueueSample.m_nSampleIndex = SFX_INFO;
-			break;
+		//case SOUND_HUD_SOUND:
+		//	m_sQueueSample.m_nSampleIndex = SFX_INFO;
+		//	break;
 		default:
 			continue;
 		}
@@ -8167,11 +4782,11 @@ cAudioManager::ProcessFrontEnd()
 		sample = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_awAudioEvent[i];
 		if (sample == SFX_RAIN) {
 			m_sQueueSample.m_nFrequency = 28509;
-		} else if (sample == SFX_PICKUP_1_LEFT) {
+		/*} else if (sample == SFX_PICKUP_1_LEFT) {
 			if (m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i] == 1.0f)
 				m_sQueueSample.m_nFrequency = 32000;
 			else
-				m_sQueueSample.m_nFrequency = 48000;
+				m_sQueueSample.m_nFrequency = 48000;*/
 		} else {
 			m_sQueueSample.m_nFrequency = SampleManager.GetSampleBaseFrequency(m_sQueueSample.m_nSampleIndex);
 		}
@@ -8201,7 +4816,7 @@ cAudioManager::ProcessFrontEnd()
 	}
 }
 
-void
+/*void
 cAudioManager::ProcessCrane()
 {
 	CCrane *crane = (CCrane *)m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_pEntity;
@@ -8250,7 +4865,7 @@ cAudioManager::ProcessCrane()
 			}
 		}
 	}
-}
+}*/
 
 void
 cAudioManager::ProcessProjectiles()
@@ -8463,7 +5078,7 @@ cAudioManager::ProcessFireHydrant()
 		}
 	}
 }
-
+#ifdef GTA_BRIDGE
 #pragma region BRIDGE
 const int bridgeIntensity = 400;
 
@@ -8585,6 +5200,7 @@ cAudioManager::ProcessBridgeOneShots()
 	}
 }
 #pragma endregion
+#endif
 
 #pragma region MISSION_AUDIO
 bool g_bMissionAudioLoadFailed;
@@ -8594,41 +5210,382 @@ struct MissionAudioData {
 	int32 m_nId;
 };
 
+
 const MissionAudioData MissionAudioNameSfxAssoc[] = {
-    {"lib_a1", STREAMED_SOUND_MISSION_LIB_A1}, {"lib_a2", STREAMED_SOUND_MISSION_LIB_A2},   {"lib_a", STREAMED_SOUND_MISSION_LIB_A},
-    {"lib_b", STREAMED_SOUND_MISSION_LIB_B},   {"lib_c", STREAMED_SOUND_MISSION_LIB_C},     {"lib_d", STREAMED_SOUND_MISSION_LIB_D},
-    {"l2_a", STREAMED_SOUND_MISSION_L2_A},     {"j4t_1", STREAMED_SOUND_MISSION_J4T_1},     {"j4t_2", STREAMED_SOUND_MISSION_J4T_2},
-    {"j4t_3", STREAMED_SOUND_MISSION_J4T_3},   {"j4t_4", STREAMED_SOUND_MISSION_J4T_4},     {"j4_a", STREAMED_SOUND_MISSION_J4_A},
-    {"j4_b", STREAMED_SOUND_MISSION_J4_B},     {"j4_c", STREAMED_SOUND_MISSION_J4_C},       {"j4_d", STREAMED_SOUND_MISSION_J4_D},
-    {"j4_e", STREAMED_SOUND_MISSION_J4_E},     {"j4_f", STREAMED_SOUND_MISSION_J4_F},       {"j6_1", STREAMED_SOUND_MISSION_J6_1},
-    {"j6_a", STREAMED_SOUND_MISSION_J6_A},     {"j6_b", STREAMED_SOUND_MISSION_J6_B},       {"j6_c", STREAMED_SOUND_MISSION_J6_C},
-    {"j6_d", STREAMED_SOUND_MISSION_J6_D},     {"t4_a", STREAMED_SOUND_MISSION_T4_A},       {"s1_a", STREAMED_SOUND_MISSION_S1_A},
-    {"s1_a1", STREAMED_SOUND_MISSION_S1_A1},   {"s1_b", STREAMED_SOUND_MISSION_S1_B},       {"s1_c", STREAMED_SOUND_MISSION_S1_C},
-    {"s1_c1", STREAMED_SOUND_MISSION_S1_C1},   {"s1_d", STREAMED_SOUND_MISSION_S1_D},       {"s1_e", STREAMED_SOUND_MISSION_S1_E},
-    {"s1_f", STREAMED_SOUND_MISSION_S1_F},     {"s1_g", STREAMED_SOUND_MISSION_S1_G},       {"s1_h", STREAMED_SOUND_MISSION_S1_H},
-    {"s1_i", STREAMED_SOUND_MISSION_S1_I},     {"s1_j", STREAMED_SOUND_MISSION_S1_J},       {"s1_k", STREAMED_SOUND_MISSION_S1_K},
-    {"s1_l", STREAMED_SOUND_MISSION_S1_L},     {"s3_a", STREAMED_SOUND_MISSION_S3_A},       {"s3_b", STREAMED_SOUND_MISSION_S3_B},
-    {"el3_a", STREAMED_SOUND_MISSION_EL3_A},   {"mf1_a", STREAMED_SOUND_MISSION_MF1_A},     {"mf2_a", STREAMED_SOUND_MISSION_MF2_A},
-    {"mf3_a", STREAMED_SOUND_MISSION_MF3_A},   {"mf3_b", STREAMED_SOUND_MISSION_MF3_B},     {"mf3_b1", STREAMED_SOUND_MISSION_MF3_B1},
-    {"mf3_c", STREAMED_SOUND_MISSION_MF3_C},   {"mf4_a", STREAMED_SOUND_MISSION_MF4_A},     {"mf4_b", STREAMED_SOUND_MISSION_MF4_B},
-    {"mf4_c", STREAMED_SOUND_MISSION_MF4_C},   {"a1_a", STREAMED_SOUND_MISSION_A1_A},       {"a3_a", STREAMED_SOUND_MISSION_A3_A},
-    {"a5_a", STREAMED_SOUND_MISSION_A5_A},     {"a4_a", STREAMED_SOUND_MISSION_A4_A},       {"a4_b", STREAMED_SOUND_MISSION_A4_B},
-    {"a4_c", STREAMED_SOUND_MISSION_A4_C},     {"a4_d", STREAMED_SOUND_MISSION_A4_D},       {"k1_a", STREAMED_SOUND_MISSION_K1_A},
-    {"k3_a", STREAMED_SOUND_MISSION_K3_A},     {"r1_a", STREAMED_SOUND_MISSION_R1_A},       {"r2_a", STREAMED_SOUND_MISSION_R2_A},
-    {"r2_b", STREAMED_SOUND_MISSION_R2_B},     {"r2_c", STREAMED_SOUND_MISSION_R2_C},       {"r2_d", STREAMED_SOUND_MISSION_R2_D},
-    {"r2_e", STREAMED_SOUND_MISSION_R2_E},     {"r2_f", STREAMED_SOUND_MISSION_R2_F},       {"r2_g", STREAMED_SOUND_MISSION_R2_G},
-    {"r2_h", STREAMED_SOUND_MISSION_R2_H},     {"r5_a", STREAMED_SOUND_MISSION_R5_A},       {"r6_a", STREAMED_SOUND_MISSION_R6_A},
-    {"r6_a1", STREAMED_SOUND_MISSION_R6_A1},   {"r6_b", STREAMED_SOUND_MISSION_R6_B},       {"lo2_a", STREAMED_SOUND_MISSION_LO2_A},
-    {"lo6_a", STREAMED_SOUND_MISSION_LO6_A},   {"yd2_a", STREAMED_SOUND_MISSION_YD2_A},     {"yd2_b", STREAMED_SOUND_MISSION_YD2_B},
-    {"yd2_c", STREAMED_SOUND_MISSION_YD2_C},   {"yd2_c1", STREAMED_SOUND_MISSION_YD2_C1},   {"yd2_d", STREAMED_SOUND_MISSION_YD2_D},
-    {"yd2_e", STREAMED_SOUND_MISSION_YD2_E},   {"yd2_f", STREAMED_SOUND_MISSION_YD2_F},     {"yd2_g", STREAMED_SOUND_MISSION_YD2_G},
-    {"yd2_h", STREAMED_SOUND_MISSION_YD2_H},   {"yd2_ass", STREAMED_SOUND_MISSION_YD2_ASS}, {"yd2_ok", STREAMED_SOUND_MISSION_YD2_OK},
-    {"h5_a", STREAMED_SOUND_MISSION_H5_A},     {"h5_b", STREAMED_SOUND_MISSION_H5_B},       {"h5_c", STREAMED_SOUND_MISSION_H5_C},
-    {"ammu_a", STREAMED_SOUND_MISSION_AMMU_A}, {"ammu_b", STREAMED_SOUND_MISSION_AMMU_B},   {"ammu_c", STREAMED_SOUND_MISSION_AMMU_C},
-    {"door_1", STREAMED_SOUND_MISSION_DOOR_1}, {"door_2", STREAMED_SOUND_MISSION_DOOR_2},   {"door_3", STREAMED_SOUND_MISSION_DOOR_3},
-    {"door_4", STREAMED_SOUND_MISSION_DOOR_4}, {"door_5", STREAMED_SOUND_MISSION_DOOR_5},   {"door_6", STREAMED_SOUND_MISSION_DOOR_6},
-    {"t3_a", STREAMED_SOUND_MISSION_T3_A},     {"t3_b", STREAMED_SOUND_MISSION_T3_B},       {"t3_c", STREAMED_SOUND_MISSION_T3_C},
-    {"k1_b", STREAMED_SOUND_MISSION_K1_B},     {"c_1", STREAMED_SOUND_MISSION_CAT1},        {nil, 0}};
+	{"mobring", STREAMED_SOUND_MISSION_MOBR1},    {"pagring", STREAMED_SOUND_MISSION_PAGER},    {"carrev", STREAMED_SOUND_MISSION_CARREV},
+	{"bikerev", STREAMED_SOUND_MISSION_BIKEREV},  {"liftop", STREAMED_SOUND_MISSION_LIFTOP},    {"liftcl", STREAMED_SOUND_MISSION_LIFTCL},
+	{"liftrun", STREAMED_SOUND_MISSION_LIFTRUN},  {"liftbel", STREAMED_SOUND_MISSION_LIFTBEL},  {"inlift", STREAMED_SOUND_MISSION_INLIFT},
+	{"caml", STREAMED_SOUND_MISSION_CAMERAL},     {"camr", STREAMED_SOUND_MISSION_CAMERAR},     {"cheer1", STREAMED_SOUND_MISSION_CHEER1},
+	{"cheer2", STREAMED_SOUND_MISSION_CHEER2},    {"cheer3", STREAMED_SOUND_MISSION_CHEER3},    {"cheer4", STREAMED_SOUND_MISSION_CHEER4},
+	{"ooh1", STREAMED_SOUND_MISSION_OOH1},        {"ooh2", STREAMED_SOUND_MISSION_OOH2},        {"race1", STREAMED_SOUND_MISSION_RACE1},
+	{"race2", STREAMED_SOUND_MISSION_RACE2},      {"race3", STREAMED_SOUND_MISSION_RACE3},      {"race4", STREAMED_SOUND_MISSION_RACE4},
+	{"race5", STREAMED_SOUND_MISSION_RACE5},      {"race6", STREAMED_SOUND_MISSION_RACE6},      {"race7", STREAMED_SOUND_MISSION_RACE7},
+	{"race8", STREAMED_SOUND_MISSION_RACE8},      {"race9", STREAMED_SOUND_MISSION_RACE9},      {"race10", STREAMED_SOUND_MISSION_RACE10},
+	{"race11", STREAMED_SOUND_MISSION_RACE11},    {"race12", STREAMED_SOUND_MISSION_RACE12},    {"race13", STREAMED_SOUND_MISSION_RACE13},
+	{"race14", STREAMED_SOUND_MISSION_RACE14},    {"race15", STREAMED_SOUND_MISSION_RACE15},    {"hot1", STREAMED_SOUND_MISSION_HOT1},
+	{"hot2", STREAMED_SOUND_MISSION_HOT2},        {"hot3", STREAMED_SOUND_MISSION_HOT3},        {"hot4", STREAMED_SOUND_MISSION_HOT4},
+	{"hot5", STREAMED_SOUND_MISSION_HOT5},        {"hot6", STREAMED_SOUND_MISSION_HOT6},        {"hot7", STREAMED_SOUND_MISSION_HOT7},
+	{"hot8", STREAMED_SOUND_MISSION_HOT8},        {"hot9", STREAMED_SOUND_MISSION_HOT9},        {"hot10", STREAMED_SOUND_MISSION_HOT10},
+	{"hot11", STREAMED_SOUND_MISSION_HOT11},      {"hot12", STREAMED_SOUND_MISSION_HOT12},      {"hot13", STREAMED_SOUND_MISSION_HOT13},
+	{"hot14", STREAMED_SOUND_MISSION_HOT14},      {"hot15", STREAMED_SOUND_MISSION_HOT15},      {"lanstp1", STREAMED_SOUND_MISSION_LANSTP1},
+	{"lanstp2", STREAMED_SOUND_MISSION_LANSTP2},  {"lanamu1", STREAMED_SOUND_MISSION_LANAMU1},  {"lanamu2", STREAMED_SOUND_MISSION_LANAMU2},
+	{"airhrnl", STREAMED_SOUND_MISSION_AIRHORNL}, {"airhrnr", STREAMED_SOUND_MISSION_AIRHORNR}, {"sniper", STREAMED_SOUND_MISSION_SNIPSCRL},
+	{"snipsh", STREAMED_SOUND_MISSION_SNIPSHORT}, {"bloroof", STREAMED_SOUND_MISSION_BLOWROOF}, {"sfx_01", STREAMED_SOUND_MISSION_SFX_01},
+	{"sfx_02", STREAMED_SOUND_MISSION_SFX_02},    {"LAW1_1", STREAMED_SOUND_MISSION_LAW1_1},    {"LAW1_2", STREAMED_SOUND_MISSION_LAW1_2},
+	{"LAW1_3", STREAMED_SOUND_MISSION_LAW1_3},    {"LAW1_4", STREAMED_SOUND_MISSION_LAW1_4},    {"LAW1_5", STREAMED_SOUND_MISSION_LAW1_5},
+	{"LAW1_6", STREAMED_SOUND_MISSION_LAW1_6},    {"LAW1_7", STREAMED_SOUND_MISSION_LAW1_7},    {"LAW1_8", STREAMED_SOUND_MISSION_LAW1_8},
+	{"LAW1_9", STREAMED_SOUND_MISSION_LAW1_9},    {"LAW1_10", STREAMED_SOUND_MISSION_LAW1_10},  {"LAW2_1", STREAMED_SOUND_MISSION_LAW2_1},
+	{"LAW2_2", STREAMED_SOUND_MISSION_LAW2_2},    {"LAW2_3", STREAMED_SOUND_MISSION_LAW2_3},    {"LAW2_4", STREAMED_SOUND_MISSION_LAW2_4},
+	{"LAW2_5", STREAMED_SOUND_MISSION_LAW2_5},    {"LAW2_6", STREAMED_SOUND_MISSION_LAW2_6},    {"LAW2_7", STREAMED_SOUND_MISSION_LAW2_7},
+	{"LAW2_8", STREAMED_SOUND_MISSION_LAW2_8},    {"LAW2_9", STREAMED_SOUND_MISSION_LAW2_9},    {"LAW2_10", STREAMED_SOUND_MISSION_LAW2_10},
+	{"LAW3_1", STREAMED_SOUND_MISSION_LAW3_1},    {"LAW3_2", STREAMED_SOUND_MISSION_LAW3_2},    {"LAW3_3", STREAMED_SOUND_MISSION_LAW3_3},
+	{"LAW3_4", STREAMED_SOUND_MISSION_LAW3_4},    {"LAW3_5", STREAMED_SOUND_MISSION_LAW3_5},    {"LAW3_6", STREAMED_SOUND_MISSION_LAW3_6},
+	{"LAW3_10", STREAMED_SOUND_MISSION_LAW3_10},  {"LAW3_11", STREAMED_SOUND_MISSION_LAW3_11},  {"LAW3_12", STREAMED_SOUND_MISSION_LAW3_12},
+	{"LAW3_13", STREAMED_SOUND_MISSION_LAW3_13},  {"LAW3_14", STREAMED_SOUND_MISSION_LAW3_14},  {"LAW3_16", STREAMED_SOUND_MISSION_LAW3_16},
+	{"LAW3_17", STREAMED_SOUND_MISSION_LAW3_17},  {"LAW3_18", STREAMED_SOUND_MISSION_LAW3_18},  {"LAW3_19", STREAMED_SOUND_MISSION_LAW3_19},
+	{"LAW3_20", STREAMED_SOUND_MISSION_LAW3_20},  {"LAW3_21", STREAMED_SOUND_MISSION_LAW3_21},  {"LAW3_22", STREAMED_SOUND_MISSION_LAW3_22},
+	{"LAW3_23", STREAMED_SOUND_MISSION_LAW3_23},  {"LAW3_24", STREAMED_SOUND_MISSION_LAW3_24},  {"LAW3_25", STREAMED_SOUND_MISSION_LAW3_25},
+	{"LAW4_1a", STREAMED_SOUND_MISSION_LAW4_1A},  {"LAW4_1b", STREAMED_SOUND_MISSION_LAW4_1B},  {"LAW4_1c", STREAMED_SOUND_MISSION_LAW4_1C},
+	{"LAW4_1d", STREAMED_SOUND_MISSION_LAW4_1D},  {"LAW4_10", STREAMED_SOUND_MISSION_LAW4_10},  {"LAW4_3", STREAMED_SOUND_MISSION_LAW4_3},
+	{"LAW4_4", STREAMED_SOUND_MISSION_LAW4_4},    {"LAW4_5", STREAMED_SOUND_MISSION_LAW4_5},    {"LAW4_6", STREAMED_SOUND_MISSION_LAW4_6},
+	{"LAW4_7", STREAMED_SOUND_MISSION_LAW4_7},    {"LAW4_8", STREAMED_SOUND_MISSION_LAW4_8},    {"LAW4_9", STREAMED_SOUND_MISSION_LAW4_9},
+	{"COL1_1", STREAMED_SOUND_MISSION_COL1_1},    {"COL1_2", STREAMED_SOUND_MISSION_COL1_2},    {"COL1_3", STREAMED_SOUND_MISSION_COL1_3},
+	{"COL1_4", STREAMED_SOUND_MISSION_COL1_4},    {"COL1_5", STREAMED_SOUND_MISSION_COL1_5},    {"COL1_6", STREAMED_SOUND_MISSION_COL1_6},
+	{"COL1_7", STREAMED_SOUND_MISSION_COL1_7},    {"COL1_8", STREAMED_SOUND_MISSION_COL1_8},    {"COL2_1", STREAMED_SOUND_MISSION_COL2_1},
+	{"COL2_2", STREAMED_SOUND_MISSION_COL2_2},    {"COL2_3", STREAMED_SOUND_MISSION_COL2_3},    {"COL2_4", STREAMED_SOUND_MISSION_COL2_4},
+	{"COL2_5", STREAMED_SOUND_MISSION_COL2_5},    {"COL2_6a", STREAMED_SOUND_MISSION_COL2_6A},  {"COL2_7", STREAMED_SOUND_MISSION_COL2_7},
+	{"COL2_8", STREAMED_SOUND_MISSION_COL2_8},    {"COL2_9", STREAMED_SOUND_MISSION_COL2_9},    {"COL2_10", STREAMED_SOUND_MISSION_COL2_10},
+	{"COL2_11", STREAMED_SOUND_MISSION_COL2_11},  {"COL2_12", STREAMED_SOUND_MISSION_COL2_12},  {"COL2_13", STREAMED_SOUND_MISSION_COL2_13},
+	{"COL2_14", STREAMED_SOUND_MISSION_COL2_14},  {"COL2_15", STREAMED_SOUND_MISSION_COL2_15},  {"COL2_16", STREAMED_SOUND_MISSION_COL2_16},
+	{"COL3_1", STREAMED_SOUND_MISSION_COL3_1},    {"COL3_2", STREAMED_SOUND_MISSION_COL3_2},    {"COL3_2a", STREAMED_SOUND_MISSION_COL3_2A},
+	{"COL3_2b", STREAMED_SOUND_MISSION_COL3_2B},  {"COL3_3", STREAMED_SOUND_MISSION_COL3_3},    {"COL3_4", STREAMED_SOUND_MISSION_COL3_4},
+	{"COL3_5", STREAMED_SOUND_MISSION_COL3_5},    {"COL3_6", STREAMED_SOUND_MISSION_COL3_6},    {"COL3_7", STREAMED_SOUND_MISSION_COL3_7},
+	{"COL3_8", STREAMED_SOUND_MISSION_COL3_8},    {"COL3_9", STREAMED_SOUND_MISSION_COL3_9},    {"COL3_10", STREAMED_SOUND_MISSION_COL3_10},
+	{"COL3_11", STREAMED_SOUND_MISSION_COL3_11},  {"COL3_12", STREAMED_SOUND_MISSION_COL3_12},  {"COL3_13", STREAMED_SOUND_MISSION_COL3_13},
+	{"COL3_14", STREAMED_SOUND_MISSION_COL3_14},  {"COL3_15", STREAMED_SOUND_MISSION_COL3_15},  {"COL3_16", STREAMED_SOUND_MISSION_COL3_16},
+	{"COL3_17", STREAMED_SOUND_MISSION_COL3_17},  {"COL3_18", STREAMED_SOUND_MISSION_COL3_18},  {"COL3_19", STREAMED_SOUND_MISSION_COL3_19},
+	{"COL3_20", STREAMED_SOUND_MISSION_COL3_20},  {"COL3_21", STREAMED_SOUND_MISSION_COL3_21},  {"COL3_23", STREAMED_SOUND_MISSION_COL3_23},
+	{"COL3_24", STREAMED_SOUND_MISSION_COL3_24},  {"COL3_25", STREAMED_SOUND_MISSION_COL3_25},  {"COL4_1", STREAMED_SOUND_MISSION_COL4_1},
+	{"COL4_2", STREAMED_SOUND_MISSION_COL4_2},    {"COL4_3", STREAMED_SOUND_MISSION_COL4_3},    {"COL4_4", STREAMED_SOUND_MISSION_COL4_4},
+	{"COL4_5", STREAMED_SOUND_MISSION_COL4_5},    {"COL4_6", STREAMED_SOUND_MISSION_COL4_6},    {"COL4_7", STREAMED_SOUND_MISSION_COL4_7},
+	{"COL4_8", STREAMED_SOUND_MISSION_COL4_8},    {"COL4_9", STREAMED_SOUND_MISSION_COL4_9},    {"COL4_10", STREAMED_SOUND_MISSION_COL4_10},
+	{"COL4_11", STREAMED_SOUND_MISSION_COL4_11},  {"COL4_12", STREAMED_SOUND_MISSION_COL4_12},  {"COL4_13", STREAMED_SOUND_MISSION_COL4_13},
+	{"COL4_14", STREAMED_SOUND_MISSION_COL4_14},  {"COL4_15", STREAMED_SOUND_MISSION_COL4_15},  {"COL4_16", STREAMED_SOUND_MISSION_COL4_16},
+	{"COL4_17", STREAMED_SOUND_MISSION_COL4_17},  {"COL4_18", STREAMED_SOUND_MISSION_COL4_18},  {"COL4_19", STREAMED_SOUND_MISSION_COL4_19},
+	{"COL4_20", STREAMED_SOUND_MISSION_COL4_20},  {"COL4_21", STREAMED_SOUND_MISSION_COL4_21},  {"COL4_22", STREAMED_SOUND_MISSION_COL4_22},
+	{"COL4_23", STREAMED_SOUND_MISSION_COL4_23},  {"COL4_24", STREAMED_SOUND_MISSION_COL4_24},  {"COL4_25", STREAMED_SOUND_MISSION_COL4_25},
+	{"COL4_26", STREAMED_SOUND_MISSION_COL4_26},  {"COL5_1", STREAMED_SOUND_MISSION_COL5_1},    {"COL5_2", STREAMED_SOUND_MISSION_COL5_2},
+	{"COL5_3", STREAMED_SOUND_MISSION_COL5_3},    {"COL5_4", STREAMED_SOUND_MISSION_COL5_4},    {"COL5_5", STREAMED_SOUND_MISSION_COL5_5},
+	{"COL5_6", STREAMED_SOUND_MISSION_COL5_6},    {"COL5_7", STREAMED_SOUND_MISSION_COL5_7},    {"COL5_8", STREAMED_SOUND_MISSION_COL5_8},
+	{"COL5_9", STREAMED_SOUND_MISSION_COL5_9},    {"COL5_10", STREAMED_SOUND_MISSION_COL5_10},  {"COL5_11", STREAMED_SOUND_MISSION_COL5_11},
+	{"COL5_12", STREAMED_SOUND_MISSION_COL5_12},  {"COL5_13", STREAMED_SOUND_MISSION_COL5_13},  {"COL5_14", STREAMED_SOUND_MISSION_COL5_14},
+	{"COL5_15", STREAMED_SOUND_MISSION_COL5_15},  {"COL5_16", STREAMED_SOUND_MISSION_COL5_16},  {"COL5_17", STREAMED_SOUND_MISSION_COL5_17},
+	{"COL5_18", STREAMED_SOUND_MISSION_COL5_18},  {"COL5_19", STREAMED_SOUND_MISSION_COL5_19},  {"COL5_20", STREAMED_SOUND_MISSION_COL5_20},
+	{"COL5_21", STREAMED_SOUND_MISSION_COL5_21},  {"COL5_22", STREAMED_SOUND_MISSION_COL5_22},  {"COK1_1", STREAMED_SOUND_MISSION_COK1_1},
+	{"COK1_2", STREAMED_SOUND_MISSION_COK1_2},    {"COK1_3", STREAMED_SOUND_MISSION_COK1_3},    {"COK1_4", STREAMED_SOUND_MISSION_COK1_4},
+	{"COK1_5", STREAMED_SOUND_MISSION_COK1_5},    {"COK1_6", STREAMED_SOUND_MISSION_COK1_6},    {"COK2_1", STREAMED_SOUND_MISSION_COK2_1},
+	{"COK2_2", STREAMED_SOUND_MISSION_COK2_2},    {"COK2_3", STREAMED_SOUND_MISSION_COK2_3},    {"COK2_4", STREAMED_SOUND_MISSION_COK2_4},
+	{"COK2_5", STREAMED_SOUND_MISSION_COK2_5},    {"COK2_6", STREAMED_SOUND_MISSION_COK2_6},    {"COK2_7a", STREAMED_SOUND_MISSION_COK2_7A},
+	{"COK2_7b", STREAMED_SOUND_MISSION_COK2_7B},  {"COK2_7c", STREAMED_SOUND_MISSION_COK2_7C},  {"COK2_8a", STREAMED_SOUND_MISSION_COK2_8A},
+	{"COK2_8b", STREAMED_SOUND_MISSION_COK2_8B},  {"COK2_8c", STREAMED_SOUND_MISSION_COK2_8C},  {"COK2_8d", STREAMED_SOUND_MISSION_COK2_8D},
+	{"COK2_9", STREAMED_SOUND_MISSION_COK2_9},    {"COK210a", STREAMED_SOUND_MISSION_COK210A},  {"COK210b", STREAMED_SOUND_MISSION_COK210B},
+	{"COK210c", STREAMED_SOUND_MISSION_COK210C},  {"COK212a", STREAMED_SOUND_MISSION_COK212A},  {"COK212b", STREAMED_SOUND_MISSION_COK212B},
+	{"COK2_13", STREAMED_SOUND_MISSION_COK2_13},  {"COK2_14", STREAMED_SOUND_MISSION_COK2_14},  {"COK2_15", STREAMED_SOUND_MISSION_COK2_15},
+	{"COK2_16", STREAMED_SOUND_MISSION_COK2_16},  {"COK2_20", STREAMED_SOUND_MISSION_COK2_20},  {"COK2_21", STREAMED_SOUND_MISSION_COK2_21},
+	{"COK2_22", STREAMED_SOUND_MISSION_COK2_22},  {"COK3_1", STREAMED_SOUND_MISSION_COK3_1},    {"COK3_2", STREAMED_SOUND_MISSION_COK3_2},
+	{"COK3_3", STREAMED_SOUND_MISSION_COK3_3},    {"COK3_4", STREAMED_SOUND_MISSION_COK3_4},    {"COK4_1", STREAMED_SOUND_MISSION_COK4_1},
+	{"COK4_2", STREAMED_SOUND_MISSION_COK4_2},    {"COK4_3", STREAMED_SOUND_MISSION_COK4_3},    {"COK4_4", STREAMED_SOUND_MISSION_COK4_4},
+	{"COK4_5", STREAMED_SOUND_MISSION_COK4_5},    {"COK4_6", STREAMED_SOUND_MISSION_COK4_6},    {"COK4_7", STREAMED_SOUND_MISSION_COK4_7},
+	{"COK4_8", STREAMED_SOUND_MISSION_COK4_8},    {"COK4_9", STREAMED_SOUND_MISSION_COK4_9},    {"COK4_9A", STREAMED_SOUND_MISSION_COK4_9A},
+	{"COK4_10", STREAMED_SOUND_MISSION_COK4_10},  {"COK4_11", STREAMED_SOUND_MISSION_COK4_11},  {"COK4_12", STREAMED_SOUND_MISSION_COK4_12},
+	{"COK4_13", STREAMED_SOUND_MISSION_COK4_13},  {"COK4_14", STREAMED_SOUND_MISSION_COK4_14},  {"COK4_15", STREAMED_SOUND_MISSION_COK4_15},
+	{"COK4_16", STREAMED_SOUND_MISSION_COK4_16},  {"COK4_17", STREAMED_SOUND_MISSION_COK4_17},  {"COK4_18", STREAMED_SOUND_MISSION_COK4_18},
+	{"COK4_19", STREAMED_SOUND_MISSION_COK4_19},  {"COK4_20", STREAMED_SOUND_MISSION_COK4_20},  {"COK4_21", STREAMED_SOUND_MISSION_COK4_21},
+	{"COK4_22", STREAMED_SOUND_MISSION_COK4_22},  {"COK4_23", STREAMED_SOUND_MISSION_COK4_23},  {"COK4_24", STREAMED_SOUND_MISSION_COK4_24},
+	{"COK4_25", STREAMED_SOUND_MISSION_COK4_25},  {"COK4_26", STREAMED_SOUND_MISSION_COK4_26},  {"COK4_27", STREAMED_SOUND_MISSION_COK4_27},
+	{"RESC_1", STREAMED_SOUND_MISSION_RESC_1},    {"RESC_2", STREAMED_SOUND_MISSION_RESC_2},    {"RESC_3", STREAMED_SOUND_MISSION_RESC_3},
+	{"RESC_4", STREAMED_SOUND_MISSION_RESC_4},    {"RESC_5", STREAMED_SOUND_MISSION_RESC_5},    {"RESC_6", STREAMED_SOUND_MISSION_RESC_6},
+	{"RESC_7", STREAMED_SOUND_MISSION_RESC_7},    {"RESC_8", STREAMED_SOUND_MISSION_RESC_8},    {"RESC_9", STREAMED_SOUND_MISSION_RESC_9},
+	{"RESC_10", STREAMED_SOUND_MISSION_RESC_10},  {"ASS_1", STREAMED_SOUND_MISSION_ASS_1},      {"ASS_2", STREAMED_SOUND_MISSION_ASS_2},
+	{"ASS_3", STREAMED_SOUND_MISSION_ASS_3},      {"ASS_4", STREAMED_SOUND_MISSION_ASS_4},      {"ASS_5", STREAMED_SOUND_MISSION_ASS_5},
+	{"ASS_6", STREAMED_SOUND_MISSION_ASS_6},      {"ASS_7", STREAMED_SOUND_MISSION_ASS_7},      {"ASS_8", STREAMED_SOUND_MISSION_ASS_8},
+	{"ASS_9", STREAMED_SOUND_MISSION_ASS_9},      {"ASS_10", STREAMED_SOUND_MISSION_ASS_10},    {"ASS_11", STREAMED_SOUND_MISSION_ASS_11},
+	{"ASS_12", STREAMED_SOUND_MISSION_ASS_12},    {"ASS_13", STREAMED_SOUND_MISSION_ASS_13},    {"ASS_14", STREAMED_SOUND_MISSION_ASS_14},
+	{"BUD1_1", STREAMED_SOUND_MISSION_BUD1_1},    {"BUD1_2", STREAMED_SOUND_MISSION_BUD1_2},    {"BUD1_3", STREAMED_SOUND_MISSION_BUD1_3},
+	{"BUD1_4", STREAMED_SOUND_MISSION_BUD1_4},    {"BUD1_5", STREAMED_SOUND_MISSION_BUD1_5},    {"BUD1_9", STREAMED_SOUND_MISSION_BUD1_9},
+	{"BUD1_10", STREAMED_SOUND_MISSION_BUD1_10},  {"BUD2_1", STREAMED_SOUND_MISSION_BUD2_1},    {"BUD2_2", STREAMED_SOUND_MISSION_BUD2_2},
+	{"BUD2_3", STREAMED_SOUND_MISSION_BUD2_3},    {"BUD2_4", STREAMED_SOUND_MISSION_BUD2_4},    {"BUD2_5", STREAMED_SOUND_MISSION_BUD2_5},
+	{"BUD2_6", STREAMED_SOUND_MISSION_BUD2_6},    {"BUD2_7", STREAMED_SOUND_MISSION_BUD2_7},    {"BUD3_1a", STREAMED_SOUND_MISSION_BUD3_1A},
+	{"BUD3_1b", STREAMED_SOUND_MISSION_BUD3_1B},  {"BUD3_1", STREAMED_SOUND_MISSION_BUD3_1},    {"BUD3_2", STREAMED_SOUND_MISSION_BUD3_2},
+	{"BUD3_3", STREAMED_SOUND_MISSION_BUD3_3},    {"BUD3_4", STREAMED_SOUND_MISSION_BUD3_4},    {"BUD3_1c", STREAMED_SOUND_MISSION_BUD3_1C},
+	{"BUD3_5", STREAMED_SOUND_MISSION_BUD3_5},    {"BUD3_6", STREAMED_SOUND_MISSION_BUD3_6},    {"BUD3_7", STREAMED_SOUND_MISSION_BUD3_7},
+	{"BUD3_8a", STREAMED_SOUND_MISSION_BUD3_8A},  {"BUD3_8b", STREAMED_SOUND_MISSION_BUD3_8B},  {"BUD3_8c", STREAMED_SOUND_MISSION_BUD3_8C},
+	{"BUD3_9a", STREAMED_SOUND_MISSION_BUD3_9A},  {"BUD3_9b", STREAMED_SOUND_MISSION_BUD3_9B},  {"BUD3_9c", STREAMED_SOUND_MISSION_BUD3_9C},
+	{"CAP1_2", STREAMED_SOUND_MISSION_CAP1_2},    {"CAP1_3", STREAMED_SOUND_MISSION_CAP1_3},    {"CAP1_4", STREAMED_SOUND_MISSION_CAP1_4},
+	{"CAP1_5", STREAMED_SOUND_MISSION_CAP1_5},    {"CAP1_6", STREAMED_SOUND_MISSION_CAP1_6},    {"CAP1_7", STREAMED_SOUND_MISSION_CAP1_7},
+	{"CAP1_8", STREAMED_SOUND_MISSION_CAP1_8},    {"CAP1_9", STREAMED_SOUND_MISSION_CAP1_9},    {"CAP1_10", STREAMED_SOUND_MISSION_CAP1_10},
+	{"CAP1_11", STREAMED_SOUND_MISSION_CAP1_11},  {"CAP1_12", STREAMED_SOUND_MISSION_CAP1_12},  {"FINKILL", STREAMED_SOUND_MISSION_FINKILL},
+	{"FIN_1a", STREAMED_SOUND_MISSION_FIN_1A},    {"FIN_1b", STREAMED_SOUND_MISSION_FIN_1B},    {"FIN_1c", STREAMED_SOUND_MISSION_FIN_1C},
+	{"FIN_2b", STREAMED_SOUND_MISSION_FIN_2B},    {"FIN_2c", STREAMED_SOUND_MISSION_FIN_2C},    {"FIN_3", STREAMED_SOUND_MISSION_FIN_3},
+	{"FIN_4", STREAMED_SOUND_MISSION_FIN_4},      {"FIN_5", STREAMED_SOUND_MISSION_FIN_5},      {"FIN_6", STREAMED_SOUND_MISSION_FIN_6},
+	{"FIN_10", STREAMED_SOUND_MISSION_FIN_10},    {"FIN_11a", STREAMED_SOUND_MISSION_FIN_11A},  {"FIN_11b", STREAMED_SOUND_MISSION_FIN_11B},
+	{"FIN_12a", STREAMED_SOUND_MISSION_FIN_12A},  {"FIN_12b", STREAMED_SOUND_MISSION_FIN_12B},  {"FIN_12c", STREAMED_SOUND_MISSION_FIN_12C},
+	{"FIN_13", STREAMED_SOUND_MISSION_FIN_13},    {"BNK1_1", STREAMED_SOUND_MISSION_BNK1_1},    {"BNK1_2", STREAMED_SOUND_MISSION_BNK1_2},
+	{"BNK1_3", STREAMED_SOUND_MISSION_BNK1_3},    {"BNK1_4", STREAMED_SOUND_MISSION_BNK1_4},    {"BNK1_5", STREAMED_SOUND_MISSION_BNK1_5},
+	{"BNK1_6", STREAMED_SOUND_MISSION_BNK1_6},    {"BNK1_7", STREAMED_SOUND_MISSION_BNK1_7},    {"BNK1_8", STREAMED_SOUND_MISSION_BNK1_8},
+	{"BNK1_10", STREAMED_SOUND_MISSION_BNK1_10},  {"BNK1_11", STREAMED_SOUND_MISSION_BNK1_11},  {"BNK1_12", STREAMED_SOUND_MISSION_BNK1_12},
+	{"BNK1_13", STREAMED_SOUND_MISSION_BNK1_13},  {"BNK1_14", STREAMED_SOUND_MISSION_BNK1_14},  {"BNK2_1", STREAMED_SOUND_MISSION_BNK2_1},
+	{"BNK2_2", STREAMED_SOUND_MISSION_BNK2_2},    {"BNK2_3", STREAMED_SOUND_MISSION_BNK2_3},    {"BNK2_4", STREAMED_SOUND_MISSION_BNK2_4},
+	{"BNK2_5", STREAMED_SOUND_MISSION_BNK2_5},    {"BNK2_6", STREAMED_SOUND_MISSION_BNK2_6},    {"BNK2_7", STREAMED_SOUND_MISSION_BNK2_7},
+	{"BNK2_8", STREAMED_SOUND_MISSION_BNK2_8},    {"BNK2_9", STREAMED_SOUND_MISSION_BNK2_9},    {"BNK3_1", STREAMED_SOUND_MISSION_BNK3_1},
+	{"BNK3_2", STREAMED_SOUND_MISSION_BNK3_2},    {"BNK3_3a", STREAMED_SOUND_MISSION_BNK3_3A},  {"BNK3_3b", STREAMED_SOUND_MISSION_BNK3_3B},
+	{"BNK3_3c", STREAMED_SOUND_MISSION_BNK3_3C},  {"BNK3_4a", STREAMED_SOUND_MISSION_BNK3_4A},  {"BNK3_4b", STREAMED_SOUND_MISSION_BNK3_4B},
+	{"BNK3_4c", STREAMED_SOUND_MISSION_BNK3_4C},  {"BNK4_1", STREAMED_SOUND_MISSION_BNK4_1},    {"BNK4_2", STREAMED_SOUND_MISSION_BNK4_2},
+	{"BNK4_3A", STREAMED_SOUND_MISSION_BNK4_3A},  {"BNK4_3B", STREAMED_SOUND_MISSION_BNK4_3B},  {"BNK4_3C", STREAMED_SOUND_MISSION_BNK4_3C},
+	{"BNK4_3D", STREAMED_SOUND_MISSION_BNK4_3D},  {"BNK4_3E", STREAMED_SOUND_MISSION_BNK4_3E},  {"BNK4_3F", STREAMED_SOUND_MISSION_BNK4_3F},
+	{"BNK4_3G", STREAMED_SOUND_MISSION_BNK4_3G},  {"BNK4_3H", STREAMED_SOUND_MISSION_BNK4_3H},  {"BNK4_3I", STREAMED_SOUND_MISSION_BNK4_3I},
+	{"BNK4_3J", STREAMED_SOUND_MISSION_BNK4_3J},  {"BNK4_3K", STREAMED_SOUND_MISSION_BNK4_3K},  {"BNK4_3M", STREAMED_SOUND_MISSION_BNK4_3M},
+	{"BNK4_3O", STREAMED_SOUND_MISSION_BNK4_3O},  {"BNK4_3P", STREAMED_SOUND_MISSION_BNK4_3P},  {"BNK4_3Q", STREAMED_SOUND_MISSION_BNK4_3Q},
+	{"BNK4_3R", STREAMED_SOUND_MISSION_BNK4_3R},  {"BNK4_3S", STREAMED_SOUND_MISSION_BNK4_3S},  {"BNK4_3T", STREAMED_SOUND_MISSION_BNK4_3T},
+	{"BNK4_3U", STREAMED_SOUND_MISSION_BNK4_3U},  {"BNK4_3V", STREAMED_SOUND_MISSION_BNK4_3V},  {"BNK4_4a", STREAMED_SOUND_MISSION_BNK4_4A},
+	{"BNK4_4b", STREAMED_SOUND_MISSION_BNK4_4B},  {"BNK4_5", STREAMED_SOUND_MISSION_BNK4_5},    {"BNK4_6", STREAMED_SOUND_MISSION_BNK4_6},
+	{"BNK4_7", STREAMED_SOUND_MISSION_BNK4_7},    {"BNK4_8", STREAMED_SOUND_MISSION_BNK4_8},    {"BNK4_9", STREAMED_SOUND_MISSION_BNK4_9},
+	{"BNK4_10", STREAMED_SOUND_MISSION_BNK4_10},  {"BNK4_11", STREAMED_SOUND_MISSION_BNK4_11},  {"BK4_12a", STREAMED_SOUND_MISSION_BK4_12A},
+	{"BK4_12b", STREAMED_SOUND_MISSION_BK4_12B},  {"BK4_12c", STREAMED_SOUND_MISSION_BK4_12C},  {"BNK4_13", STREAMED_SOUND_MISSION_BNK4_13},
+	{"BK4_14a", STREAMED_SOUND_MISSION_BK4_14A},  {"BK4_14b", STREAMED_SOUND_MISSION_BK4_14B},  {"BNK4_15", STREAMED_SOUND_MISSION_BNK4_15},
+	{"BNK4_16", STREAMED_SOUND_MISSION_BNK4_16},  {"BNK4_17", STREAMED_SOUND_MISSION_BNK4_17},  {"BNK4_18", STREAMED_SOUND_MISSION_BNK4_18},
+	{"BK4_19a", STREAMED_SOUND_MISSION_BK4_19A},  {"BK4_19b", STREAMED_SOUND_MISSION_BK4_19B},  {"BK4_20a", STREAMED_SOUND_MISSION_BK4_20A},
+	{"BK4_20b", STREAMED_SOUND_MISSION_BK4_20B},  {"BNK4_21", STREAMED_SOUND_MISSION_BNK4_21},  {"BNK422a", STREAMED_SOUND_MISSION_BNK422A},
+	{"BNK422b", STREAMED_SOUND_MISSION_BNK422B},  {"BK4_23a", STREAMED_SOUND_MISSION_BK4_23A},  {"BK4_23b", STREAMED_SOUND_MISSION_BK4_23B},
+	{"BK4_23c", STREAMED_SOUND_MISSION_BK4_23C},  {"BK4_23d", STREAMED_SOUND_MISSION_BK4_23D},  {"BK4_24a", STREAMED_SOUND_MISSION_BK4_24A},
+	{"BK4_24b", STREAMED_SOUND_MISSION_BK4_24B},  {"BNK4_25", STREAMED_SOUND_MISSION_BNK4_25},  {"BNK4_26", STREAMED_SOUND_MISSION_BNK4_26},
+	{"BNK4_27", STREAMED_SOUND_MISSION_BNK4_27},  {"BNK4_28", STREAMED_SOUND_MISSION_BNK4_28},  {"BNK4_29", STREAMED_SOUND_MISSION_BNK4_29},
+	{"BNK4_30", STREAMED_SOUND_MISSION_BNK4_30},  {"BK4_31a", STREAMED_SOUND_MISSION_BK4_31A},  {"BK4_31b", STREAMED_SOUND_MISSION_BK4_31B},
+	{"BNK4_32", STREAMED_SOUND_MISSION_BNK4_32},  {"BK4_34a", STREAMED_SOUND_MISSION_BK4_34A},  {"BK4_34b", STREAMED_SOUND_MISSION_BK4_34B},
+	{"BK4_35a", STREAMED_SOUND_MISSION_BK4_35A},  {"BK4_35b", STREAMED_SOUND_MISSION_BK4_35B},  {"BNK4_36", STREAMED_SOUND_MISSION_BNK4_36},
+	{"BNK4_37", STREAMED_SOUND_MISSION_BNK4_37},  {"BNK4_38", STREAMED_SOUND_MISSION_BNK4_38},  {"BNK_39", STREAMED_SOUND_MISSION_BNK4_39},
+	{"BK4_40a", STREAMED_SOUND_MISSION_BK4_40A},  {"BK4_40b", STREAMED_SOUND_MISSION_BK4_40B},  {"BNK4_41", STREAMED_SOUND_MISSION_BNK4_41},
+	{"BNK4_42", STREAMED_SOUND_MISSION_BNK4_42},  {"BNK4_43", STREAMED_SOUND_MISSION_BNK4_43},  {"BNK4_44", STREAMED_SOUND_MISSION_BNK4_44},
+	{"BNK4_45", STREAMED_SOUND_MISSION_BNK4_45},  {"BNK4_46", STREAMED_SOUND_MISSION_BNK4_46},  {"BNK4_47", STREAMED_SOUND_MISSION_BNK4_47},
+	{"BNK4_48", STREAMED_SOUND_MISSION_BNK4_48},  {"BNK4_49", STREAMED_SOUND_MISSION_BNK4_49},  {"BNK450A", STREAMED_SOUND_MISSION_BNK450A},
+	{"BNK450B", STREAMED_SOUND_MISSION_BNK450B},  {"BNK4_51", STREAMED_SOUND_MISSION_BNK4_51},  {"BNK4_94", STREAMED_SOUND_MISSION_BNK4_94},
+	{"BNK4_95", STREAMED_SOUND_MISSION_BNK4_95},  {"BNK4_96", STREAMED_SOUND_MISSION_BNK4_96},  {"BNK4_97", STREAMED_SOUND_MISSION_BNK4_97},
+	{"BNK4_98", STREAMED_SOUND_MISSION_BNK4_98},  {"BNK4_99", STREAMED_SOUND_MISSION_BNK4_99},  {"CNT1_1", STREAMED_SOUND_MISSION_CNT1_1},
+	{"CNT1_2", STREAMED_SOUND_MISSION_CNT1_2},    {"CNT1_3", STREAMED_SOUND_MISSION_CNT1_3},    {"CNT1_4", STREAMED_SOUND_MISSION_CNT1_4},
+	{"CNT1_5", STREAMED_SOUND_MISSION_CNT1_5},    {"CNT2_1", STREAMED_SOUND_MISSION_CNT2_1},    {"CNT2_2", STREAMED_SOUND_MISSION_CNT2_2},
+	{"CNT2_3", STREAMED_SOUND_MISSION_CNT2_3},    {"CNT2_4", STREAMED_SOUND_MISSION_CNT2_4},    {"PORN1_1", STREAMED_SOUND_MISSION_PORN1_1},
+	{"PORN1_2", STREAMED_SOUND_MISSION_PORN1_2},  {"PORN1_3", STREAMED_SOUND_MISSION_PORN1_3},  {"PRN1_3A", STREAMED_SOUND_MISSION_PRN1_3A},
+	{"PORN1_4", STREAMED_SOUND_MISSION_PORN1_4},  {"PORN1_5", STREAMED_SOUND_MISSION_PORN1_5},  {"PORN1_6", STREAMED_SOUND_MISSION_PORN1_6},
+	{"PORN1_7", STREAMED_SOUND_MISSION_PORN1_7},  {"PORN1_8", STREAMED_SOUND_MISSION_PORN1_8},  {"PORN1_9", STREAMED_SOUND_MISSION_PORN1_9},
+	{"PRN1_10", STREAMED_SOUND_MISSION_PRN1_10},  {"PRN1_11", STREAMED_SOUND_MISSION_PRN1_11},  {"PRN1_12", STREAMED_SOUND_MISSION_PRN1_12},
+	{"PRN1_13", STREAMED_SOUND_MISSION_PRN1_13},  {"PRN1_14", STREAMED_SOUND_MISSION_PRN1_14},  {"PRN1_15", STREAMED_SOUND_MISSION_PRN1_15},
+	{"PRN1_16", STREAMED_SOUND_MISSION_PRN1_16},  {"PRN1_17", STREAMED_SOUND_MISSION_PRN1_17},  {"PRN1_18", STREAMED_SOUND_MISSION_PRN1_18},
+	{"PRN1_19", STREAMED_SOUND_MISSION_PRN1_19},  {"PRN1_20", STREAMED_SOUND_MISSION_PRN1_20},  {"PRN1_21", STREAMED_SOUND_MISSION_PRN1_21},
+	{"PORN3_1", STREAMED_SOUND_MISSION_PORN3_1},  {"PORN3_2", STREAMED_SOUND_MISSION_PORN3_2},  {"PORN3_3", STREAMED_SOUND_MISSION_PORN3_3},
+	{"PORN3_4", STREAMED_SOUND_MISSION_PORN3_4},  {"TAX1_1", STREAMED_SOUND_MISSION_TAX1_1},    {"TAX1_2", STREAMED_SOUND_MISSION_TAX1_2},
+	{"TAX1_3", STREAMED_SOUND_MISSION_TAX1_3},    {"TAX1_4", STREAMED_SOUND_MISSION_TAX1_4},    {"TAX1_5", STREAMED_SOUND_MISSION_TAX1_5},
+	{"TAX2_1", STREAMED_SOUND_MISSION_TAX2_1},    {"TAX2_2", STREAMED_SOUND_MISSION_TAX2_2},    {"TAX2_3", STREAMED_SOUND_MISSION_TAX2_3},
+	{"TAX2_4", STREAMED_SOUND_MISSION_TAX2_4},    {"TAX2_5", STREAMED_SOUND_MISSION_TAX2_5},    {"TAX2_6", STREAMED_SOUND_MISSION_TAX2_6},
+	{"TAX2_7", STREAMED_SOUND_MISSION_TAX2_7},    {"TAX3_1", STREAMED_SOUND_MISSION_TAX3_1},    {"TAX3_2", STREAMED_SOUND_MISSION_TAX3_2},
+	{"TAX3_3", STREAMED_SOUND_MISSION_TAX3_3},    {"TAX3_4", STREAMED_SOUND_MISSION_TAX3_4},    {"TAX3_5", STREAMED_SOUND_MISSION_TAX3_5},
+	{"TEX1_1", STREAMED_SOUND_MISSION_TEX1_1},    {"TEX1_2", STREAMED_SOUND_MISSION_TEX1_2},    {"TEX1_3", STREAMED_SOUND_MISSION_TEX1_3},
+	{"TEX1_4", STREAMED_SOUND_MISSION_TEX1_4},    {"TEX1_5", STREAMED_SOUND_MISSION_TEX1_5},    {"TEX1_6", STREAMED_SOUND_MISSION_TEX1_6},
+	{"TEX2_1", STREAMED_SOUND_MISSION_TEX2_1},    {"TEX3_1", STREAMED_SOUND_MISSION_TEX3_1},    {"TEX3_2", STREAMED_SOUND_MISSION_TEX3_2},
+	{"TEX3_3", STREAMED_SOUND_MISSION_TEX3_3},    {"TEX3_4", STREAMED_SOUND_MISSION_TEX3_4},    {"TEX3_5", STREAMED_SOUND_MISSION_TEX3_5},
+	{"TEX3_6", STREAMED_SOUND_MISSION_TEX3_6},    {"TEX3_7", STREAMED_SOUND_MISSION_TEX3_7},    {"TEX3_8", STREAMED_SOUND_MISSION_TEX3_8},
+	{"PHIL1_2", STREAMED_SOUND_MISSION_PHIL1_2},  {"PHIL1_3", STREAMED_SOUND_MISSION_PHIL1_3},  {"PHIL2_1", STREAMED_SOUND_MISSION_PHIL2_1},
+	{"PHIL2_2", STREAMED_SOUND_MISSION_PHIL2_2},  {"PHIL2_3", STREAMED_SOUND_MISSION_PHIL2_3},  {"PHIL2_4", STREAMED_SOUND_MISSION_PHIL2_4},
+	{"PHIL2_5", STREAMED_SOUND_MISSION_PHIL2_5},  {"PHIL2_6", STREAMED_SOUND_MISSION_PHIL2_6},  {"PHIL2_7", STREAMED_SOUND_MISSION_PHIL2_7},
+	{"PHIL2_8", STREAMED_SOUND_MISSION_PHIL2_8},  {"PHIL2_9", STREAMED_SOUND_MISSION_PHIL2_9},  {"PHIL210", STREAMED_SOUND_MISSION_PHIL210},
+	{"PHIL211", STREAMED_SOUND_MISSION_PHIL211},  {"BIKE1_1", STREAMED_SOUND_MISSION_BIKE1_1},  {"BIKE1_2", STREAMED_SOUND_MISSION_BIKE1_2},
+	{"BIKE1_3", STREAMED_SOUND_MISSION_BIKE1_3},  {"ROK1_1a", STREAMED_SOUND_MISSION_ROK1_1A},  {"ROK1_1b", STREAMED_SOUND_MISSION_ROK1_1B},
+	{"ROK1_5", STREAMED_SOUND_MISSION_ROK1_5},    {"ROK1_6", STREAMED_SOUND_MISSION_ROK1_6},    {"ROK1_7", STREAMED_SOUND_MISSION_ROK1_7},
+	{"ROK1_8", STREAMED_SOUND_MISSION_ROK1_8},    {"ROK1_9", STREAMED_SOUND_MISSION_ROK1_9},    {"PSYCH_1", STREAMED_SOUND_MISSION_PSYCH_1},
+	{"PSYCH_2", STREAMED_SOUND_MISSION_PSYCH_2},  {"ROK2_01", STREAMED_SOUND_MISSION_ROK2_01},  {"ROK3_1", STREAMED_SOUND_MISSION_ROK3_1},
+	{"ROK3_2", STREAMED_SOUND_MISSION_ROK3_2},    {"ROK3_3", STREAMED_SOUND_MISSION_ROK3_3},    {"ROK3_4", STREAMED_SOUND_MISSION_ROK3_4},
+	{"ROK3_5", STREAMED_SOUND_MISSION_ROK3_5},    {"ROK3_6", STREAMED_SOUND_MISSION_ROK3_6},    {"ROK3_7", STREAMED_SOUND_MISSION_ROK3_7},
+	{"ROK3_8", STREAMED_SOUND_MISSION_ROK3_8},    {"ROK3_9", STREAMED_SOUND_MISSION_ROK3_9},    {"ROK3_10", STREAMED_SOUND_MISSION_ROK3_10},
+	{"ROK3_11", STREAMED_SOUND_MISSION_ROK3_11},  {"ROK3_12", STREAMED_SOUND_MISSION_ROK3_12},  {"ROK3_13", STREAMED_SOUND_MISSION_ROK3_13},
+	{"ROK3_14", STREAMED_SOUND_MISSION_ROK3_14},  {"ROK3_15", STREAMED_SOUND_MISSION_ROK3_15},  {"ROK3_16", STREAMED_SOUND_MISSION_ROK3_16},
+	{"ROK3_17", STREAMED_SOUND_MISSION_ROK3_17},  {"ROK3_18", STREAMED_SOUND_MISSION_ROK3_18},  {"ROK3_19", STREAMED_SOUND_MISSION_ROK3_19},
+	{"ROK3_20", STREAMED_SOUND_MISSION_ROK3_20},  {"ROK3_21", STREAMED_SOUND_MISSION_ROK3_21},  {"ROK3_22", STREAMED_SOUND_MISSION_ROK3_22},
+	{"ROK3_23", STREAMED_SOUND_MISSION_ROK3_23},  {"ROK3_24", STREAMED_SOUND_MISSION_ROK3_24},  {"ROK3_25", STREAMED_SOUND_MISSION_ROK3_25},
+	{"ROK3_26", STREAMED_SOUND_MISSION_ROK3_26},  {"ROK3_27", STREAMED_SOUND_MISSION_ROK3_27},  {"ROK3_62", STREAMED_SOUND_MISSION_ROK3_62},
+	{"ROK3_63", STREAMED_SOUND_MISSION_ROK3_63},  {"ROK3_64", STREAMED_SOUND_MISSION_ROK3_64},  {"ROK3_65", STREAMED_SOUND_MISSION_ROK3_65},
+	{"ROK3_66", STREAMED_SOUND_MISSION_ROK3_66},  {"ROK3_67", STREAMED_SOUND_MISSION_ROK3_67},  {"ROK3_68", STREAMED_SOUND_MISSION_ROK3_68},
+	{"ROK3_69", STREAMED_SOUND_MISSION_ROK3_69},  {"ROK3_70", STREAMED_SOUND_MISSION_ROK3_70},  {"ROK3_71", STREAMED_SOUND_MISSION_ROK3_71},
+	{"ROK3_73", STREAMED_SOUND_MISSION_ROK3_73},  {"HAT_1a", STREAMED_SOUND_MISSION_HAT_1A},    {"intro1", STREAMED_SOUND_MISSION_INTRO1},
+	{"intro2", STREAMED_SOUND_MISSION_INTRO2},    {"intro3", STREAMED_SOUND_MISSION_INTRO3},    {"intro4", STREAMED_SOUND_MISSION_INTRO4},
+	{"CUB1_1", STREAMED_SOUND_MISSION_CUB1_1},    {"CUB1_2", STREAMED_SOUND_MISSION_CUB1_2},    {"CUB1_3", STREAMED_SOUND_MISSION_CUB1_3},
+	{"CUB1_4", STREAMED_SOUND_MISSION_CUB1_4},    {"CUB1_5", STREAMED_SOUND_MISSION_CUB1_5},    {"CUB1_6", STREAMED_SOUND_MISSION_CUB1_6},
+	{"CUB1_7", STREAMED_SOUND_MISSION_CUB1_7},    {"CUB1_8", STREAMED_SOUND_MISSION_CUB1_8},    {"CUB1_9", STREAMED_SOUND_MISSION_CUB1_9},
+	{"CUB1_10", STREAMED_SOUND_MISSION_CUB1_10},  {"CUB2_1", STREAMED_SOUND_MISSION_CUB2_1},    {"CUB2_2", STREAMED_SOUND_MISSION_CUB2_2},
+	{"CUB2_3a", STREAMED_SOUND_MISSION_CUB2_3A},  {"CUB2_3b", STREAMED_SOUND_MISSION_CUB2_3B},  {"CUB2_3c", STREAMED_SOUND_MISSION_CUB2_3C},
+	{"CUB2_4a", STREAMED_SOUND_MISSION_CUB2_4A},  {"CUB2_5", STREAMED_SOUND_MISSION_CUB2_5},    {"CUB2_6", STREAMED_SOUND_MISSION_CUB2_6},
+	{"CUB2_7", STREAMED_SOUND_MISSION_CUB2_7},    {"CUB2_8", STREAMED_SOUND_MISSION_CUB2_8},    {"CUB2_9", STREAMED_SOUND_MISSION_CUB2_9},
+	{"CUB2_10", STREAMED_SOUND_MISSION_CUB2_10},  {"CUB2_11", STREAMED_SOUND_MISSION_CUB2_11},  {"CUB3_1", STREAMED_SOUND_MISSION_CUB3_1},
+	{"CUB3_2", STREAMED_SOUND_MISSION_CUB3_2},    {"CUB3_3", STREAMED_SOUND_MISSION_CUB3_3},    {"CUB3_4", STREAMED_SOUND_MISSION_CUB3_4},
+	{"CUB4_1", STREAMED_SOUND_MISSION_CUB4_1},    {"CUB4_2", STREAMED_SOUND_MISSION_CUB4_2},    {"CUB4_3", STREAMED_SOUND_MISSION_CUB4_3},
+	{"CUB4_4", STREAMED_SOUND_MISSION_CUB4_4},    {"CUB4_5", STREAMED_SOUND_MISSION_CUB4_5},    {"CUB4_5A", STREAMED_SOUND_MISSION_CUB4_5A},
+	{"CUB4_6", STREAMED_SOUND_MISSION_CUB4_6},    {"CUB4_7", STREAMED_SOUND_MISSION_CUB4_7},    {"CUB4_8", STREAMED_SOUND_MISSION_CUB4_8},
+	{"CUB4_9", STREAMED_SOUND_MISSION_CUB4_9},    {"CUB4_10", STREAMED_SOUND_MISSION_CUB4_10},  {"CUB4_11", STREAMED_SOUND_MISSION_CUB4_11},
+	{"CUB4_12", STREAMED_SOUND_MISSION_CUB4_12},  {"CUB4_13", STREAMED_SOUND_MISSION_CUB4_13},  {"CUB4_14", STREAMED_SOUND_MISSION_CUB4_14},
+	{"CUB4_15", STREAMED_SOUND_MISSION_CUB4_15},  {"CUB4_16", STREAMED_SOUND_MISSION_CUB4_16},  {"golf_1", STREAMED_SOUND_MISSION_GOLF_1},
+	{"golf_2", STREAMED_SOUND_MISSION_GOLF_2},    {"golf_3", STREAMED_SOUND_MISSION_GOLF_3},    {"bar_1", STREAMED_SOUND_MISSION_BAR_1},
+	{"bar_2", STREAMED_SOUND_MISSION_BAR_2},      {"bar_3", STREAMED_SOUND_MISSION_BAR_3},      {"bar_4", STREAMED_SOUND_MISSION_BAR_4},
+	{"bar_5", STREAMED_SOUND_MISSION_BAR_5},      {"bar_6", STREAMED_SOUND_MISSION_BAR_6},      {"bar_7", STREAMED_SOUND_MISSION_BAR_7},
+	{"bar_8", STREAMED_SOUND_MISSION_BAR_8},      {"strip_1", STREAMED_SOUND_MISSION_STRIP_1},  {"strip_2", STREAMED_SOUND_MISSION_STRIP_2},
+	{"strip_3", STREAMED_SOUND_MISSION_STRIP_3},  {"strip_4", STREAMED_SOUND_MISSION_STRIP_4},  {"strip_5", STREAMED_SOUND_MISSION_STRIP_5},
+	{"strip_6", STREAMED_SOUND_MISSION_STRIP_6},  {"strip_7", STREAMED_SOUND_MISSION_STRIP_7},  {"strip_8", STREAMED_SOUND_MISSION_STRIP_8},
+	{"strip_9", STREAMED_SOUND_MISSION_STRIP_9},  {"star_1", STREAMED_SOUND_MISSION_STAR_1},    {"star_2", STREAMED_SOUND_MISSION_STAR_2},
+	{"star_3", STREAMED_SOUND_MISSION_STAR_3},    {"star_4", STREAMED_SOUND_MISSION_STAR_4},    {"mob_01a", STREAMED_SOUND_MISSION_MOB_01A},
+	{"mob_01b", STREAMED_SOUND_MISSION_MOB_01B},  {"mob_01c", STREAMED_SOUND_MISSION_MOB_01C},  {"mob_02a", STREAMED_SOUND_MISSION_MOB_02A},
+	{"mob_02b", STREAMED_SOUND_MISSION_MOB_02B},  {"mob_02c", STREAMED_SOUND_MISSION_MOB_02C},  {"mob_03a", STREAMED_SOUND_MISSION_MOB_03A},
+	{"mob_03b", STREAMED_SOUND_MISSION_MOB_03B},  {"mob_03c", STREAMED_SOUND_MISSION_MOB_03C},  {"mob_03d", STREAMED_SOUND_MISSION_MOB_03D},
+	{"mob_03e", STREAMED_SOUND_MISSION_MOB_03E},  {"shark_1", STREAMED_SOUND_MISSION_SHARK_1},  {"shark_2", STREAMED_SOUND_MISSION_SHARK_2},
+	{"shark_3", STREAMED_SOUND_MISSION_SHARK_3},  {"shark_4", STREAMED_SOUND_MISSION_SHARK_4},  {"shark_5", STREAMED_SOUND_MISSION_SHARK_5},
+	{"mob_04a", STREAMED_SOUND_MISSION_MOB_04A},  {"mob_04b", STREAMED_SOUND_MISSION_MOB_04B},  {"mob_04c", STREAMED_SOUND_MISSION_MOB_04C},
+	{"mob_04d", STREAMED_SOUND_MISSION_MOB_04D},  {"mob_05a", STREAMED_SOUND_MISSION_MOB_05A},  {"mob_05b", STREAMED_SOUND_MISSION_MOB_05B},
+	{"mob_05c", STREAMED_SOUND_MISSION_MOB_05C},  {"mob_05d", STREAMED_SOUND_MISSION_MOB_05D},  {"mob_06a", STREAMED_SOUND_MISSION_MOB_06A},
+	{"mob_06b", STREAMED_SOUND_MISSION_MOB_06B},  {"mob_06c", STREAMED_SOUND_MISSION_MOB_06C},  {"mob_07a", STREAMED_SOUND_MISSION_MOB_07A},
+	{"mob_07b", STREAMED_SOUND_MISSION_MOB_07B},  {"mob_08a", STREAMED_SOUND_MISSION_MOB_08A},  {"mob_08b", STREAMED_SOUND_MISSION_MOB_08B},
+	{"mob_08c", STREAMED_SOUND_MISSION_MOB_08C},  {"mob_08d", STREAMED_SOUND_MISSION_MOB_08D},  {"mob_08e", STREAMED_SOUND_MISSION_MOB_08E},
+	{"mob_08f", STREAMED_SOUND_MISSION_MOB_08F},  {"mob_08g", STREAMED_SOUND_MISSION_MOB_08G},  {"mob_09a", STREAMED_SOUND_MISSION_MOB_09A},
+	{"mob_09b", STREAMED_SOUND_MISSION_MOB_09B},  {"mob_09c", STREAMED_SOUND_MISSION_MOB_09C},  {"mob_09d", STREAMED_SOUND_MISSION_MOB_09D},
+	{"mob_09e", STREAMED_SOUND_MISSION_MOB_09E},  {"mob_09f", STREAMED_SOUND_MISSION_MOB_09F},  {"mob_10a", STREAMED_SOUND_MISSION_MOB_10A},
+	{"mob_10b", STREAMED_SOUND_MISSION_MOB_10B},  {"mob_10c", STREAMED_SOUND_MISSION_MOB_10C},  {"mob_10d", STREAMED_SOUND_MISSION_MOB_10D},
+	{"mob_10e", STREAMED_SOUND_MISSION_MOB_10E},  {"mob_11a", STREAMED_SOUND_MISSION_MOB_11A},  {"mob_11b", STREAMED_SOUND_MISSION_MOB_11B},
+	{"mob_11c", STREAMED_SOUND_MISSION_MOB_11C},  {"mob_11d", STREAMED_SOUND_MISSION_MOB_11D},  {"mob_11e", STREAMED_SOUND_MISSION_MOB_11E},
+	{"mob_11f", STREAMED_SOUND_MISSION_MOB_11F},  {"mob_14a", STREAMED_SOUND_MISSION_MOB_14A},  {"mob_14b", STREAMED_SOUND_MISSION_MOB_14B},
+	{"mob_14c", STREAMED_SOUND_MISSION_MOB_14C},  {"mob_14d", STREAMED_SOUND_MISSION_MOB_14D},  {"mob_14e", STREAMED_SOUND_MISSION_MOB_14E},
+	{"mob_14f", STREAMED_SOUND_MISSION_MOB_14F},  {"mob_14g", STREAMED_SOUND_MISSION_MOB_14G},  {"mob_14h", STREAMED_SOUND_MISSION_MOB_14H},
+	{"mob_16a", STREAMED_SOUND_MISSION_MOB_16A},  {"mob_16b", STREAMED_SOUND_MISSION_MOB_16B},  {"mob_16c", STREAMED_SOUND_MISSION_MOB_16C},
+	{"mob_16d", STREAMED_SOUND_MISSION_MOB_16D},  {"mob_16e", STREAMED_SOUND_MISSION_MOB_16E},  {"mob_16f", STREAMED_SOUND_MISSION_MOB_16F},
+	{"mob_16g", STREAMED_SOUND_MISSION_MOB_16G},  {"mob_17a", STREAMED_SOUND_MISSION_MOB_17A},  {"mob_17b", STREAMED_SOUND_MISSION_MOB_17B},
+	{"mob_17c", STREAMED_SOUND_MISSION_MOB_17C},  {"mob_17d", STREAMED_SOUND_MISSION_MOB_17D},  {"mob_17e", STREAMED_SOUND_MISSION_MOB_17E},
+	{"mob_17g", STREAMED_SOUND_MISSION_MOB_17G},  {"mob_17h", STREAMED_SOUND_MISSION_MOB_17H},  {"mob_17i", STREAMED_SOUND_MISSION_MOB_17I},
+	{"mob_17j", STREAMED_SOUND_MISSION_MOB_17J},  {"mob_17k", STREAMED_SOUND_MISSION_MOB_17K},  {"mob_17l", STREAMED_SOUND_MISSION_MOB_17L},
+	{"mob_18a", STREAMED_SOUND_MISSION_MOB_18A},  {"mob_18b", STREAMED_SOUND_MISSION_MOB_18B},  {"mob_18c", STREAMED_SOUND_MISSION_MOB_18C},
+	{"mob_18d", STREAMED_SOUND_MISSION_MOB_18D},  {"mob_18e", STREAMED_SOUND_MISSION_MOB_18E},  {"mob_18f", STREAMED_SOUND_MISSION_MOB_18F},
+	{"mob_18g", STREAMED_SOUND_MISSION_MOB_18G},  {"mob_20a", STREAMED_SOUND_MISSION_MOB_20A},  {"mob_20b", STREAMED_SOUND_MISSION_MOB_20B},
+	{"mob_20c", STREAMED_SOUND_MISSION_MOB_20C},  {"mob_20d", STREAMED_SOUND_MISSION_MOB_20D},  {"mob_20e", STREAMED_SOUND_MISSION_MOB_20E},
+	{"mob_24a", STREAMED_SOUND_MISSION_MOB_24A},  {"mob_24b", STREAMED_SOUND_MISSION_MOB_24B},  {"mob_24c", STREAMED_SOUND_MISSION_MOB_24C},
+	{"mob_24d", STREAMED_SOUND_MISSION_MOB_24D},  {"mob_24e", STREAMED_SOUND_MISSION_MOB_24E},  {"mob_24f", STREAMED_SOUND_MISSION_MOB_24F},
+	{"mob_24g", STREAMED_SOUND_MISSION_MOB_24G},  {"mob_24h", STREAMED_SOUND_MISSION_MOB_24H},  {"mob_25a", STREAMED_SOUND_MISSION_MOB_25A},
+	{"mob_25b", STREAMED_SOUND_MISSION_MOB_25B},  {"mob_25c", STREAMED_SOUND_MISSION_MOB_25C},  {"mob_25d", STREAMED_SOUND_MISSION_MOB_25D},
+	{"mob_26a", STREAMED_SOUND_MISSION_MOB_26A},  {"mob_26b", STREAMED_SOUND_MISSION_MOB_26B},  {"mob_26c", STREAMED_SOUND_MISSION_MOB_26C},
+	{"mob_26d", STREAMED_SOUND_MISSION_MOB_26D},  {"mob_26e", STREAMED_SOUND_MISSION_MOB_26E},  {"mob_29a", STREAMED_SOUND_MISSION_MOB_29A},
+	{"mob_29b", STREAMED_SOUND_MISSION_MOB_29B},  {"mob_29c", STREAMED_SOUND_MISSION_MOB_29C},  {"mob_29d", STREAMED_SOUND_MISSION_MOB_29D},
+	{"mob_29e", STREAMED_SOUND_MISSION_MOB_29E},  {"mob_29f", STREAMED_SOUND_MISSION_MOB_29F},  {"mob_29g", STREAMED_SOUND_MISSION_MOB_29G},
+	{"mob_30a", STREAMED_SOUND_MISSION_MOB_30A},  {"mob_30b", STREAMED_SOUND_MISSION_MOB_30B},  {"mob_30c", STREAMED_SOUND_MISSION_MOB_30C},
+	{"mob_30d", STREAMED_SOUND_MISSION_MOB_30D},  {"mob_30e", STREAMED_SOUND_MISSION_MOB_30E},  {"mob_30f", STREAMED_SOUND_MISSION_MOB_30F},
+	{"mob_33a", STREAMED_SOUND_MISSION_MOB_33A},  {"mob_33b", STREAMED_SOUND_MISSION_MOB_33B},  {"mob_33c", STREAMED_SOUND_MISSION_MOB_33C},
+	{"mob_33d", STREAMED_SOUND_MISSION_MOB_33D},  {"mob_34a", STREAMED_SOUND_MISSION_MOB_34A},  {"mob_34b", STREAMED_SOUND_MISSION_MOB_34B},
+	{"mob_34c", STREAMED_SOUND_MISSION_MOB_34C},  {"mob_34d", STREAMED_SOUND_MISSION_MOB_34D},  {"mob_35a", STREAMED_SOUND_MISSION_MOB_35A},
+	{"mob_35b", STREAMED_SOUND_MISSION_MOB_35B},  {"mob_35c", STREAMED_SOUND_MISSION_MOB_35C},  {"mob_35d", STREAMED_SOUND_MISSION_MOB_35D},
+	{"mob_36a", STREAMED_SOUND_MISSION_MOB_36A},  {"mob_36b", STREAMED_SOUND_MISSION_MOB_36B},  {"mob_36c", STREAMED_SOUND_MISSION_MOB_36C},
+	{"mob_40a", STREAMED_SOUND_MISSION_MOB_40A},  {"mob_40b", STREAMED_SOUND_MISSION_MOB_40B},  {"mob_40c", STREAMED_SOUND_MISSION_MOB_40C},
+	{"mob_40d", STREAMED_SOUND_MISSION_MOB_40D},  {"mob_40e", STREAMED_SOUND_MISSION_MOB_40E},  {"mob_40f", STREAMED_SOUND_MISSION_MOB_40F},
+	{"mob_40g", STREAMED_SOUND_MISSION_MOB_40G},  {"mob_40h", STREAMED_SOUND_MISSION_MOB_40H},  {"mob_40i", STREAMED_SOUND_MISSION_MOB_40I},
+	{"mob_41a", STREAMED_SOUND_MISSION_MOB_41A},  {"mob_41b", STREAMED_SOUND_MISSION_MOB_41B},  {"mob_41c", STREAMED_SOUND_MISSION_MOB_41C},
+	{"mob_41d", STREAMED_SOUND_MISSION_MOB_41D},  {"mob_41e", STREAMED_SOUND_MISSION_MOB_41E},  {"mob_41f", STREAMED_SOUND_MISSION_MOB_41F},
+	{"mob_41g", STREAMED_SOUND_MISSION_MOB_41G},  {"mob_41h", STREAMED_SOUND_MISSION_MOB_41H},  {"mob_42a", STREAMED_SOUND_MISSION_MOB_42A},
+	{"mob_42b", STREAMED_SOUND_MISSION_MOB_42B},  {"mob_42c", STREAMED_SOUND_MISSION_MOB_42C},  {"mob_42d", STREAMED_SOUND_MISSION_MOB_42D},
+	{"mob_42e", STREAMED_SOUND_MISSION_MOB_42E},  {"mob_43a", STREAMED_SOUND_MISSION_MOB_43A},  {"mob_43b", STREAMED_SOUND_MISSION_MOB_43B},
+	{"mob_43c", STREAMED_SOUND_MISSION_MOB_43C},  {"mob_43d", STREAMED_SOUND_MISSION_MOB_43D},  {"mob_43e", STREAMED_SOUND_MISSION_MOB_43E},
+	{"mob_43f", STREAMED_SOUND_MISSION_MOB_43F},  {"mob_43g", STREAMED_SOUND_MISSION_MOB_43G},  {"mob_43h", STREAMED_SOUND_MISSION_MOB_43H},
+	{"mob_45a", STREAMED_SOUND_MISSION_MOB_45A},  {"mob_45b", STREAMED_SOUND_MISSION_MOB_45B},  {"mob_45c", STREAMED_SOUND_MISSION_MOB_45C},
+	{"mob_45d", STREAMED_SOUND_MISSION_MOB_45D},  {"mob_45e", STREAMED_SOUND_MISSION_MOB_45E},  {"mob_45f", STREAMED_SOUND_MISSION_MOB_45F},
+	{"mob_45g", STREAMED_SOUND_MISSION_MOB_45G},  {"mob_45h", STREAMED_SOUND_MISSION_MOB_45H},  {"mob_45i", STREAMED_SOUND_MISSION_MOB_45I},
+	{"mob_45j", STREAMED_SOUND_MISSION_MOB_45J},  {"mob_45k", STREAMED_SOUND_MISSION_MOB_45K},  {"mob_45l", STREAMED_SOUND_MISSION_MOB_45L},
+	{"mob_45m", STREAMED_SOUND_MISSION_MOB_45M},  {"mob_45n", STREAMED_SOUND_MISSION_MOB_45N},  {"mob_46a", STREAMED_SOUND_MISSION_MOB_46A},
+	{"mob_46b", STREAMED_SOUND_MISSION_MOB_46B},  {"mob_46c", STREAMED_SOUND_MISSION_MOB_46C},  {"mob_46d", STREAMED_SOUND_MISSION_MOB_46D},
+	{"mob_46e", STREAMED_SOUND_MISSION_MOB_46E},  {"mob_46f", STREAMED_SOUND_MISSION_MOB_46F},  {"mob_46g", STREAMED_SOUND_MISSION_MOB_46G},
+	{"mob_46h", STREAMED_SOUND_MISSION_MOB_46H},  {"mob_47a", STREAMED_SOUND_MISSION_MOB_47A},  {"mob_52a", STREAMED_SOUND_MISSION_MOB_52A},
+	{"mob_52b", STREAMED_SOUND_MISSION_MOB_52B},  {"mob_52c", STREAMED_SOUND_MISSION_MOB_52C},  {"mob_52d", STREAMED_SOUND_MISSION_MOB_52D},
+	{"mob_52e", STREAMED_SOUND_MISSION_MOB_52E},  {"mob_52f", STREAMED_SOUND_MISSION_MOB_52F},  {"mob_52g", STREAMED_SOUND_MISSION_MOB_52G},
+	{"mob_52h", STREAMED_SOUND_MISSION_MOB_52H},  {"mob_54a", STREAMED_SOUND_MISSION_MOB_54A},  {"mob_54b", STREAMED_SOUND_MISSION_MOB_54B},
+	{"mob_54c", STREAMED_SOUND_MISSION_MOB_54C},  {"mob_54d", STREAMED_SOUND_MISSION_MOB_54D},  {"mob_54e", STREAMED_SOUND_MISSION_MOB_54E},
+	{"mob_55a", STREAMED_SOUND_MISSION_MOB_55A},  {"mob_55b", STREAMED_SOUND_MISSION_MOB_55B},  {"mob_55c", STREAMED_SOUND_MISSION_MOB_55C},
+	{"mob_55d", STREAMED_SOUND_MISSION_MOB_55D},  {"mob_55e", STREAMED_SOUND_MISSION_MOB_55E},  {"mob_55f", STREAMED_SOUND_MISSION_MOB_55F},
+	{"mob_56a", STREAMED_SOUND_MISSION_MOB_56A},  {"mob_56b", STREAMED_SOUND_MISSION_MOB_56B},  {"mob_56c", STREAMED_SOUND_MISSION_MOB_56C},
+	{"mob_56d", STREAMED_SOUND_MISSION_MOB_56D},  {"mob_56e", STREAMED_SOUND_MISSION_MOB_56E},  {"mob_56f", STREAMED_SOUND_MISSION_MOB_56F},
+	{"mob_57a", STREAMED_SOUND_MISSION_MOB_57A},  {"mob_57b", STREAMED_SOUND_MISSION_MOB_57B},  {"mob_57c", STREAMED_SOUND_MISSION_MOB_57C},
+	{"mob_57d", STREAMED_SOUND_MISSION_MOB_57D},  {"mob_57e", STREAMED_SOUND_MISSION_MOB_57E},  {"mob_58a", STREAMED_SOUND_MISSION_MOB_58A},
+	{"mob_58b", STREAMED_SOUND_MISSION_MOB_58B},  {"mob_58c", STREAMED_SOUND_MISSION_MOB_58C},  {"mob_58d", STREAMED_SOUND_MISSION_MOB_58D},
+	{"mob_58e", STREAMED_SOUND_MISSION_MOB_58E},  {"mob_58f", STREAMED_SOUND_MISSION_MOB_58F},  {"mob_58g", STREAMED_SOUND_MISSION_MOB_58G},
+	{"mob_61a", STREAMED_SOUND_MISSION_MOB_61A},  {"mob_61b", STREAMED_SOUND_MISSION_MOB_61B},  {"mob_62a", STREAMED_SOUND_MISSION_MOB_62A},
+	{"mob_62b", STREAMED_SOUND_MISSION_MOB_62B},  {"mob_62c", STREAMED_SOUND_MISSION_MOB_62C},  {"mob_62d", STREAMED_SOUND_MISSION_MOB_62D},
+	{"mob_63a", STREAMED_SOUND_MISSION_MOB_63A},  {"mob_63b", STREAMED_SOUND_MISSION_MOB_63B},  {"mob_63c", STREAMED_SOUND_MISSION_MOB_63C},
+	{"mob_63d", STREAMED_SOUND_MISSION_MOB_63D},  {"mob_63e", STREAMED_SOUND_MISSION_MOB_63E},  {"mob_63f", STREAMED_SOUND_MISSION_MOB_63F},
+	{"mob_63g", STREAMED_SOUND_MISSION_MOB_63G},  {"mob_63h", STREAMED_SOUND_MISSION_MOB_63H},  {"mob_63i", STREAMED_SOUND_MISSION_MOB_63I},
+	{"mob_63j", STREAMED_SOUND_MISSION_MOB_63J},  {"mob_66a", STREAMED_SOUND_MISSION_MOB_66A},  {"mob_66b", STREAMED_SOUND_MISSION_MOB_66B},
+	{"mob_68a", STREAMED_SOUND_MISSION_MOB_68A},  {"mob_68b", STREAMED_SOUND_MISSION_MOB_68B},  {"mob_68c", STREAMED_SOUND_MISSION_MOB_68C},
+	{"mob_68d", STREAMED_SOUND_MISSION_MOB_68D},  {"mob_70a", STREAMED_SOUND_MISSION_MOB_70A},  {"mob_70b", STREAMED_SOUND_MISSION_MOB_70B},
+	{"mob_71a", STREAMED_SOUND_MISSION_MOB_71A},  {"mob_71b", STREAMED_SOUND_MISSION_MOB_71B},  {"mob_71c", STREAMED_SOUND_MISSION_MOB_71C},
+	{"mob_71d", STREAMED_SOUND_MISSION_MOB_71D},  {"mob_71e", STREAMED_SOUND_MISSION_MOB_71E},  {"mob_71f", STREAMED_SOUND_MISSION_MOB_71F},
+	{"mob_71g", STREAMED_SOUND_MISSION_MOB_71G},  {"mob_71h", STREAMED_SOUND_MISSION_MOB_71H},  {"mob_71i", STREAMED_SOUND_MISSION_MOB_71I},
+	{"mob_71j", STREAMED_SOUND_MISSION_MOB_71J},  {"mob_71k", STREAMED_SOUND_MISSION_MOB_71K},  {"mob_71l", STREAMED_SOUND_MISSION_MOB_71L},
+	{"mob_71m", STREAMED_SOUND_MISSION_MOB_71M},  {"mob_71n", STREAMED_SOUND_MISSION_MOB_71N},  {"mob_72a", STREAMED_SOUND_MISSION_MOB_72A},
+	{"mob_72b", STREAMED_SOUND_MISSION_MOB_72B},  {"mob_72c", STREAMED_SOUND_MISSION_MOB_72C},  {"mob_72d", STREAMED_SOUND_MISSION_MOB_72D},
+	{"mob_72e", STREAMED_SOUND_MISSION_MOB_72E},  {"mob_72f", STREAMED_SOUND_MISSION_MOB_72F},  {"mob_72g", STREAMED_SOUND_MISSION_MOB_72G},
+	{"mob_73a", STREAMED_SOUND_MISSION_MOB_73A},  {"mob_73c", STREAMED_SOUND_MISSION_MOB_73C},  {"mob_73d", STREAMED_SOUND_MISSION_MOB_73D},
+	{"mob_73f", STREAMED_SOUND_MISSION_MOB_73F},  {"mob_73g", STREAMED_SOUND_MISSION_MOB_73G},  {"mob_73i", STREAMED_SOUND_MISSION_MOB_73I},
+	{"mob_95a", STREAMED_SOUND_MISSION_MOB_95A},  {"mob_96a", STREAMED_SOUND_MISSION_MOB_96A},  {"mob_98a", STREAMED_SOUND_MISSION_MOB_98A},
+	{"mob_99a", STREAMED_SOUND_MISSION_MOB_99A},  {"job1_1b", STREAMED_SOUND_MISSION_JOB1_1B},  {"job1_1c", STREAMED_SOUND_MISSION_JOB1_1C},
+	{"job1_1d", STREAMED_SOUND_MISSION_JOB1_1D},  {"job2_1b", STREAMED_SOUND_MISSION_JOB2_1B},  {"job2_2", STREAMED_SOUND_MISSION_JOB2_2},
+	{"job2_3", STREAMED_SOUND_MISSION_JOB2_3},    {"job2_4", STREAMED_SOUND_MISSION_JOB2_4},    {"job2_5", STREAMED_SOUND_MISSION_JOB2_5},
+	{"job2_6", STREAMED_SOUND_MISSION_JOB2_6},    {"job2_7", STREAMED_SOUND_MISSION_JOB2_7},    {"job2_8", STREAMED_SOUND_MISSION_JOB2_8},
+	{"job2_9", STREAMED_SOUND_MISSION_JOB2_9},    {"job3_1", STREAMED_SOUND_MISSION_JOB3_1},    {"job3_2", STREAMED_SOUND_MISSION_JOB3_2},
+	{"job3_3", STREAMED_SOUND_MISSION_JOB3_3},    {"job4_1", STREAMED_SOUND_MISSION_JOB4_1},    {"job4_2", STREAMED_SOUND_MISSION_JOB4_2},
+	{"job4_3", STREAMED_SOUND_MISSION_JOB4_3},    {"job5_1", STREAMED_SOUND_MISSION_JOB5_1},    {"job5_2", STREAMED_SOUND_MISSION_JOB5_2},
+	{"job5_3", STREAMED_SOUND_MISSION_JOB5_3},    {"bjm1_20", STREAMED_SOUND_MISSION_BJM1_20},  {"bjm1_4", STREAMED_SOUND_MISSION_BJM1_4},
+	{"bjm1_5", STREAMED_SOUND_MISSION_BJM1_5},    {"merc_39", STREAMED_SOUND_MISSION_MERC_39},  {"mono_1", STREAMED_SOUND_MISSION_MONO_1},
+	{"mono_2", STREAMED_SOUND_MISSION_MONO_2},    {"mono_3", STREAMED_SOUND_MISSION_MONO_3},    {"mono_4", STREAMED_SOUND_MISSION_MONO_4},
+	{"mono_5", STREAMED_SOUND_MISSION_MONO_5},    {"mono_6", STREAMED_SOUND_MISSION_MONO_6},    {"mono_7", STREAMED_SOUND_MISSION_MONO_7},
+	{"mono_8", STREAMED_SOUND_MISSION_MONO_8},    {"mono_9", STREAMED_SOUND_MISSION_MONO_9},    {"mono10", STREAMED_SOUND_MISSION_MONO10},
+	{"mono11", STREAMED_SOUND_MISSION_MONO11},    {"mono12", STREAMED_SOUND_MISSION_MONO12},    {"mono13", STREAMED_SOUND_MISSION_MONO13},
+	{"mono14", STREAMED_SOUND_MISSION_MONO14},    {"mono15", STREAMED_SOUND_MISSION_MONO15},    {"mono16", STREAMED_SOUND_MISSION_MONO16},
+	{"fud_01", STREAMED_SOUND_MISSION_FUD_01},    {"fud_02", STREAMED_SOUND_MISSION_FUD_02},    {"fud_03", STREAMED_SOUND_MISSION_FUD_03},
+	{"fud_04", STREAMED_SOUND_MISSION_FUD_04},    {"fud_05", STREAMED_SOUND_MISSION_FUD_05},    {"fud_06", STREAMED_SOUND_MISSION_FUD_06},
+	{"fud_07", STREAMED_SOUND_MISSION_FUD_07},    {"fud_08", STREAMED_SOUND_MISSION_FUD_08},    {"fud_09", STREAMED_SOUND_MISSION_FUD_09},
+	{"fud_10", STREAMED_SOUND_MISSION_FUD_10},    {"fud_11", STREAMED_SOUND_MISSION_FUD_11},    {"fud_12", STREAMED_SOUND_MISSION_FUD_12},
+	{"fud_13", STREAMED_SOUND_MISSION_FUD_13},    {"fud_14", STREAMED_SOUND_MISSION_FUD_14},    {"fud_15", STREAMED_SOUND_MISSION_FUD_15},
+	{"fud_16", STREAMED_SOUND_MISSION_FUD_16},    {"fud_17", STREAMED_SOUND_MISSION_FUD_17},    {"fud_18", STREAMED_SOUND_MISSION_FUD_18},
+	{"fud_19", STREAMED_SOUND_MISSION_FUD_19},    {"fud_20", STREAMED_SOUND_MISSION_FUD_20},    {"burg_01", STREAMED_SOUND_MISSION_BURG_01},
+	{"burg_02", STREAMED_SOUND_MISSION_BURG_02},  {"burg_03", STREAMED_SOUND_MISSION_BURG_03},  {"burg_04", STREAMED_SOUND_MISSION_BURG_04},
+	{"burg_05", STREAMED_SOUND_MISSION_BURG_05},  {"burg_06", STREAMED_SOUND_MISSION_BURG_06},  {"burg_07", STREAMED_SOUND_MISSION_BURG_07},
+	{"burg_08", STREAMED_SOUND_MISSION_BURG_08},  {"burg_09", STREAMED_SOUND_MISSION_BURG_09},  {"burg_10", STREAMED_SOUND_MISSION_BURG_10},
+	{"burg_11", STREAMED_SOUND_MISSION_BURG_11},  {"burg_12", STREAMED_SOUND_MISSION_BURG_12},  {"crust01", STREAMED_SOUND_MISSION_CRUST01},
+	{"crust02", STREAMED_SOUND_MISSION_CRUST02},  {"crust03", STREAMED_SOUND_MISSION_CRUST03},  {"crust04", STREAMED_SOUND_MISSION_CRUST04},
+	{"crust05", STREAMED_SOUND_MISSION_CRUST05},  {"crust06", STREAMED_SOUND_MISSION_CRUST06},  {"crust07", STREAMED_SOUND_MISSION_CRUST07},
+	{"crust08", STREAMED_SOUND_MISSION_CRUST08},  {"crust09", STREAMED_SOUND_MISSION_CRUST09},  {"band_01", STREAMED_SOUND_MISSION_BAND_01},
+	{"band_02", STREAMED_SOUND_MISSION_BAND_02},  {"band_03", STREAMED_SOUND_MISSION_BAND_03},  {"band_04", STREAMED_SOUND_MISSION_BAND_04},
+	{"band_05", STREAMED_SOUND_MISSION_BAND_05},  {"band_06", STREAMED_SOUND_MISSION_BAND_06},  {"band_07", STREAMED_SOUND_MISSION_BAND_07},
+	{"band_08", STREAMED_SOUND_MISSION_BAND_08},  {"shaft01", STREAMED_SOUND_MISSION_SHAFT01},  {"shaft02", STREAMED_SOUND_MISSION_SHAFT02},
+	{"shaft03", STREAMED_SOUND_MISSION_SHAFT03},  {"shaft04", STREAMED_SOUND_MISSION_SHAFT04},  {"shaft05", STREAMED_SOUND_MISSION_SHAFT05},
+	{"shaft06", STREAMED_SOUND_MISSION_SHAFT06},  {"shaft07", STREAMED_SOUND_MISSION_SHAFT07},  {"shaft08", STREAMED_SOUND_MISSION_SHAFT08},
+	{"piss_01", STREAMED_SOUND_MISSION_PISS_01},  {"piss_02", STREAMED_SOUND_MISSION_PISS_02},  {"piss_03", STREAMED_SOUND_MISSION_PISS_03},
+	{"piss_04", STREAMED_SOUND_MISSION_PISS_04},  {"piss_05", STREAMED_SOUND_MISSION_PISS_05},  {"piss_06", STREAMED_SOUND_MISSION_PISS_06},
+	{"piss_07", STREAMED_SOUND_MISSION_PISS_07},  {"piss_08", STREAMED_SOUND_MISSION_PISS_08},  {"piss_09", STREAMED_SOUND_MISSION_PISS_09},
+	{"piss_10", STREAMED_SOUND_MISSION_PISS_10},  {"piss_11", STREAMED_SOUND_MISSION_PISS_11},  {"piss_12", STREAMED_SOUND_MISSION_PISS_12},
+	{"piss_13", STREAMED_SOUND_MISSION_PISS_13},  {"piss_14", STREAMED_SOUND_MISSION_PISS_14},  {"piss_15", STREAMED_SOUND_MISSION_PISS_15},
+	{"piss_16", STREAMED_SOUND_MISSION_PISS_16},  {"piss_17", STREAMED_SOUND_MISSION_PISS_17},  {"piss_18", STREAMED_SOUND_MISSION_PISS_18},
+	{"piss_19", STREAMED_SOUND_MISSION_PISS_19},  {"gimme01", STREAMED_SOUND_MISSION_GIMME01},  {"gimme02", STREAMED_SOUND_MISSION_GIMME02},
+	{"gimme03", STREAMED_SOUND_MISSION_GIMME03},  {"gimme04", STREAMED_SOUND_MISSION_GIMME04},  {"gimme05", STREAMED_SOUND_MISSION_GIMME05},
+	{"gimme06", STREAMED_SOUND_MISSION_GIMME06},  {"gimme07", STREAMED_SOUND_MISSION_GIMME07},  {"gimme08", STREAMED_SOUND_MISSION_GIMME08},
+	{"gimme09", STREAMED_SOUND_MISSION_GIMME09},  {"gimme10", STREAMED_SOUND_MISSION_GIMME10},  {"gimme11", STREAMED_SOUND_MISSION_GIMME11},
+	{"gimme12", STREAMED_SOUND_MISSION_GIMME12},  {"gimme13", STREAMED_SOUND_MISSION_GIMME13},  {"gimme14", STREAMED_SOUND_MISSION_GIMME14},
+	{"gimme15", STREAMED_SOUND_MISSION_GIMME15},  {"bust_01", STREAMED_SOUND_MISSION_BUST_01},  {"bust_02", STREAMED_SOUND_MISSION_BUST_02},
+	{"bust_03", STREAMED_SOUND_MISSION_BUST_03},  {"bust_04", STREAMED_SOUND_MISSION_BUST_04},  {"bust_05", STREAMED_SOUND_MISSION_BUST_05},
+	{"bust_06", STREAMED_SOUND_MISSION_BUST_06},  {"bust_07", STREAMED_SOUND_MISSION_BUST_07},  {"bust_08", STREAMED_SOUND_MISSION_BUST_08},
+	{"bust_09", STREAMED_SOUND_MISSION_BUST_09},  {"bust_10", STREAMED_SOUND_MISSION_BUST_10},  {"bust_11", STREAMED_SOUND_MISSION_BUST_11},
+	{"bust_12", STREAMED_SOUND_MISSION_BUST_12},  {"bust_13", STREAMED_SOUND_MISSION_BUST_13},  {"bust_14", STREAMED_SOUND_MISSION_BUST_14},
+	{"bust_15", STREAMED_SOUND_MISSION_BUST_15},  {"bust_16", STREAMED_SOUND_MISSION_BUST_16},  {"bust_17", STREAMED_SOUND_MISSION_BUST_17},
+	{"bust_18", STREAMED_SOUND_MISSION_BUST_18},  {"bust_19", STREAMED_SOUND_MISSION_BUST_19},  {"bust_20", STREAMED_SOUND_MISSION_BUST_20},
+	{"bust_21", STREAMED_SOUND_MISSION_BUST_21},  {"bust_22", STREAMED_SOUND_MISSION_BUST_22},  {"bust_23", STREAMED_SOUND_MISSION_BUST_23},
+	{"bust_24", STREAMED_SOUND_MISSION_BUST_24},  {"bust_25", STREAMED_SOUND_MISSION_BUST_25},  {"bust_26", STREAMED_SOUND_MISSION_BUST_26},
+	{"bust_27", STREAMED_SOUND_MISSION_BUST_27},  {"bust_28", STREAMED_SOUND_MISSION_BUST_28},  {nil, 0} };
 
 int32
 FindMissionAudioSfx(const char *name)
@@ -8644,23 +5601,7 @@ FindMissionAudioSfx(const char *name)
 bool
 cAudioManager::MissionScriptAudioUsesPoliceChannel(int32 soundMission) const
 {
-	switch (soundMission) {
-	case STREAMED_SOUND_MISSION_J6_D:
-	case STREAMED_SOUND_MISSION_T4_A:
-	case STREAMED_SOUND_MISSION_S1_H:
-	case STREAMED_SOUND_MISSION_S3_B:
-	case STREAMED_SOUND_MISSION_EL3_A:
-	case STREAMED_SOUND_MISSION_A3_A:
-	case STREAMED_SOUND_MISSION_A5_A:
-	case STREAMED_SOUND_MISSION_K1_A:
-	case STREAMED_SOUND_MISSION_R1_A:
-	case STREAMED_SOUND_MISSION_R5_A:
-	case STREAMED_SOUND_MISSION_LO2_A:
-	case STREAMED_SOUND_MISSION_LO6_A:
-		return true;
-	default:
-		return false;
-	}
+	return false;
 }
 
 void
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index c58d0a39..b64b8bac 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -241,82 +241,7 @@ public:
 
 	// functions returning talk sfx,
 	// order from GetPedCommentSfx
-	uint32 GetPlayerTalkSfx(int16 sound);
-	uint32 GetCopTalkSfx(int16 sound);
-	uint32 GetSwatTalkSfx(int16 sound);
-	uint32 GetFBITalkSfx(int16 sound);
-	uint32 GetArmyTalkSfx(int16 sound);
-	uint32 GetMedicTalkSfx(int16 sound);
-	uint32 GetFiremanTalkSfx(int16 sound);
-	uint32 GetNormalMaleTalkSfx(int16 sound);
-	uint32 GetTaxiDriverTalkSfx(int16 sound);
-	uint32 GetPimpTalkSfx(int16 sound);
-	uint32 GetMafiaTalkSfx(int16 sound);
-	uint32 GetTriadTalkSfx(int16 sound);
-	uint32 GetDiabloTalkSfx(int16 sound);
-	uint32 GetYakuzaTalkSfx(int16 sound);
-	uint32 GetYardieTalkSfx(int16 sound);
-	uint32 GetColumbianTalkSfx(int16 sound);
-	uint32 GetHoodTalkSfx(int16 sound);
-	uint32 GetBlackCriminalTalkSfx(int16 sound);
-	uint32 GetWhiteCriminalTalkSfx(int16 sound);
-	uint32 GetMaleNo2TalkSfx(int16 sound);
-	uint32 GetBlackProjectMaleTalkSfx(int16 sound, int32 model);
-	uint32 GetWhiteFatMaleTalkSfx(int16 sound);
-	uint32 GetBlackFatMaleTalkSfx(int16 sound);
-	uint32 GetBlackCasualFemaleTalkSfx(int16 sound);
-	uint32 GetWhiteCasualFemaleTalkSfx(int16 sound);
-	uint32 GetFemaleNo3TalkSfx(int16 sound);
-	uint32 GetBlackFatFemaleTalkSfx(int16 sound);
-	uint32 GetWhiteFatFemaleTalkSfx(int16 sound);
-	uint32 GetBlackFemaleProstituteTalkSfx(int16 sound);
-	uint32 GetWhiteFemaleProstituteTalkSfx(int16 sound);
-	uint32 GetBlackProjectFemaleOldTalkSfx(int16 sound);
-	uint32 GetBlackProjectFemaleYoungTalkSfx(int16 sound);
-	uint32 GetChinatownMaleOldTalkSfx(int16 sound);
-	uint32 GetChinatownMaleYoungTalkSfx(int16 sound);
-	uint32 GetChinatownFemaleOldTalkSfx(int16 sound);
-	uint32 GetChinatownFemaleYoungTalkSfx(int16 sound);
-	uint32 GetLittleItalyMaleTalkSfx(int16 sound);
-	uint32 GetLittleItalyFemaleOldTalkSfx(int16 sound);
-	uint32 GetLittleItalyFemaleYoungTalkSfx(int16 sound);
-	uint32 GetWhiteDockerMaleTalkSfx(int16 sound);
-	uint32 GetBlackDockerMaleTalkSfx(int16 sound);
-	uint32 GetScumMaleTalkSfx(int16 sound);
-	uint32 GetScumFemaleTalkSfx(int16 sound);
-	uint32 GetWhiteWorkerMaleTalkSfx(int16 sound);
-	uint32 GetBlackWorkerMaleTalkSfx(int16 sound);
-	uint32 GetBusinessMaleYoungTalkSfx(int16 sound, int32 model);
-	uint32 GetBusinessMaleOldTalkSfx(int16 sound);
-	uint32 GetWhiteBusinessFemaleTalkSfx(int16 sound, int32 model);
-	uint32 GetBlackBusinessFemaleTalkSfx(int16 sound);
-	uint32 GetSupermodelMaleTalkSfx(int16 sound);
-	uint32 GetSupermodelFemaleTalkSfx(int16 sound);
-	uint32 GetStewardMaleTalkSfx(int16 sound);
-	uint32 GetStewardFemaleTalkSfx(int16 sound);
-	uint32 GetFanMaleTalkSfx(int16 sound, int32 model);
-	uint32 GetFanFemaleTalkSfx(int16 sound);
-	uint32 GetHospitalMaleTalkSfx(int16 sound);
-	uint32 GetHospitalFemaleTalkSfx(int16 sound);
-	uint32 GetWhiteConstructionWorkerTalkSfx(int16 sound);
-	uint32 GetBlackConstructionWorkerTalkSfx(int16 sound);
-	uint32 GetShopperFemaleTalkSfx(int16 sound, int32 model);
-	uint32 GetStudentMaleTalkSfx(int16 sound);
-	uint32 GetStudentFemaleTalkSfx(int16 sound);
-	uint32 GetCasualMaleOldTalkSfx(int16 sound);
-
-	uint32 GetSpecialCharacterTalkSfx(int32 modelIndex, int32 sound);
-	uint32 GetEightTalkSfx(int16 sound);
-	uint32 GetFrankieTalkSfx(int16 sound);
-	uint32 GetMistyTalkSfx(int16 sound);
-	uint32 GetOJGTalkSfx(int16 sound);
-	uint32 GetCatatalinaTalkSfx(int16 sound);
-	uint32 GetBomberTalkSfx(int16 sound);
-	uint32 GetSecurityGuardTalkSfx(int16 sound);
-	uint32 GetChunkyTalkSfx(int16 sound);
-
-	uint32 GetGenericMaleTalkSfx(int16 sound);
-	uint32 GetGenericFemaleTalkSfx(int16 sound);
+	// TODO: miami
 	// end of functions returning talk sfx
 
 	void GenerateIntegerRandomNumberTable();
@@ -363,18 +288,17 @@ public:
 	/// processX - main logic of adding new sounds
 	void ProcessActiveQueues();
 	bool ProcessAirBrakes(cVehicleParams *params);
-	void ProcessAirportScriptObject(uint8 sound);
 	bool ProcessBoatEngine(cVehicleParams *params);
 	bool ProcessBoatMovingOverWater(cVehicleParams *params);
+#ifdef GTA_BRIDGE
 	void ProcessBridge();
 	void ProcessBridgeMotor();
 	void ProcessBridgeOneShots();
 	void ProcessBridgeWarning();
+#endif
 	bool ProcessCarBombTick(cVehicleParams *params);
 	void ProcessCesna(cVehicleParams *params);
-	void ProcessCinemaScriptObject(uint8 sound);
-	void ProcessCrane();
-	void ProcessDocksScriptObject(uint8 sound);
+	//void ProcessCrane();
 	bool ProcessEngineDamage(cVehicleParams *params);
 	void ProcessEntity(int32 sound);
 	void ProcessExplosions(int32 explosion);
@@ -383,7 +307,6 @@ public:
 	void ProcessFrontEnd();
 	void ProcessGarages();
 	bool ProcessHelicopter(cVehicleParams *params);
-	void ProcessHomeScriptObject(uint8 sound);
 	void ProcessJumbo(cVehicleParams *);
 	void ProcessJumboAccel(CPlane *plane);
 	void ProcessJumboDecel(CPlane *plane);
@@ -391,28 +314,24 @@ public:
 	void ProcessJumboLanding(CPlane *plane);
 	void ProcessJumboTakeOff(CPlane *plane);
 	void ProcessJumboTaxi();
-	void ProcessLaunderetteScriptObject(uint8 sound);
 	void ProcessLoopingScriptObject(uint8 sound);
 	void ProcessMissionAudio();
 	void ProcessModelCarEngine(cVehicleParams *params);
 	void ProcessOneShotScriptObject(uint8 sound);
 	void ProcessPed(CPhysical *ped);
-	void ProcessPedHeadphones(cPedParams *params);
 	void ProcessPedOneShots(cPedParams *params);
 	void ProcessPhysical(int32 id);
 	void ProcessPlane(cVehicleParams *params);
 	void ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *automobile);
-	void ProcessPoliceCellBeatingScriptObject(uint8 sound);
-	void ProcessPornCinema(uint8 sound);
 	void ProcessProjectiles();
 	void ProcessRainOnVehicle(cVehicleParams *params);
 	void ProcessReverb() const;
 	bool ProcessReverseGear(cVehicleParams *params);
-	void ProcessSawMillScriptObject(uint8 sound);
 	void ProcessScriptObject(int32 id);
-	void ProcessShopScriptObject(uint8 sound);
 	void ProcessSpecial();
+#ifdef GTA_TRAIN
 	bool ProcessTrainNoise(cVehicleParams *params);
+#endif
 	void ProcessVehicle(CVehicle *vehicle);
 	bool ProcessVehicleDoors(cVehicleParams *params);
 	void ProcessVehicleEngine(cVehicleParams *params);
@@ -425,7 +344,6 @@ public:
 	void ProcessWaterCannon(int32);
 	void ProcessWeather(int32 id);
 	bool ProcessWetRoadNoise(cVehicleParams *params);
-	void ProcessWorkShopScriptObject(uint8 sound);
 
 	int32 RandomDisplacement(uint32 seed) const;
 	void ReacquireDigitalHandle() const;
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index e2721888..64c88f3b 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -12,96 +12,97 @@ enum eSfxSample : uint32
 	SFX_CAR_HORN_PICKUP,
 	SFX_CAR_HORN_PORSCHE,
 	SFX_CAR_HORN_TRUCK,
+
+	SFX_CAR_HELI_MAI, //8
+	SFX_CAR_HELI_MAI2, //9
+	SFX_CAR_HELI_REA, //10
+	SFX_CAR_HELI_STA, //11
+	SFX_CAR_HELI_ROT, //12
+	SFX_CAR_HELI_FAR, //13
+	SFX_CAR_HELI_ROL, //14
+
 	SFX_OLD_CAR_DOOR_OPEN,
 	SFX_OLD_CAR_DOOR_CLOSE,
 	SFX_NEW_CAR_DOOR_OPEN,
 	SFX_NEW_CAR_DOOR_CLOSE,
 	SFX_TRUCK_DOOR_OPEN,
 	SFX_TRUCK_DOOR_CLOSE,
-	SFX_REMOTE_CONTROLLED_CAR,
 	SFX_REVERSE_GEAR,
 	SFX_REVERSE_GEAR_2,
-	SFX_CAR_STARTER,
-	SFX_ROAD_NOISE,
-	SFX_SKID,
-	SFX_GRAVEL_SKID,
+	SFX_CAR_STARTER, //23
+	SFX_ROAD_NOISE, //24
+	SFX_SKID, //25
+	SFX_GRAVEL_SKID, //26
 	SFX_POLICE_SIREN_SLOW,
-	SFX_SIREN_FAST,
+	SFX_SIREN_FAST, //28
 	SFX_AMBULANCE_SIREN_SLOW,
 	SFX_REVERSE_WARNING,
 	SFX_ICE_CREAM_TUNE,
-	SFX_CAR_ALARM_1,
-	SFX_AIR_BRAKES,
-	SFX_SQUEAKY_BRAKES,
-	SFX_TYRE_BUMP,
-	SFX_TRAIN_FAR,
-	SFX_TRAIN_NEAR,
+	SFX_AIR_BRAKES, //32
+	SFX_TYRE_BUMP, //33
+	SFX_TYRE_BURST_B, //34
+	SFX_TYRE_BURST, //35
+	SFX_TYRE_BURST_L, //36
+	SFX_PALM_TREE_LO, //37
+	SFX_BULLET_PASS_1, //38
+	SFX_BULLET_PASS_2, //39
+	SFX_SKATE_1, //40
+	SFX_SKATE_2, //41
 	SFX_FOOTSTEP_CONCRETE_1,
 	SFX_FOOTSTEP_CONCRETE_2,
 	SFX_FOOTSTEP_CONCRETE_3,
 	SFX_FOOTSTEP_CONCRETE_4,
 	SFX_FOOTSTEP_CONCRETE_5,
-	SFX_FOOTSTEP_GRASS_1,
-	SFX_FOOTSTEP_GRASS_2,
-	SFX_FOOTSTEP_GRASS_3,
-	SFX_FOOTSTEP_GRASS_4,
-	SFX_FOOTSTEP_GRASS_5,
-	SFX_FOOTSTEP_GRAVEL_1,
-	SFX_FOOTSTEP_GRAVEL_2,
-	SFX_FOOTSTEP_GRAVEL_3,
-	SFX_FOOTSTEP_GRAVEL_4,
-	SFX_FOOTSTEP_GRAVEL_5,
-	SFX_FOOTSTEP_WOOD_1,
-	SFX_FOOTSTEP_WOOD_2,
-	SFX_FOOTSTEP_WOOD_3,
-	SFX_FOOTSTEP_WOOD_4,
-	SFX_FOOTSTEP_WOOD_5,
-	SFX_FOOTSTEP_METAL_1,
-	SFX_FOOTSTEP_METAL_2,
-	SFX_FOOTSTEP_METAL_3,
-	SFX_FOOTSTEP_METAL_4,
-	SFX_FOOTSTEP_METAL_5,
-	SFX_FOOTSTEP_WATER_1,
-	SFX_FOOTSTEP_WATER_2,
-	SFX_FOOTSTEP_WATER_3,
-	SFX_FOOTSTEP_WATER_4,
-	SFX_FOOTSTEP_SAND_1,
-	SFX_FOOTSTEP_SAND_2,
-	SFX_FOOTSTEP_SAND_3,
-	SFX_FOOTSTEP_SAND_4,
-	SFX_EXPLOSION_2,
-	SFX_EXPLOSION_3,
-	SFX_COLT45_LEFT,
-	SFX_COLT45_RIGHT,
-	SFX_M16_LEFT,
-	SFX_M16_RIGHT,
-	SFX_AK47_LEFT,
-	SFX_AK47_RIGHT,
-	SFX_UZI_LEFT,
-	SFX_UZI_RIGHT,
-	SFX_UZI_END_LEFT,
-	SFX_UZI_END_RIGHT,
-	SFX_SNIPER_LEFT,
-	SFX_SNIPER_RIGHT,
-	SFX_ROCKET_LEFT,
-	SFX_ROCKET_RIGHT,
-	SFX_ROCKET_FLY,
-	SFX_FLAMETHROWER_LEFT,
-	SFX_FLAMETHROWER_RIGHT,
-	SFX_FLAMETHROWER_START_LEFT,
-	SFX_FLAMETHROWER_START_RIGHT,
-	SFX_SHOTGUN_LEFT,
-	SFX_SHOTGUN_RIGHT,
-	SFX_PISTOL_RELOAD,
-	SFX_AK47_RELOAD,
-	SFX_M16_RELOAD,
-	SFX_ROCKET_RELOAD,
-	SFX_RIFLE_RELOAD,
-	SFX_COL_TARMAC_1,
-	SFX_COL_TARMAC_2,
-	SFX_COL_TARMAC_3,
-	SFX_COL_TARMAC_4,
-	SFX_COL_TARMAC_5,
+	SFX_EXPLOSION_1, //47
+	SFX_EXPLOSION_2, //48
+	SFX_EXPLOSION_3, //49
+	SFX_COLT45_LEFT, //50
+	SFX_COLT45_RIGHT, //51
+	SFX_AK47_LEFT, //52
+	SFX_AK47_RIGHT, //53
+	SFX_UZI_LEFT, //54
+	SFX_UZI_RIGHT, //55
+	SFX_UZI_END_LEFT, //56
+	SFX_SNIPER_LEFT, //57
+	SFX_SNIPER_RIGHT, //58
+	SFX_ROCKET_LEFT, //59
+	SFX_ROCKET_RIGHT, //60
+	SFX_ROCKET_FLY, //61
+	SFX_FLAMETHROWER_LEFT, //62
+	SFX_FLAMETHROWER_RIGHT, //63
+	SFX_FLAMETHROWER_START_LEFT, //64
+	SFX_FLAMETHROWER_START_RIGHT, //65
+	SFX_SHOTGUN_LEFT, //66
+	SFX_SHOTGUN_RIGH, //67
+	SFX_M60_LEFT, //68
+	SFX_M60_RIGHT, //69
+	SFX_M60_TAIL_LEFT, //70
+	SFX_TEC_LEFT, //71
+	SFX_TEC_RIGHT, //72
+	SFX_TEC_TAIL, //73
+	SFX_RUGER_LEFT, //74
+	SFX_RUGER_RIGHT, //75
+	SFX_RUGER_TAIL, //76
+	SFX_PISTOL_RELOAD, //77
+	SFX_AK47_RELOAD, //78
+	SFX_ROCKET_RELOAD, //79
+	SFX_RIFLE_RELOAD, //80
+	SFX_GOLF_CLUB_SWING, //81
+	SFX_MINIGUN_FIRE_LEFT, //82
+	SFX_MINIGUN_FIRE_RIGHT, //83
+	SFX_MINIGUN_STOP, //84
+	SFX_SPAS12_LEFT, //85
+	SFX_SPAS12_RIGHT, //86
+	SFX_SPAS12_TAIL_LEFT, //87
+	SFX_PYTHON_LEFT, //88
+	SFX_PYTHON_RIGHT, //89
+	SFX_MP5_LEFT, //90
+	SFX_MP5_RIGHT, //91
+	SFX_COL_TARMAC_1, //92
+	SFX_COL_TARMAC_2, //93
+	SFX_COL_TARMAC_3, //94
+	SFX_COL_TARMAC_4, //95
+	SFX_COL_TARMAC_5, //96
 	SFX_COL_GRASS_1,
 	SFX_COL_GRAVEL_1,
 	SFX_COL_MUD_1,
@@ -120,11 +121,8 @@ enum eSfxSample : uint32
 	SFX_COL_METAL_CHAIN_FENCE_2,
 	SFX_COL_METAL_CHAIN_FENCE_3,
 	SFX_COL_METAL_CHAIN_FENCE_4,
-	SFX_COL_PED_1,
-	SFX_COL_PED_2,
-	SFX_COL_PED_3,
-	SFX_COL_PED_4,
-	SFX_COL_PED_5,
+	SFX_COL_PED_1, //115
+	SFX_COL_PED_2, //116
 	SFX_COL_SAND_1,
 	SFX_COL_WOOD_CRATES_1,
 	SFX_COL_WOOD_CRATES_2,
@@ -135,69 +133,79 @@ enum eSfxSample : uint32
 	SFX_COL_WOOD_BENCH_3,
 	SFX_COL_WOOD_BENCH_4,
 	SFX_COL_WOOD_SOLID_1,
-	SFX_COL_VEG_1,
-	SFX_COL_VEG_2,
-	SFX_COL_VEG_3,
-	SFX_COL_VEG_4,
-	SFX_COL_VEG_5,
+	SFX_COL_VEG_1, //127
+	SFX_COL_VEG_2, //128
+	SFX_COL_VEG_3, //129
+	SFX_COL_VEG_4, //130
+	SFX_COL_VEG_5, //131
 	SFX_COL_CONTAINER_1,
 	SFX_COL_NEWS_VENDOR_1,
 	SFX_COL_NEWS_VENDOR_2,
 	SFX_COL_NEWS_VENDOR_3,
-	SFX_COL_CAR_1,
-	SFX_COL_CAR_2,
-	SFX_COL_CAR_3,
-	SFX_COL_CAR_4,
-	SFX_COL_CAR_5,
+	SFX_COL_CAR_1, //136
+	SFX_COL_CAR_2, //137
+	SFX_COL_CAR_3, //138
+	SFX_COL_CAR_4, //139
+	SFX_COL_CAR_5, //140
 	SFX_COL_CARDBOARD_1,
 	SFX_COL_CARDBOARD_2,
-	SFX_COL_GATE,
-	SFX_SCRAPE_CAR_1,
+	SFX_COL_GATE, //143
+	SFX_SCRAPE_CAR_1, //144
 	SFX_CRATE_SMASH,
-	SFX_GLASS_CRACK,
-	SFX_GLASS_SMASH,
+	SFX_GLASS_CRACK, //146
+	SFX_GLASS_SMASH, //147
 	SFX_GLASS_SHARD_1,
 	SFX_GLASS_SHARD_2,
 	SFX_GLASS_SHARD_3,
 	SFX_GLASS_SHARD_4,
-	SFX_PED_ON_FIRE,
-	SFX_CAR_ON_FIRE,
-	SFX_RAIN,
-	SFX_PICKUP_1_LEFT,
-	SFX_PICKUP_1_RIGHT,
-	SFX_PICKUP_2_LEFT,
-	SFX_PICKUP_2_RIGHT,
-	SFX_PICKUP_3_LEFT,
-	SFX_PICKUP_3_RIGHT,
-	SFX_PICKUP_ERROR_LEFT,
-	SFX_PICKUP_ERROR_RIGHT,
+	SFX_PED_ON_FIRE, //152
+	SFX_CAR_ON_FIRE, //153
+	SFX_RAIN, //154
+	SFX_HURRICANE_MA, //155
 	SFX_BULLET_SHELL_HIT_GROUND_1,
 	SFX_BULLET_SHELL_HIT_GROUND_2,
-	SFX_BULLET_PED,
-	SFX_BULLET_CAR_1,
-	SFX_BULLET_CAR_2,
-	SFX_BULLET_CAR_3,
-	SFX_BULLET_CAR_4,
-	SFX_BULLET_CAR_5,
-	SFX_BULLET_CAR_6,
-	SFX_BULLET_WALL_1,
-	SFX_BULLET_WALL_2,
-	SFX_BULLET_WALL_3,
-	SFX_BAT_HIT_LEFT,
-	SFX_BAT_HIT_RIGHT,
-	SFX_FIGHT_1,
-	SFX_FIGHT_2,
-	SFX_FIGHT_4,
-	SFX_FIGHT_5,
-	SFX_GARAGE_DOOR_LOOP,
-	SFX_COUNTDOWN,
-	SFX_ARM_BOMB,
-	SFX_POLICE_RADIO_CRACKLE,
+	SFX_BULLET_PED, //158
+	SFX_BULLET_CAR_1, //159
+	SFX_BULLET_CAR_2, //160
+	SFX_BULLET_CAR_3, //161
+	SFX_BULLET_WALL_1, //162
+	SFX_BULLET_WALL_2, //163
+	SFX_BULLET_WALL_3, //164
+	SFX_BAT_HIT_LEFT, //165
+	SFX_BAT_HIT_RIGH, //166
+	SFX_FIGHT_1, //167
+	SFX_FIGHT_2, //168
+	SFX_FIGHT_4, //169
+	SFX_FIGHT_5, //170
+	SFX_KNIFE_SWING, //171
+	SFX_KNIFE_SLASH, //172
+	SFX_KNIFE_STAB, //173
+	SFX_HAMMER_HIT_1, //174
+	SFX_HAMMER_HIT_2, //175
+	SFX_GARAGE_DOOR_LOOP, //176
+	SFX_COUNTDOWN, //177
+	SFX_ARM_BOMB, //178
+	SFX_POLICE_RADIO_CRACKLE, //179
+
 	SFX_WEVE_GOT,
 	SFX_THERES,
 	SFX_RESPOND_TO,
-	SFX_A_10_1,
-	SFX_A_10_2,
+	SFX_A_10,
+	SFX_IN,
+	SFX_NORTH,
+	SFX_EAST,
+	SFX_SOUTH,
+	SFX_WEST,
+	SFX_CENTRAL,
+	SFX_POLICE_RADIO_MESSAGE_NOISE_1,
+	SFX_POLICE_RADIO_SUSPECT,
+	SFX_POLICE_RADIO_LAST_SEEN,
+	SFX_POLICE_RADIO_ON_FOOT,
+	SFX_POLICE_RADIO_IN_A,
+	SFX_POLICE_RADIO_DARK,
+	SFX_POLICE_RADIO_LIGHT,
+	SFX_POLICE_RADIO_BRIGHT,
+
 	SFX_CRIME_1,
 	SFX_CRIME_2,
 	SFX_CRIME_3,
@@ -210,48 +218,20 @@ enum eSfxSample : uint32
 	SFX_CRIME_10,
 	SFX_CRIME_11,
 	SFX_CRIME_12,
-	SFX_IN,
-	SFX_NORTH,
-	SFX_EAST,
-	SFX_SOUTH,
-	SFX_WEST,
-	SFX_CENTRAL,
-	SFX_POLICE_RADIO_MESSAGE_NOISE_1,
-	SFX_POLICE_RADIO_MESSAGE_NOISE_2,
-	SFX_POLICE_RADIO_MESSAGE_NOISE_3,
-	SFX_POLICE_RADIO_LIBERTY_CITY,
-	SFX_POLICE_RADIO_PORTLAND,
-	SFX_POLICE_RADIO_STAUNTON_ISLAND,
-	SFX_POLICE_RADIO_SHORESIDE_VALE,
-	SFX_POLICE_RADIO_ROCKFORD,
-	SFX_POLICE_RADIO_FORT_STAUNTON,
-	SFX_POLICE_RADIO_ASPATRIA,
-	SFX_POLICE_RADIO_TORRINGTON,
-	SFX_POLICE_RADIO_BEDFORD_POINT,
-	SFX_POLICE_RADIO_NEWPORT,
-	SFX_POLICE_RADIO_BELLEVILLE_PARK,
-	SFX_POLICE_RADIO_LIBERTY_CAMPUS,
-	SFX_POLICE_RADIO_COCHRANE_DAM,
-	SFX_POLICE_RADIO_PIKE_CREEK,
-	SFX_POLICE_RADIO_CEDAR_GROVE,
-	SFX_POLICE_RADIO_WICHITA_GARDENS,
-	SFX_POLICE_RADIO_FRANCIS_INTERNATIONAL_AIRPORT,
-	SFX_POLICE_RADIO_CALLAHAN_POINT,
-	SFX_POLICE_RADIO_ATLANTIC_QUAYS,
-	SFX_POLICE_RADIO_PORTLAND_HARBOUR,
-	SFX_POLICE_RADIO_TRENTON,
-	SFX_POLICE_RADIO_CHINATOWN,
-	SFX_POLICE_RADIO_RED_LIGHT_DISTRICT,
-	SFX_POLICE_RADIO_HEPBURN_HEIGHTS,
-	SFX_POLICE_RADIO_SAINT_MARKS,
-	SFX_POLICE_RADIO_HARWOOD,
-	SFX_POLICE_RADIO_PORTLAND_BEACH,
-	SFX_POLICE_RADIO_PORTLAND_STRAIGHTS, // shouldn't be used anymore
-	SFX_POLICE_RADIO_SUSPECT,
-	SFX_POLICE_RADIO_LAST_SEEN,
-	SFX_POLICE_RADIO_ON_FOOT,
-	SFX_POLICE_RADIO_IN_A,
-	SFX_POLICE_RADIO_IN_AN,
+	SFX_POLICE_RADIO_VICE_CITY,
+	SFX_POLICE_RADIO_VICE_CITY_BEACH,
+	SFX_POLICE_RADIO_VICE_CITY_MAINLAND,
+	SFX_POLICE_RADIO_OCEAN_BEACH, //???
+	SFX_POLICE_RADIO_WASHINGTON_BEACH,
+	SFX_POLICE_RADIO_VICE_POINT,
+	SFX_POLICE_RADIO_LEAF_LINKS,
+	SFX_POLICE_RADIO_STRAFISH_ISLAND, //???????????
+	SFX_POLICE_RADIO_VICE_PORT,
+	SFX_POLICE_RADIO_LITTLE_HAVANA,
+	SFX_POLICE_RADIO_LITTLE_HAITI,
+	SFX_POLICE_RADIO_PRAWN_ISLAND, //??????????? IS THAT HOW SHE PRONOUNCES ISLAND?
+	SFX_POLICE_RADIO_DOWNTOWN,
+	SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL,
 	SFX_POLICE_RADIO_BLACK,
 	SFX_POLICE_RADIO_WHITE,
 	SFX_POLICE_RADIO_BLUE,
@@ -262,2892 +242,349 @@ enum eSfxSample : uint32
 	SFX_POLICE_RADIO_ORANGE,
 	SFX_POLICE_RADIO_GREEN,
 	SFX_POLICE_RADIO_SILVER,
-	SFX_POLICE_RADIO_DARK,
-	SFX_POLICE_RADIO_LIGHT,
-	SFX_POLICE_RADIO_BRIGHT,
 	SFX_POLICE_RADIO_AMBULANCE,
-	SFX_POLICE_RADIO_VAN,
-	SFX_POLICE_RADIO_TRUCK,
-	SFX_POLICE_RADIO_SALOON,
-	SFX_POLICE_RADIO_SPORTS_CAR,
-	SFX_POLICE_RADIO_BUGGY,
-	SFX_POLICE_RADIO_TAXI,
-	SFX_POLICE_RADIO_CRUISER,
-	SFX_POLICE_RADIO_BUS,
 	SFX_POLICE_RADIO_2_DOOR,
+	SFX_POLICE_RADIO_TRUCK,
 	SFX_POLICE_RADIO_FIRE_TRUCK,
-	SFX_POLICE_RADIO_BOAT,
 	SFX_POLICE_RADIO_PICKUP,
-	SFX_POLICE_RADIO_ICE_CREAM_VAN,
-	SFX_POLICE_RADIO_LIMO,
 	SFX_POLICE_RADIO_POLICE_CAR,
-	SFX_POLICE_RADIO_CONVERTIBLE,
-	SFX_POLICE_RADIO_SUBWAY_CAR,
+	SFX_POLICE_RADIO_BOAT,
+	SFX_POLICE_RADIO_BUGGY,
+	SFX_POLICE_RADIO_BUS,
+	SFX_POLICE_RADIO_COACH,
+	SFX_POLICE_RADIO_CRUISER,
+	SFX_POLICE_RADIO_DINGHY,
+	SFX_POLICE_RADIO_GARBAGE_TRUCK,
+	SFX_POLICE_RADIO_GOLF_CART,
+	SFX_POLICE_RADIO_HEARSE,
+	SFX_POLICE_RADIO_HELICOPTER,
+	SFX_POLICE_RADIO_ICE_CREAM_VAN,
+	SFX_POLICE_RADIO_LOWRIDER,
+	SFX_POLICE_RADIO_MOPED,
+	SFX_POLICE_RADIO_MOTOBIKE,
+	SFX_POLICE_RADIO_OFFROAD,
+	SFX_POLICE_RADIO_PLANE,
+	SFX_POLICE_RADIO_RIG,
+	SFX_POLICE_RADIO_SEDAN,
+	SFX_POLICE_RADIO_SPEEDBOAT,
+	SFX_POLICE_RADIO_SPORTS_CAR,
+	SFX_POLICE_RADIO_STATION_WAGON,
+	SFX_POLICE_RADIO_STRETCH,
+	SFX_POLICE_RADIO_SWAT_VAN,
 	SFX_POLICE_RADIO_TANK,
-	SFX_HELI_1,
-	SFX_HELI_2,
-	SFX_HELI_3,
-	SFX_PHONE_RING,
-	SFX_CAR_REV_1,
-	SFX_CAR_REV_2,
-	SFX_CAR_REV_3,
-	SFX_CAR_REV_4,
-	SFX_CAR_REV_5,
-	SFX_CAR_REV_6,
-	SFX_CAR_REV_7,
-	SFX_CAR_REV_8,
-	SFX_CAR_REV_9,
-	SFX_CAR_REV_10,
-	SFX_CAR_IDLE_1,
-	SFX_CAR_IDLE_2,
-	SFX_CAR_IDLE_3,
-	SFX_CAR_IDLE_4,
-	SFX_CAR_IDLE_5,
-	SFX_CAR_IDLE_6,
-	SFX_CAR_IDLE_7,
-	SFX_CAR_IDLE_8,
-	SFX_CAR_IDLE_9,
-	SFX_CAR_IDLE_10,
+	SFX_POLICE_RADIO_TAXI,
+	SFX_POLICE_RADIO_VAN,
+
+	SFX_HELI_1, //198
+	SFX_PHONE_RING, //199
+	SFX_CAR_REV_1, //PONT
+	SFX_CAR_REV_2, //PORSHE
+	SFX_CAR_REV_3, //SPIDER
+	SFX_CAR_REV_4, //MERC
+	SFX_CAR_REV_5, //TRUC
+	SFX_CAR_REV_6, //HOTROD
+	SFX_CAR_REV_7, //COBRA
+	SFX_CAR_REV_8, //PONT2
+	SFX_CAR_REV_9, // CADI
+	SFX_CAR_REV_10, //PATHFINDER
+	SFX_CAR_REV_11, //PACARD
+	SFX_CAR_REV_12, //GOLFCART
+	SFX_CAR_REV_13, //SFX_CAR_IDLE_GOL
+	SFX_CAR_REV_14, //SFX_CAR_IDLE_GOL
+	SFX_CAR_REV_15, //SFX_CAR_IDLE_GOL
+	SFX_CAR_REV_16, //SFX_CAR_IDLE_GOL
+	SFX_CAR_REV_17, //VTWI
+	SFX_MOPED_REV, // just moped
+	SFX_CAR_REV_19, //HOND(A)
+	SFX_CAR_REV_20, //SPOR(TCAR)
+	SFX_CAR_IDLE_1, //PONT
+	SFX_CAR_IDLE_2, //PORSHE
+	SFX_CAR_IDLE_3, //SPIDER
+	SFX_CAR_IDLE_4, //MERC
+	SFX_CAR_IDLE_5, //TRUC
+	SFX_CAR_IDLE_6, //HOTROD
+	SFX_CAR_IDLE_7, //COBRA
+	SFX_CAR_IDLE_8, //PONT2
+	SFX_CAR_IDLE_9, //CADI
+	SFX_CAR_IDLE_10, //PATHFINDER
+	SFX_CAR_IDLE_11, //PACARD
+	SFX_CAR_IDLE_12, //GOLFCART
+	SFX_CAR_IDLE_13, //SFX_CAR_IDLE_GOL
+	SFX_CAR_IDLE_14, //SFX_CAR_IDLE_GOL
+	SFX_CAR_IDLE_15, //SFX_CAR_IDLE_GOL
+	SFX_CAR_IDLE_16, //SFX_CAR_IDLE_GOL
+	SFX_CAR_IDLE_17, //VTWI
+	SFX_MOPED_IDLE, //237
+	SFX_CAR_IDLE_19, //HOND(A)
+	SFX_CAR_IDLE_20, //SPOR(TCAR)
 	SFX_JUMBO_DIST_FLY,
-	SFX_JUMBO_TAXI,
-	SFX_JUMBO_WHINE,
-	SFX_JUMBO_ENGINE,
-	SFX_JUMBO_RUMBLE,
+	SFX_JUMBO_TAXI, //241
+	SFX_JUMBO_WHINE, //242
+	SFX_JUMBO_ENGINE, //243
+	SFX_JUMBO_RUMBLE, //244
 	SFX_JUMBO_LAND_WHEELS,
-	SFX_POLICE_BOAT_IDLE,
-	SFX_POLICE_BOAT_ACCEL,
-	SFX_POLICE_BOAT_THUMB_OFF,
+	SFX_BOAT_CRUISER_LOOP, //246
+	SFX_BOAT_V12_LOOP, //247
 	SFX_BOAT_WATER_LOOP,
 	SFX_BOAT_SPLASH_1,
 	SFX_BOAT_SPLASH_2,
 	SFX_FISHING_BOAT_IDLE,
-	SFX_CESNA_IDLE,
-	SFX_CESNA_REV,
-	SFX_CAR_RAIN_1,
-	SFX_CAR_RAIN_2,
-	SFX_CAR_RAIN_3,
-	SFX_CAR_RAIN_4,
-	SFX_SPLASH_1,
-	SFX_PED_CRUNCH_1,
-	SFX_PED_CRUNCH_2,
-	SFX_HEADPHONES,
+	SFX_CAR_RAIN_1, //252
+	SFX_CAR_RAIN_2, //253
+	SFX_CAR_RAIN_3, //254
+	SFX_CAR_RAIN_4, //255
+	SFX_SPLASH_1, //256
+	SFX_PED_CRUNCH_1, //257
+	SFX_PED_CRUNCH_2, //258
 	SFX_WOODEN_BOX_SMASH,
 	SFX_CARDBOARD_BOX_SMASH,
 	SFX_ERROR_FIRE_ROCKET_LAUNCHER,
 	SFX_ERROR_FIRE_RIFLE,
-	SFX_TANK_TURRET,
-	SFX_CRANE_MAGNET,
+	SFX_TANK_TURRET, //263
 	SFX_BODY_LAND_AND_FALL,
-	SFX_BODY_LAND,
-	SFX_BOMB_BEEP,
-	SFX_TIMER_BEEP,
-	SFX_PART_MISSION_COMPLETE,
-	SFX_START_BUTTON_LEFT,
-	SFX_START_BUTTON_RIGHT,
+	SFX_BODY_LAND, //265
+	SFX_BOMB_BEEP, //266
+	SFX_TIMER_BEEP, //267
 	SFX_SUSPENSION_FAST_MOVE,
 	SFX_SUSPENSION_SLOW_MOVE_LOOP,
 	SFX_SHAG_SUSPENSION,
-	SFX_RADIO_CLICK,
-	SFX_INFO,
+	SFX_HIT_BALL, //271
+	SFX_ARCADE, //272
+	SFX_CESNA_IDLE, //273
+	SFX_CESNA_REV, //274
+	SFX_RADIO_CLICK, //275
+	SFX_RADIO_DIAL_1, //276
+	SFX_RADIO_DIAL_2, //277
+	SFX_RADIO_DIAL_3, //278
+
+	//pc only
+	SFX_RADIO_DIAL_4,
+	SFX_RADIO_DIAL_5,
+	SFX_RADIO_DIAL_6,
+	SFX_RADIO_DIAL_7,
+	SFX_RADIO_DIAL_8,
+	SFX_RADIO_DIAL_9,
+	SFX_RADIO_DIAL_10,
+	SFX_RADIO_DIAL_11,
+	SFX_RADIO_DIAL_12,
+
+	SFX_INFO_LEFT, //279
+	SFX_INFO_RIGHT, //280
+	SFX_INFO_CENTRE, //281
+	SFX_MONEY_LEFT, //282
+	SFX_MONEY_RIGHT, //283
+	SFX_WEAPON_LEFT, //284
+	SFX_WEAPON_RIGHT, //285
+	SFX_WEAPON_CENTRE, //286
+	SFX_PART_MISSION_COMPLETE_LEFT, //287
+	SFX_PART_MISSION_COMPLETE_RIGHT, //288
+	SFX_PART_MISSION_COMPLETE_CENTRE, //289
+	SFX_GO_LEFT, //290
+	SFX_GO_RIGHT, //291
+	SFX_GO_CENTRE, //292
+	SFX_TIMER, //293
+	SFX_EMPTY, //294
+
+	SFX_FE_HIGHLIGHT_LEFT, //
+	SFX_FE_HIGHLIGHT_RIGHT, //
+	SFX_FE_SELECT_LEFT, //
+	SFX_FE_SELECT_RIGHT, //
+	SFX_FE_BACK_LEFT, //
+	SFX_FE_BACK_RIGHT, //
+	SFX_FE_ERROR_LEFT, //
+	SFX_FE_ERROR_RIGHT, //
+	SFX_FE_NOISE_BURST_1,
+	SFX_FE_NOISE_BURST_2,
+	SFX_FE_NOISE_BURST_3,
 
-	// bank 1
 	SFX_CAR_ACCEL_1,
 	SFX_CAR_AFTER_ACCEL_1,
 	SFX_CAR_FINGER_OFF_ACCEL_1,
 
-	// bank 2
 	SFX_CAR_ACCEL_2,
 	SFX_CAR_AFTER_ACCEL_2,
 	SFX_CAR_FINGER_OFF_ACCEL_2,
 
-	// bank 3
 	SFX_CAR_ACCEL_3,
 	SFX_CAR_AFTER_ACCEL_3,
 	SFX_CAR_FINGER_OFF_ACCEL_3,
 
-	// bank 4
 	SFX_CAR_ACCEL_4,
 	SFX_CAR_AFTER_ACCEL_4,
 	SFX_CAR_FINGER_OFF_ACCEL_4,
 
-	// bank 5
 	SFX_CAR_ACCEL_5,
 	SFX_CAR_AFTER_ACCEL_5,
 	SFX_CAR_FINGER_OFF_ACCEL_5,
 
-	// bank 6
 	SFX_CAR_ACCEL_6,
 	SFX_CAR_AFTER_ACCEL_6,
 	SFX_CAR_FINGER_OFF_ACCEL_6,
 
-	// bank 7
 	SFX_CAR_ACCEL_7,
 	SFX_CAR_AFTER_ACCEL_7,
 	SFX_CAR_FINGER_OFF_ACCEL_7,
 
-	// bank 8
 	SFX_CAR_ACCEL_8,
 	SFX_CAR_AFTER_ACCEL_8,
 	SFX_CAR_FINGER_OFF_ACCEL_8,
 
-	// bank 9
 	SFX_CAR_ACCEL_9,
 	SFX_CAR_AFTER_ACCEL_9,
 	SFX_CAR_FINGER_OFF_ACCEL_9,
 
-	// bank 10
-	SFX_PAGE_CHANGE_AND_BACK_LEFT,
-	SFX_PAGE_CHANGE_AND_BACK_RIGHT,
-	SFX_HIGHLIGHT_LEFT,
-	SFX_HIGHLIGHT_RIGHT,
-	SFX_SELECT_LEFT,
-	SFX_SELECT_RIGHT,
-	SFX_SUB_MENU_BACK_LEFT,
-	SFX_SUB_MENU_BACK_RIGHT,
-	SFX_STEREO_LEFT,
-	SFX_STEREO_RIGHT,
-	SFX_MONO,
-	SFX_NOISE_BURST_1,
-	SFX_NOISE_BURST_2,
-	SFX_NOISE_BURST_3,
-	SFX_ERROR_LEFT,
-	SFX_ERROR_RIGHT,
-
-	// bank 11
-	SFX_TRAIN_STATION_AMBIENCE_LOOP,
-	SFX_TRAIN_STATION_ANNOUNCE,
-
-	// bank 12
-	SFX_CLUB_1,
-
-	// bank 13
-	SFX_CLUB_2,
-
-	// bank 14
-	SFX_CLUB_3,
-
-	// bank 15
-	SFX_CLUB_4,
-
-	// bank 16
-	SFX_CLUB_5,
-
-	// bank 17
-	SFX_CLUB_6,
-
-	// bank 18
-	SFX_CLUB_7,
-
-	// bank 19
-	SFX_CLUB_8,
-
-	// bank 20
-	SFX_CLUB_9,
-
-	// bank 21
-	SFX_CLUB_10,
-
-	// bank 22
-	SFX_CLUB_11,
-
-	// bank 23
-	SFX_CLUB_12,
-
-	// bank 24
-	SFX_CLUB_RAGGA,
-
-	// bank 25
-	SFX_STRIP_CLUB_1,
-
-	// bank 26
-	SFX_STRIP_CLUB_2,
-
-	// bank 27
-	SFX_WORKSHOP_1,
-
-	// bank 28
-	SFX_PIANO_BAR_1,
-
-	// bank 29
-	SFX_SAWMILL_LOOP,
-	SFX_SAWMILL_CUT_WOOD,
-
-	// bank 30
-	SFX_DOG_FOOD_FACTORY,
-
-	// bank 31
-	SFX_LAUNDERETTE_LOOP,
-	SFX_LAUNDERETTE_SONG_LOOP,
-
-	// bank 32
-	SFX_RESTAURANT_CHINATOWN,
-
-	// bank 33
-	SFX_RESTAURANT_ITALY,
-
-	// bank 34
-	SFX_RESTAURANT_GENERIC_1,
-
-	// bank 35
-	SFX_RESTAURANT_GENERIC_2,
-
-	// bank 36
-	SFX_AIRPORT_ANNOUNCEMENT_1,
-	SFX_AIRPORT_ANNOUNCEMENT_2,
-	SFX_AIRPORT_ANNOUNCEMENT_3,
-	SFX_AIRPORT_ANNOUNCEMENT_4,
-
-	// bank 37
-	SFX_SHOP_LOOP,
-	SFX_SHOP_TILL_1,
-	SFX_SHOP_TILL_2,
-
-	// bank 38
-	SFX_CINEMA_BASS_1,
-	SFX_CINEMA_BASS_2,
-	SFX_CINEMA_BASS_3,
-
-	// bank 39
-	SFX_DOCKS_FOGHORN,
-
-	// bank 40
-	SFX_HOME_1,
-	SFX_HOME_2,
-	SFX_HOME_3,
-	SFX_HOME_4,
-	SFX_HOME_5,
-
-	// bank 41
-	SFX_PORN_1_LOOP,
-	SFX_PORN_1_GROAN_1,
-	SFX_PORN_1_GROAN_2,
-
-	// bank 42
-	SFX_PORN_2_LOOP,
-	SFX_PORN_2_GROAN_1,
-	SFX_PORN_2_GROAN_2,
+	SFX_CAR_ACCEL_10,
+	SFX_CAR_AFTER_ACCEL_10,
+	SFX_CAR_FINGER_OFF_ACCEL_10,
+
+	SFX_CAR_ACCEL_11,
+	SFX_CAR_AFTER_ACCEL_11,
+	SFX_CAR_FINGER_OFF_ACCEL_11,
+
+	SFX_CAR_ACCEL_12,
+	SFX_CAR_AFTER_ACCEL_12,
+	SFX_CAR_FINGER_OFF_ACCEL_12,
+
+	// some CHAINSAW STUFF
+	//SFX_CAR_CHAINSAW, //10973
+	//SFX_CAR_CHAINSAW, //10974
+	//SFX_CAR_CHAINSAW, //10975
+	SFX_CAR_ACCEL_13,
+	SFX_CAR_AFTER_ACCEL_13,
+	SFX_CAR_FINGER_OFF_ACCEL_13,
+
+	SFX_RC_IDLE, //10976
+	SFX_RC_REV, //10977
+	SFX_RC_EMPTY, //10978
+
+	SFX_CAR_RC_HELI, //10979
+	SFX_CAR_AFTER_ACCEL_15, // empty
+	SFX_CAR_FINGER_OFF_ACCEL_15, // empty
+
+	SFX_CAR_ACCEL_16, // empty
+	SFX_CAR_AFTER_ACCEL_16, // empty
+	SFX_CAR_FINGER_OFF_ACCEL_16, // empty
+
+	// bike stuff apparently
+	SFX_CAR_ACCEL_17,
+	SFX_CAR_AFTER_ACCEL_17,
+	SFX_CAR_FINGER_OFF_ACCEL_17,
+	SFX_CAR_WIND_17,
+
+	SFX_CAR_ACCEL_18,
+	SFX_CAR_AFTER_ACCEL_18,
+	SFX_CAR_FINGER_OFF_ACCEL_18,
+	SFX_CAR_WIND_18,
+
+	SFX_CAR_ACCEL_19,
+	SFX_CAR_AFTER_ACCEL_19,
+	SFX_CAR_FINGER_OFF_ACCEL_19,
+	SFX_CAR_WIND_19,
+
+	SFX_CAR_ACCEL_20,
+	SFX_CAR_AFTER_ACCEL_20,
+	SFX_CAR_FINGER_OFF_ACCEL_20,
+	SFX_CAR_WIND_20,
+
+	// some emptinnes here
+	SFX_CAR_ACCEL_21,
+	SFX_CAR_AFTER_ACCEL_21,
+	SFX_CAR_FINGER_OFF_ACCEL_21,
+	SFX_CAR_ACCEL_22,
+	SFX_CAR_AFTER_ACCEL_22,
+	SFX_CAR_FINGER_OFF_ACCEL_22,
+
+	SFX_HELI_APACHE_1,
+	SFX_HELI_APACHE_2,
+	SFX_HELI_APACHE_3,
+	SFX_HELI_APACHE_4,
+
+	// something padded for more heli?
+	SFX_HELI_UNUSED_1,
+	SFX_HELI_UNUSED_2,
+	SFX_HELI_UNUSED_3,
+	SFX_HELI_UNUSED_4,
+
+	SFX_SEAPLANE_PRO1, //11018
+	SFX_SEAPLANE_PRO2, //11019
+	SFX_SEAPLANE_PRO3, //11020
+	SFX_SEAPLANE_PRO4, //11021
+	// low fuel
+	SFX_SEAPLANE_LOW, //11022
+
+	// something padded for more plane?
+	SFX_PLANE_UNUSED_1,
+	SFX_PLANE_UNUSED_2,
+	SFX_PLANE_UNUSED_3,
+	SFX_PLANE_UNUSED_4,
+
+	// script objects
+	SFX_BUILDINGS_BANK_ALARM, //11027
+	SFX_BUILDING_SNORE, //11028
+	SFX_BUILDING_BAR_1, //11029
+	SFX_BUILDING_BAR_2, //11030
+	SFX_BUILDING_BAR_3, //11031
+	SFX_BUILDING_BAR_4, //11032
+	SFX_BUILDING_MAL1, //11033
+	SFX_BUILDING_MAL2, //11034
+	SFX_BUILDING_MAL3, //11035
+	SFX_BUILDING_STR1, //11036
+	SFX_BUILDING_STR2, //11037
+	SFX_BUILDING_STR3, //11038
+	SFX_BUILDING_CHURCH, //11039
+	SFX_BUILDING_FAN_1, //11040
+	SFX_BUILDING_FAN_2, //11041
+	SFX_BUILDING_FAN_3, //11042
+	SFX_BUILDING_FAN_4, //11043
+	SFX_BUILDING_INSECTS_1, //11044
+	SFX_BUILDING_INSECTS_2, //11045
+	SFX_BUILDING_INSECTS_3, //11046
+	SFX_BUILDING_INSECTS_4, //11047
+	SFX_BUILDING_INSECTS_5, //11048
+	SFX_CLUB_1, //11049
+	SFX_CLUB_2, //11050
+	SFX_CLUB_3, //11051
+	SFX_CLUB_4, //11052
 
-	// bank 43
-	SFX_PORN_3_LOOP,
-	SFX_PORN_3_GROAN_1,
-	SFX_PORN_3_GROAN_2,
-
-	// bank 44
-	SFX_POLICE_BALL_1,
-
-	// bank 45
-	SFX_BANK_ALARM_1,
-
-	// bank 46
-	SFX_RAVE_INDUSTRIAL,
-
-	// bank 47
-	SFX_RAVE_COMMERCIAL,
-
-	// bank 48
-	SFX_RAVE_SUBURBAN,
-
-	// bank 49
-	SFX_RAVE_COMMERCIAL_2,
-
-	// unused banks 50-58
-	SFX_CLUB_1_1,
-	SFX_CLUB_1_2,
-	SFX_CLUB_1_3,
-	SFX_CLUB_1_4,
-	SFX_CLUB_1_5,
-	SFX_CLUB_1_6,
-	SFX_CLUB_1_7,
-	SFX_CLUB_1_8,
-	SFX_CLUB_1_9,
-
-	// bank 59
-	SFX_EXPLOSION_1,
-	SFX_BRIDGE_OPEN_WARNING,
+	SFX_FOOTSTEP_GRASS_1,
+	SFX_FOOTSTEP_GRASS_2,
+	SFX_FOOTSTEP_GRASS_3,
+	SFX_FOOTSTEP_GRASS_4,
+	SFX_FOOTSTEP_GRASS_5,
+	SFX_FOOTSTEP_GRAVEL_1,
+	SFX_FOOTSTEP_GRAVEL_2,
+	SFX_FOOTSTEP_GRAVEL_3,
+	SFX_FOOTSTEP_GRAVEL_4,
+	SFX_FOOTSTEP_GRAVEL_5,
+	SFX_FOOTSTEP_WOOD_1,
+	SFX_FOOTSTEP_WOOD_2,
+	SFX_FOOTSTEP_WOOD_3,
+	SFX_FOOTSTEP_WOOD_4,
+	SFX_FOOTSTEP_WOOD_5,
+	SFX_FOOTSTEP_METAL_1,
+	SFX_FOOTSTEP_METAL_2,
+	SFX_FOOTSTEP_METAL_3,
+	SFX_FOOTSTEP_METAL_4,
+	SFX_FOOTSTEP_METAL_5,
+	SFX_FOOTSTEP_WATER_1,
+	SFX_FOOTSTEP_WATER_2,
+	SFX_FOOTSTEP_WATER_3,
+	SFX_FOOTSTEP_WATER_4,
+	SFX_FOOTSTEP_SAND_1,
+	SFX_FOOTSTEP_SAND_2,
+	SFX_FOOTSTEP_SAND_3,
+	SFX_FOOTSTEP_SAND_4,
 
-	SFX_PAGER, // used to be ped comment on PS2
+	// TODO: miami ped comments... THERE'S OVER 9000
 
-	SFX_COP_VOICE_1_ARREST_1,
-	SFX_COP_VOICE_1_ARREST_2,
-	SFX_COP_VOICE_1_ARREST_3,
-	SFX_COP_VOICE_1_ARREST_4,
-	SFX_COP_VOICE_1_ARREST_5,
-	SFX_COP_VOICE_1_ARREST_6,
-	SFX_COP_VOICE_1_CHASE_1,
-	SFX_COP_VOICE_1_CHASE_2,
-	SFX_COP_VOICE_1_CHASE_3,
-	SFX_COP_VOICE_1_CHASE_4,
-	SFX_COP_VOICE_1_CHASE_5,
-	SFX_COP_VOICE_1_CHASE_6,
-	SFX_COP_VOICE_1_CHASE_7,
-	SFX_COP_VOICE_2_ARREST_1,
-	SFX_COP_VOICE_2_ARREST_2,
-	SFX_COP_VOICE_2_ARREST_3,
-	SFX_COP_VOICE_2_ARREST_4,
-	SFX_COP_VOICE_2_ARREST_5,
-	SFX_COP_VOICE_2_ARREST_6,
-	SFX_COP_VOICE_2_CHASE_1,
-	SFX_COP_VOICE_2_CHASE_2,
-	SFX_COP_VOICE_2_CHASE_3,
-	SFX_COP_VOICE_2_CHASE_4,
-	SFX_COP_VOICE_2_CHASE_5,
-	SFX_COP_VOICE_2_CHASE_6,
-	SFX_COP_VOICE_2_CHASE_7,
-	SFX_COP_VOICE_3_ARREST_1,
-	SFX_COP_VOICE_3_ARREST_2,
-	SFX_COP_VOICE_3_ARREST_3,
-	SFX_COP_VOICE_3_ARREST_4,
-	SFX_COP_VOICE_3_ARREST_5,
-	SFX_COP_VOICE_3_ARREST_6,
-	SFX_COP_VOICE_3_CHASE_1,
-	SFX_COP_VOICE_3_CHASE_2,
-	SFX_COP_VOICE_3_CHASE_3,
-	SFX_COP_VOICE_3_CHASE_4,
-	SFX_COP_VOICE_3_CHASE_5,
-	SFX_COP_VOICE_3_CHASE_6,
-	SFX_COP_VOICE_3_CHASE_7,
-	SFX_COP_VOICE_4_ARREST_1,
-	SFX_COP_VOICE_4_ARREST_2,
-	SFX_COP_VOICE_4_ARREST_3,
-	SFX_COP_VOICE_4_ARREST_4,
-	SFX_COP_VOICE_4_ARREST_5,
-	SFX_COP_VOICE_4_ARREST_6,
-	SFX_COP_VOICE_4_CHASE_1,
-	SFX_COP_VOICE_4_CHASE_2,
-	SFX_COP_VOICE_4_CHASE_3,
-	SFX_COP_VOICE_4_CHASE_4,
-	SFX_COP_VOICE_4_CHASE_5,
-	SFX_COP_VOICE_4_CHASE_6,
-	SFX_COP_VOICE_4_CHASE_7,
-	SFX_COP_VOICE_5_ARREST_1,
-	SFX_COP_VOICE_5_ARREST_2,
-	SFX_COP_VOICE_5_ARREST_3,
-	SFX_COP_VOICE_5_ARREST_4,
-	SFX_COP_VOICE_5_ARREST_5,
-	SFX_COP_VOICE_5_ARREST_6,
-	SFX_COP_VOICE_5_CHASE_1,
-	SFX_COP_VOICE_5_CHASE_2,
-	SFX_COP_VOICE_5_CHASE_3,
-	SFX_COP_VOICE_5_CHASE_4,
-	SFX_COP_VOICE_5_CHASE_5,
-	SFX_COP_VOICE_5_CHASE_6,
-	SFX_COP_VOICE_5_CHASE_7,
-	SFX_SWAT_VOICE_1_CHASE_1,
-	SFX_SWAT_VOICE_1_CHASE_2,
-	SFX_SWAT_VOICE_1_CHASE_3,
-	SFX_SWAT_VOICE_1_CHASE_4,
-	SFX_SWAT_VOICE_1_CHASE_5,
-	SFX_SWAT_VOICE_1_CHASE_6,
-	SFX_SWAT_VOICE_2_CHASE_1,
-	SFX_SWAT_VOICE_2_CHASE_2,
-	SFX_SWAT_VOICE_2_CHASE_3,
-	SFX_SWAT_VOICE_2_CHASE_4,
-	SFX_SWAT_VOICE_2_CHASE_5,
-	SFX_SWAT_VOICE_2_CHASE_6,
-	SFX_SWAT_VOICE_3_CHASE_1,
-	SFX_SWAT_VOICE_3_CHASE_2,
-	SFX_SWAT_VOICE_3_CHASE_3,
-	SFX_SWAT_VOICE_3_CHASE_4,
-	SFX_SWAT_VOICE_3_CHASE_5,
-	SFX_SWAT_VOICE_3_CHASE_6,
-	SFX_SWAT_VOICE_4_CHASE_1,
-	SFX_SWAT_VOICE_4_CHASE_2,
-	SFX_SWAT_VOICE_4_CHASE_3,
-	SFX_SWAT_VOICE_4_CHASE_4,
-	SFX_SWAT_VOICE_4_CHASE_5,
-	SFX_SWAT_VOICE_4_CHASE_6,
-	SFX_FBI_VOICE_1_CHASE_1,
-	SFX_FBI_VOICE_1_CHASE_2,
-	SFX_FBI_VOICE_1_CHASE_3,
-	SFX_FBI_VOICE_1_CHASE_4,
-	SFX_FBI_VOICE_1_CHASE_5,
-	SFX_FBI_VOICE_1_CHASE_6,
-	SFX_FBI_VOICE_2_CHASE_1,
-	SFX_FBI_VOICE_2_CHASE_2,
-	SFX_FBI_VOICE_2_CHASE_3,
-	SFX_FBI_VOICE_2_CHASE_4,
-	SFX_FBI_VOICE_2_CHASE_5,
-	SFX_FBI_VOICE_2_CHASE_6,
-	SFX_FBI_VOICE_3_CHASE_1,
-	SFX_FBI_VOICE_3_CHASE_2,
-	SFX_FBI_VOICE_3_CHASE_3,
-	SFX_FBI_VOICE_3_CHASE_4,
-	SFX_FBI_VOICE_3_CHASE_5,
-	SFX_FBI_VOICE_3_CHASE_6,
-	SFX_POLICE_HELI_1,
-	SFX_POLICE_HELI_2,
-	SFX_POLICE_HELI_3,
-	SFX_POLICE_HELI_4,
-	SFX_POLICE_HELI_5,
-	SFX_POLICE_HELI_6,
-	SFX_POLICE_HELI_7,
-	SFX_POLICE_HELI_8,
-	SFX_POLICE_HELI_9,
-	SFX_POLICE_HELI_10,
-	SFX_POLICE_HELI_11,
-	SFX_POLICE_HELI_12,
-	SFX_POLICE_HELI_13,
-	SFX_POLICE_HELI_14,
-	SFX_POLICE_HELI_15,
-	SFX_POLICE_HELI_16,
-	SFX_POLICE_HELI_17,
-	SFX_POLICE_HELI_18,
-	SFX_POLICE_HELI_19,
-	SFX_POLICE_HELI_20,
-	SFX_POLICE_HELI_21,
-	SFX_POLICE_HELI_22,
-	SFX_POLICE_HELI_23,
-	SFX_POLICE_HELI_24,
-	SFX_POLICE_HELI_25,
-	SFX_POLICE_HELI_26,
-	SFX_POLICE_HELI_27,
-	SFX_POLICE_HELI_28,
-	SFX_POLICE_HELI_29,
-	SFX_CHUNKY_DEATH,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_DOCKER_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_DOCKER_VOICE_1_CHAT_1,
-	SFX_BLACK_DOCKER_VOICE_1_CHAT_2,
-	SFX_BLACK_DOCKER_VOICE_1_CHAT_3,
-	SFX_BLACK_DOCKER_VOICE_1_CHAT_4,
-	SFX_BLACK_DOCKER_VOICE_1_CHAT_5,
-	SFX_BLACK_DOCKER_VOICE_1_DODGE_1,
-	SFX_BLACK_DOCKER_VOICE_1_DODGE_2,
-	SFX_BLACK_DOCKER_VOICE_1_DODGE_3,
-	SFX_BLACK_DOCKER_VOICE_1_DODGE_4,
-	SFX_BLACK_DOCKER_VOICE_1_DODGE_5,
-	SFX_BLACK_DOCKER_VOICE_1_EYING_1,
-	SFX_BLACK_DOCKER_VOICE_1_EYING_2,
-	SFX_BLACK_DOCKER_VOICE_1_EYING_3,
-	SFX_BLACK_DOCKER_VOICE_1_FIGHT_1,
-	SFX_BLACK_DOCKER_VOICE_1_FIGHT_2,
-	SFX_BLACK_DOCKER_VOICE_1_FIGHT_3,
-	SFX_BLACK_DOCKER_VOICE_1_FIGHT_4,
-	SFX_BLACK_DOCKER_VOICE_1_FIGHT_5,
-	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_DOCKER_VOICE_1_GUN_PANIC_3,
-	SFX_ARMY_VOICE_1_CHASE_1,
-	SFX_ARMY_VOICE_1_CHASE_2,
-	SFX_ARMY_VOICE_1_CHASE_3,
-	SFX_ARMY_VOICE_1_CHASE_4,
-	SFX_ARMY_VOICE_1_CHASE_5,
-	SFX_ARMY_VOICE_1_CHASE_6,
-	SFX_ARMY_VOICE_1_CHASE_7,
-	SFX_ARMY_VOICE_1_CHASE_8,
-	SFX_ARMY_VOICE_1_CHASE_9,
-	SFX_ARMY_VOICE_1_CHASE_10,
-	SFX_ARMY_VOICE_1_CHASE_11,
-	SFX_ARMY_VOICE_1_CHASE_12,
-	SFX_ARMY_VOICE_1_CHASE_13,
-	SFX_ARMY_VOICE_1_CHASE_14,
-	SFX_ARMY_VOICE_1_CHASE_15,
-	SFX_ARMY_VOICE_2_CHASE_1,
-	SFX_ARMY_VOICE_2_CHASE_2,
-	SFX_ARMY_VOICE_2_CHASE_3,
-	SFX_ARMY_VOICE_2_CHASE_4,
-	SFX_ARMY_VOICE_2_CHASE_5,
-	SFX_ARMY_VOICE_2_CHASE_6,
-	SFX_ARMY_VOICE_2_CHASE_7,
-	SFX_ARMY_VOICE_2_CHASE_8,
-	SFX_ARMY_VOICE_2_CHASE_9,
-	SFX_ARMY_VOICE_2_CHASE_10,
-	SFX_ARMY_VOICE_2_CHASE_11,
-	SFX_ARMY_VOICE_2_CHASE_12,
-	SFX_ARMY_VOICE_2_CHASE_13,
-	SFX_ARMY_VOICE_2_CHASE_14,
-	SFX_ARMY_VOICE_2_CHASE_15,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_1,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_2,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_3,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_4,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_5,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_6,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_7,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_8,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_9,
-	SFX_CLAUDE_LOW_DAMAGE_GRUNT_10,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_1,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_2,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_3,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_4,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_5,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_6,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_7,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_8,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_9,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_10,
-	SFX_CLAUDE_HIGH_DAMAGE_GRUNT_11,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_1,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_2,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_3,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_4,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_5,
-	SFX_CLAUDE_HIT_GROUND_GRUNT_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DRIVER_ABUSE_7,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_3,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_4,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_5,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_7,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_8,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_9,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CHAT_10,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_3,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_4,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_5,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_7,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_8,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_9,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_DODGE_10,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_3,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_4,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_5,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_CARJACKED_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_MUGGED_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_5,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_RUN_FROM_FIGHT_6,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_1,
-	SFX_BLACK_PROJECT_FEMALE_OLD_VOICE_1_SHOCKED_2,
-	SFX_CHUNKY_RUN_1,
-	SFX_CHUNKY_RUN_2,
-	SFX_CHUNKY_RUN_3,
-	SFX_CHUNKY_RUN_4,
-	SFX_CHUNKY_RUN_5,
-	SFX_PIMP_DRIVER_ABUSE_1,
-	SFX_PIMP_DRIVER_ABUSE_2,
-	SFX_PIMP_DRIVER_ABUSE_3,
-	SFX_PIMP_DRIVER_ABUSE_4,
-	SFX_PIMP_DRIVER_ABUSE_5,
-	SFX_PIMP_CHAT_1,
-	SFX_PIMP_CHAT_2,
-	SFX_PIMP_CHAT_3,
-	SFX_PIMP_CHAT_4,
-	SFX_PIMP_CHAT_5,
-	SFX_PIMP_CHAT_6,
-	SFX_PIMP_CHAT_7,
-	SFX_PIMP_CHAT_8,
-	SFX_PIMP_CHAT_9,
-	SFX_PIMP_CHAT_10,
-	SFX_PIMP_CHAT_11,
-	SFX_PIMP_CHAT_12,
-	SFX_PIMP_CHAT_13,
-	SFX_PIMP_CHAT_14,
-	SFX_PIMP_CHAT_15,
-	SFX_PIMP_CHAT_16,
-	SFX_PIMP_CHAT_17,
-	SFX_PIMP_DODGE_1,
-	SFX_PIMP_DODGE_2,
-	SFX_PIMP_DODGE_3,
-	SFX_PIMP_DODGE_4,
-	SFX_PIMP_DODGE_5,
-	SFX_PIMP_DODGE_6,
-	SFX_PIMP_FIGHT_1,
-	SFX_PIMP_FIGHT_2,
-	SFX_PIMP_FIGHT_3,
-	SFX_PIMP_FIGHT_4,
-	SFX_PIMP_FIGHT_5,
-	SFX_PIMP_FIGHT_6,
-	SFX_PIMP_FIGHT_7,
-	SFX_PIMP_FIGHT_8,
-	SFX_PIMP_FIGHT_9,
-	SFX_PIMP_GUN_COOL_1,
-	SFX_PIMP_GUN_COOL_2,
-	SFX_PIMP_GUN_COOL_3,
-	SFX_PIMP_GUN_COOL_4,
-	SFX_PIMP_GUN_COOL_5,
-	SFX_PIMP_GUN_COOL_6,
-	SFX_PIMP_GUN_COOL_7,
-	SFX_PIMP_CARJACKED_1,
-	SFX_PIMP_CARJACKED_2,
-	SFX_PIMP_CARJACKED_3,
-	SFX_PIMP_CARJACKED_4,
-	SFX_PIMP_SHOCKED_1,
-	SFX_PIMP_SHOCKED_2,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_1,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_2,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_3,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_4,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_5,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_6,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_7,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_8,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_9,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_10,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_11,
-	SFX_NORMAL_MALE_DRIVER_ABUSE_12,
-	SFX_NORMAL_MALE_CHAT_1,
-	SFX_NORMAL_MALE_CHAT_2,
-	SFX_NORMAL_MALE_CHAT_3,
-	SFX_NORMAL_MALE_CHAT_4,
-	SFX_NORMAL_MALE_CHAT_5,
-	SFX_NORMAL_MALE_CHAT_6,
-	SFX_NORMAL_MALE_CHAT_7,
-	SFX_NORMAL_MALE_CHAT_8,
-	SFX_NORMAL_MALE_CHAT_9,
-	SFX_NORMAL_MALE_CHAT_10,
-	SFX_NORMAL_MALE_CHAT_11,
-	SFX_NORMAL_MALE_CHAT_12,
-	SFX_NORMAL_MALE_CHAT_13,
-	SFX_NORMAL_MALE_CHAT_14,
-	SFX_NORMAL_MALE_CHAT_15,
-	SFX_NORMAL_MALE_CHAT_16,
-	SFX_NORMAL_MALE_CHAT_17,
-	SFX_NORMAL_MALE_CHAT_18,
-	SFX_NORMAL_MALE_CHAT_19,
-	SFX_NORMAL_MALE_CHAT_20,
-	SFX_NORMAL_MALE_CHAT_21,
-	SFX_NORMAL_MALE_CHAT_22,
-	SFX_NORMAL_MALE_CHAT_23,
-	SFX_NORMAL_MALE_CHAT_24,
-	SFX_NORMAL_MALE_CHAT_25,
-	SFX_NORMAL_MALE_DODGE_1,
-	SFX_NORMAL_MALE_DODGE_2,
-	SFX_NORMAL_MALE_DODGE_3,
-	SFX_NORMAL_MALE_DODGE_4,
-	SFX_NORMAL_MALE_DODGE_5,
-	SFX_NORMAL_MALE_DODGE_6,
-	SFX_NORMAL_MALE_DODGE_7,
-	SFX_NORMAL_MALE_DODGE_8,
-	SFX_NORMAL_MALE_DODGE_9,
-	SFX_NORMAL_MALE_EYING_1,
-	SFX_NORMAL_MALE_EYING_2,
-	SFX_NORMAL_MALE_EYING_3,
-	SFX_NORMAL_MALE_EYING_4,
-	SFX_NORMAL_MALE_EYING_5,
-	SFX_NORMAL_MALE_EYING_6,
-	SFX_NORMAL_MALE_EYING_7,
-	SFX_NORMAL_MALE_EYING_8,
-	SFX_NORMAL_MALE_GUN_PANIC_1,
-	SFX_NORMAL_MALE_GUN_PANIC_2,
-	SFX_NORMAL_MALE_GUN_PANIC_3,
-	SFX_NORMAL_MALE_GUN_PANIC_4,
-	SFX_NORMAL_MALE_GUN_PANIC_5,
-	SFX_NORMAL_MALE_GUN_PANIC_6,
-	SFX_NORMAL_MALE_GUN_PANIC_7,
-	SFX_NORMAL_MALE_CARJACKED_1,
-	SFX_NORMAL_MALE_CARJACKED_2,
-	SFX_NORMAL_MALE_CARJACKED_3,
-	SFX_NORMAL_MALE_CARJACKED_4,
-	SFX_NORMAL_MALE_CARJACKED_5,
-	SFX_NORMAL_MALE_CARJACKED_6,
-	SFX_NORMAL_MALE_CARJACKED_7,
-	SFX_NORMAL_MALE_RUN_FROM_FIGHT_1,
-	SFX_NORMAL_MALE_RUN_FROM_FIGHT_2,
-	SFX_NORMAL_MALE_RUN_FROM_FIGHT_3,
-	SFX_NORMAL_MALE_RUN_FROM_FIGHT_4,
-	SFX_NORMAL_MALE_RUN_FROM_FIGHT_5,
-	SFX_NORMAL_MALE_SHOCKED_1,
-	SFX_NORMAL_MALE_SHOCKED_2,
-	SFX_NORMAL_MALE_SHOCKED_3,
-	SFX_NORMAL_MALE_SHOCKED_4,
-	SFX_NORMAL_MALE_SHOCKED_5,
-	SFX_NORMAL_MALE_SHOCKED_6,
-	SFX_NORMAL_MALE_SHOCKED_7,
-	SFX_NORMAL_MALE_SHOCKED_8,
-	SFX_NORMAL_MALE_SHOCKED_9,
-	SFX_NORMAL_MALE_SHOCKED_10,
-	SFX_BOMBERMAN_1,
-	SFX_BOMBERMAN_2,
-	SFX_BOMBERMAN_3,
-	SFX_BOMBERMAN_4,
-	SFX_BOMBERMAN_5,
-	SFX_BOMBERMAN_6,
-	SFX_BOMBERMAN_7,
-	SFX_8BALL_DODGE_1,
-	SFX_8BALL_DODGE_2,
-	SFX_8BALL_DODGE_3,
-	SFX_8BALL_DODGE_4,
-	SFX_8BALL_DODGE_5,
-	SFX_8BALL_DODGE_6,
-	SFX_8BALL_DODGE_7,
-	SFX_8BALL_FIGHT_1,
-	SFX_8BALL_FIGHT_2,
-	SFX_8BALL_FIGHT_3,
-	SFX_8BALL_FIGHT_4,
-	SFX_8BALL_FIGHT_5,
-	SFX_8BALL_FIGHT_6,
-	SFX_8BALL_GUN_COOL_1,
-	SFX_8BALL_GUN_COOL_2,
-	SFX_8BALL_MUGGED_1,
-	SFX_8BALL_MUGGED_2,
-	SFX_SALVATORE_DODGE_1,
-	SFX_SALVATORE_DODGE_2,
-	SFX_SALVATORE_DODGE_3,
-	SFX_SALVATORE_FIGHT_1,
-	SFX_SALVATORE_FIGHT_2,
-	SFX_SALVATORE_FIGHT_3,
-	SFX_SALVATORE_FIGHT_4,
-	SFX_SALVATORE_FIGHT_5,
-	SFX_SALVATORE_FIGHT_6,
-	SFX_SALVATORE_GUN_COOL_1,
-	SFX_SALVATORE_GUN_COOL_2,
-	SFX_SALVATORE_GUN_COOL_3,
-	SFX_SALVATORE_GUN_COOL_4,
-	SFX_SALVATORE_MUGGED_1,
-	SFX_SALVATORE_MUGGED_2,
-	SFX_MISTY_DODGE_1,
-	SFX_MISTY_DODGE_2,
-	SFX_MISTY_DODGE_3,
-	SFX_MISTY_DODGE_4,
-	SFX_MISTY_DODGE_5,
-	SFX_MISTY_FIGHT_1,
-	SFX_MISTY_FIGHT_2,
-	SFX_MISTY_FIGHT_3,
-	SFX_MISTY_FIGHT_4,
-	SFX_MISTY_GUN_COOL_1,
-	SFX_MISTY_GUN_COOL_2,
-	SFX_MISTY_GUN_COOL_3,
-	SFX_MISTY_GUN_COOL_4,
-	SFX_MISTY_GUN_COOL_5,
-	SFX_MISTY_HERE_1,
-	SFX_MISTY_HERE_2,
-	SFX_MISTY_HERE_3,
-	SFX_MISTY_HERE_4,
-	SFX_MISTY_MUGGED_1,
-	SFX_MISTY_MUGGED_2,
-	SFX_MEDIC_VOICE_1_GUN_PANIC_1,
-	SFX_MEDIC_VOICE_1_GUN_PANIC_2,
-	SFX_MEDIC_VOICE_1_GUN_PANIC_3,
-	SFX_MEDIC_VOICE_1_GUN_PANIC_4,
-	SFX_MEDIC_VOICE_1_GUN_PANIC_5,
-	SFX_MEDIC_VOICE_1_CARJACKED_1,
-	SFX_MEDIC_VOICE_1_CARJACKED_2,
-	SFX_MEDIC_VOICE_1_CARJACKED_3,
-	SFX_MEDIC_VOICE_1_CARJACKED_4,
-	SFX_MEDIC_VOICE_1_CARJACKED_5,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_5,
-	SFX_MEDIC_VOICE_1_RUN_FROM_FIGHT_6,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_1,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_2,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_3,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_4,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_5,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_6,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_7,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_8,
-	SFX_MEDIC_VOICE_1_GET_OUT_VAN_CHAT_9,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_1,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_2,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_3,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_4,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_5,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_6,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_7,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_8,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_9,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_10,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_11,
-	SFX_MEDIC_VOICE_1_AT_VICTIM_12,
-	SFX_MEDIC_VOICE_2_GUN_PANIC_1,
-	SFX_MEDIC_VOICE_2_GUN_PANIC_2,
-	SFX_MEDIC_VOICE_2_GUN_PANIC_3,
-	SFX_MEDIC_VOICE_2_GUN_PANIC_4,
-	SFX_MEDIC_VOICE_2_GUN_PANIC_5,
-	SFX_MEDIC_VOICE_2_CARJACKED_1,
-	SFX_MEDIC_VOICE_2_CARJACKED_2,
-	SFX_MEDIC_VOICE_2_CARJACKED_3,
-	SFX_MEDIC_VOICE_2_CARJACKED_4,
-	SFX_MEDIC_VOICE_2_CARJACKED_5,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_1,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_2,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_3,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_4,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_5,
-	SFX_MEDIC_VOICE_2_RUN_FROM_FIGHT_6,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_1,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_2,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_3,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_4,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_5,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_6,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_7,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_8,
-	SFX_MEDIC_VOICE_2_GET_OUT_VAN_CHAT_9,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_1,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_2,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_3,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_4,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_5,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_6,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_7,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_8,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_9,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_10,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_11,
-	SFX_MEDIC_VOICE_2_AT_VICTIM_12,
-	SFX_PLASTER_BLOKE_1,
-	SFX_PLASTER_BLOKE_2,
-	SFX_PLASTER_BLOKE_3,
-	SFX_PLASTER_BLOKE_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CHAT_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_DODGE_5,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_EYING_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_4,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_FIGHT_5,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_1,
-	SFX_BLACK_CONSTRUCTION_MALE_VOICE_1_CARJACKED_2,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_1,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_2,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_3,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_4,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_5,
-	SFX_FOOTBALL_FEMALE_VOICE_1_CHAT_6,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_1,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_2,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_3,
-	SFX_FOOTBALL_FEMALE_VOICE_1_DODGE_4,
-	SFX_FOOTBALL_FEMALE_VOICE_1_MUGGED_1,
-	SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_FOOTBALL_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_1,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_2,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_3,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_4,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_5,
-	SFX_FOOTBALL_FEMALE_VOICE_2_CHAT_6,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_1,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_2,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_3,
-	SFX_FOOTBALL_FEMALE_VOICE_2_DODGE_4,
-	SFX_FOOTBALL_FEMALE_VOICE_2_MUGGED_1,
-	SFX_FOOTBALL_FEMALE_VOICE_2_SHOCKED_1,
-	SFX_FOOTBALL_FEMALE_VOICE_2_SHOCKED_2,
-	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_FOOTBALL_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_1,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_2,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_3,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_4,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_5,
-	SFX_FOOTBALL_MALE_VOICE_1_CHAT_6,
-	SFX_FOOTBALL_MALE_VOICE_1_DODGE_1,
-	SFX_FOOTBALL_MALE_VOICE_1_DODGE_2,
-	SFX_FOOTBALL_MALE_VOICE_1_DODGE_3,
-	SFX_FOOTBALL_MALE_VOICE_1_DODGE_4,
-	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_1,
-	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_2,
-	SFX_FOOTBALL_MALE_VOICE_1_FIGHT_3,
-	SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_1,
-	SFX_FOOTBALL_MALE_VOICE_1_SHOCKED_2,
-	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_FOOTBALL_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_1,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_2,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_3,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_4,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_5,
-	SFX_FOOTBALL_MALE_VOICE_2_CHAT_6,
-	SFX_FOOTBALL_MALE_VOICE_2_DODGE_1,
-	SFX_FOOTBALL_MALE_VOICE_2_DODGE_2,
-	SFX_FOOTBALL_MALE_VOICE_2_DODGE_3,
-	SFX_FOOTBALL_MALE_VOICE_2_DODGE_4,
-	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_1,
-	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_2,
-	SFX_FOOTBALL_MALE_VOICE_2_FIGHT_3,
-	SFX_FOOTBALL_MALE_VOICE_2_SHOCKED_1,
-	SFX_FOOTBALL_MALE_VOICE_2_SHOCKED_2,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_MODEL_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_1,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_2,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_3,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_4,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_5,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_6,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_7,
-	SFX_MODEL_FEMALE_VOICE_1_CHAT_8,
-	SFX_MODEL_FEMALE_VOICE_1_DODGE_1,
-	SFX_MODEL_FEMALE_VOICE_1_DODGE_2,
-	SFX_MODEL_FEMALE_VOICE_1_DODGE_3,
-	SFX_MODEL_FEMALE_VOICE_1_DODGE_4,
-	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_MODEL_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_MODEL_FEMALE_VOICE_1_MUGGED_1,
-	SFX_MODEL_FEMALE_VOICE_1_MUGGED_2,
-	SFX_MODEL_FEMALE_VOICE_1_MUGGED_3,
-	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_MODEL_FEMALE_VOICE_1_SHOCKED_5,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_MODEL_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_MODEL_MALE_VOICE_1_CHAT_1,
-	SFX_MODEL_MALE_VOICE_1_CHAT_2,
-	SFX_MODEL_MALE_VOICE_1_CHAT_3,
-	SFX_MODEL_MALE_VOICE_1_CHAT_4,
-	SFX_MODEL_MALE_VOICE_1_CHAT_5,
-	SFX_MODEL_MALE_VOICE_1_CHAT_6,
-	SFX_MODEL_MALE_VOICE_1_DODGE_1,
-	SFX_MODEL_MALE_VOICE_1_DODGE_2,
-	SFX_MODEL_MALE_VOICE_1_DODGE_3,
-	SFX_MODEL_MALE_VOICE_1_DODGE_4,
-	SFX_MODEL_MALE_VOICE_1_DODGE_5,
-	SFX_MODEL_MALE_VOICE_1_DODGE_6,
-	SFX_MODEL_MALE_VOICE_1_EYING_1,
-	SFX_MODEL_MALE_VOICE_1_EYING_2,
-	SFX_MODEL_MALE_VOICE_1_EYING_3,
-	SFX_MODEL_MALE_VOICE_1_FIGHT_1,
-	SFX_MODEL_MALE_VOICE_1_FIGHT_2,
-	SFX_MODEL_MALE_VOICE_1_FIGHT_3,
-	SFX_MODEL_MALE_VOICE_1_FIGHT_4,
-	SFX_MODEL_MALE_VOICE_1_FIGHT_5,
-	SFX_MODEL_MALE_VOICE_1_CARJACKED_1,
-	SFX_MODEL_MALE_VOICE_1_CARJACKED_2,
-	SFX_MODEL_MALE_VOICE_1_MUGGED_1,
-	SFX_MODEL_MALE_VOICE_1_MUGGED_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_3,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_4,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_5,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CHAT_6,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_3,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_4,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_DODGE_5,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_EYING_3,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_3,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_4,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_5,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_FIGHT_6,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_GUN_PANIC_2,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_1,
-	SFX_CHINATOWN_MALE_YOUNG_VOICE_1_CARJACKED_2,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_SCUM_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_SCUM_MALE_VOICE_1_CHAT_1,
-	SFX_SCUM_MALE_VOICE_1_CHAT_2,
-	SFX_SCUM_MALE_VOICE_1_CHAT_3,
-	SFX_SCUM_MALE_VOICE_1_CHAT_4,
-	SFX_SCUM_MALE_VOICE_1_CHAT_5,
-	SFX_SCUM_MALE_VOICE_1_CHAT_6,
-	SFX_SCUM_MALE_VOICE_1_CHAT_7,
-	SFX_SCUM_MALE_VOICE_1_CHAT_8,
-	SFX_SCUM_MALE_VOICE_1_CHAT_9,
-	SFX_SCUM_MALE_VOICE_1_DODGE_1,
-	SFX_SCUM_MALE_VOICE_1_DODGE_2,
-	SFX_SCUM_MALE_VOICE_1_DODGE_3,
-	SFX_SCUM_MALE_VOICE_1_DODGE_4,
-	SFX_SCUM_MALE_VOICE_1_DODGE_5,
-	SFX_SCUM_MALE_VOICE_1_EYING_1,
-	SFX_SCUM_MALE_VOICE_1_EYING_2,
-	SFX_SCUM_MALE_VOICE_1_EYING_3,
-	SFX_SCUM_MALE_VOICE_1_EYING_4,
-	SFX_SCUM_MALE_VOICE_1_EYING_5,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_1,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_2,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_3,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_4,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_5,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_6,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_7,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_8,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_9,
-	SFX_SCUM_MALE_VOICE_1_FIGHT_10,
-	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_4,
-	SFX_SCUM_MALE_VOICE_1_GUN_PANIC_5,
-	SFX_SCUM_MALE_VOICE_1_LOST_1,
-	SFX_SCUM_MALE_VOICE_1_LOST_2,
-	SFX_SCUM_MALE_VOICE_1_LOST_3,
-	SFX_SCUM_MALE_VOICE_1_MUGGED_1,
-	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_SCUM_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_1,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_2,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_3,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_4,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_5,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_6,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_7,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_8,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_9,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_10,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_11,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_12,
-	SFX_SCUM_FEMALE_VOICE_1_CHAT_13,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_1,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_2,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_3,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_4,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_5,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_6,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_7,
-	SFX_SCUM_FEMALE_VOICE_1_DODGE_8,
-	SFX_SCUM_FEMALE_VOICE_1_FIGHT_1,
-	SFX_SCUM_FEMALE_VOICE_1_FIGHT_2,
-	SFX_SCUM_FEMALE_VOICE_1_FIGHT_3,
-	SFX_SCUM_FEMALE_VOICE_1_FIGHT_4,
-	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_SCUM_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_SCUM_FEMALE_VOICE_1_MUGGED_1,
-	SFX_SCUM_FEMALE_VOICE_1_MUGGED_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_3,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_4,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_5,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_6,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CHAT_7,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_3,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_4,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_DODGE_5,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_3,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_GUN_PANIC_4,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_CARJACKED_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_MUGGED_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_1,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_2,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_3,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_4,
-	SFX_BLACK_PROJECT_FEMALE_YOUNG_VOICE_1_SHOCKED_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CHAT_6,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_DODGE_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_FIGHT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_GUN_PANIC_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_CARJACKED_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_MUGGED_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_1_RUN_FROM_FIGHT_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DRIVER_ABUSE_6,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_5,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CHAT_6,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_DODGE_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_FIGHT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_GUN_PANIC_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CARJACKED_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_CARJACKED_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_MUGGED_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_MUGGED_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_1,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_2,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_3,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_4,
-	SFX_BUSINESS_MALE_YOUNG_VOICE_2_RUN_FROM_FIGHT_5,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_3,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_4,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_5,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_6,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CHAT_7,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_3,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_4,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_DODGE_5,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_MUGGED_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_BLACK_FAT_FEMALE_VOICE_1_SHOCKED_5,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_2,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_3,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_4,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_CHAT_5,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_2,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_3,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_DODGE_4,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_2,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_EYING_3,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_2,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_FIGHT_3,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_WHITE_DOCKER_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_HOSPITAL_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_HOSPITAL_MALE_VOICE_1_CHAT_1,
-	SFX_HOSPITAL_MALE_VOICE_1_CHAT_2,
-	SFX_HOSPITAL_MALE_VOICE_1_CHAT_3,
-	SFX_HOSPITAL_MALE_VOICE_1_CHAT_4,
-	SFX_HOSPITAL_MALE_VOICE_1_CHAT_5,
-	SFX_HOSPITAL_MALE_VOICE_1_DODGE_1,
-	SFX_HOSPITAL_MALE_VOICE_1_DODGE_2,
-	SFX_HOSPITAL_MALE_VOICE_1_DODGE_3,
-	SFX_HOSPITAL_MALE_VOICE_1_DODGE_4,
-	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_1,
-	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_2,
-	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_3,
-	SFX_HOSPITAL_MALE_VOICE_1_FIGHT_4,
-	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_HOSPITAL_MALE_VOICE_1_GUN_PANIC_4,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_1,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_2,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_3,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_4,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_5,
-	SFX_HOSPITAL_FEMALE_VOICE_1_CHAT_6,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_1,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_2,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_3,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_4,
-	SFX_HOSPITAL_FEMALE_VOICE_1_DODGE_5,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_1,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_2,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_3,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_4,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_5,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_6,
-	SFX_FEMALE_1_VOICE_1_DRIVER_ABUSE_7,
-	SFX_FEMALE_1_VOICE_1_CHAT_1,
-	SFX_FEMALE_1_VOICE_1_CHAT_2,
-	SFX_FEMALE_1_VOICE_1_CHAT_3,
-	SFX_FEMALE_1_VOICE_1_CHAT_4,
-	SFX_FEMALE_1_VOICE_1_CHAT_5,
-	SFX_FEMALE_1_VOICE_1_CHAT_6,
-	SFX_FEMALE_1_VOICE_1_CHAT_7,
-	SFX_FEMALE_1_VOICE_1_CHAT_8,
-	SFX_FEMALE_1_VOICE_1_DODGE_1,
-	SFX_FEMALE_1_VOICE_1_DODGE_2,
-	SFX_FEMALE_1_VOICE_1_DODGE_3,
-	SFX_FEMALE_1_VOICE_1_DODGE_4,
-	SFX_FEMALE_1_VOICE_1_DODGE_5,
-	SFX_FEMALE_1_VOICE_1_DODGE_6,
-	SFX_FEMALE_1_VOICE_1_GUN_PANIC_1,
-	SFX_FEMALE_1_VOICE_1_GUN_PANIC_2,
-	SFX_FEMALE_1_VOICE_1_CARJACKED_1,
-	SFX_FEMALE_1_VOICE_1_CARJACKED_2,
-	SFX_FEMALE_1_VOICE_1_MUGGED_1,
-	SFX_FEMALE_1_VOICE_1_MUGGED_2,
-	SFX_FEMALE_1_VOICE_1_MUGGED_3,
-	SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_FEMALE_1_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_FEMALE_1_VOICE_1_SHOCKED_1,
-	SFX_FEMALE_1_VOICE_1_SHOCKED_2,
-	SFX_FEMALE_1_VOICE_1_SHOCKED_3,
-	SFX_FEMALE_1_VOICE_1_SHOCKED_4,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_1,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_2,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_3,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_4,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_5,
-	SFX_FEMALE_3_VOICE_1_DRIVER_ABUSE_6,
-	SFX_FEMALE_3_VOICE_1_CHAT_1,
-	SFX_FEMALE_3_VOICE_1_CHAT_2,
-	SFX_FEMALE_3_VOICE_1_CHAT_3,
-	SFX_FEMALE_3_VOICE_1_CHAT_4,
-	SFX_FEMALE_3_VOICE_1_CHAT_5,
-	SFX_FEMALE_3_VOICE_1_DODGE_1,
-	SFX_FEMALE_3_VOICE_1_DODGE_2,
-	SFX_FEMALE_3_VOICE_1_DODGE_3,
-	SFX_FEMALE_3_VOICE_1_DODGE_4,
-	SFX_FEMALE_3_VOICE_1_DODGE_5,
-	SFX_FEMALE_3_VOICE_1_DODGE_6,
-	SFX_FEMALE_3_VOICE_1_GUN_PANIC_1,
-	SFX_FEMALE_3_VOICE_1_GUN_PANIC_2,
-	SFX_FEMALE_3_VOICE_1_GUN_PANIC_3,
-	SFX_FEMALE_3_VOICE_1_GUN_PANIC_4,
-	SFX_FEMALE_3_VOICE_1_GUN_PANIC_5,
-	SFX_FEMALE_3_VOICE_1_CARJACKED_1,
-	SFX_FEMALE_3_VOICE_1_CARJACKED_2,
-	SFX_FEMALE_3_VOICE_1_CARJACKED_3,
-	SFX_FEMALE_3_VOICE_1_MUGGED_1,
-	SFX_FEMALE_3_VOICE_1_MUGGED_2,
-	SFX_FEMALE_3_VOICE_1_MUGGED_3,
-	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_FEMALE_3_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_FEMALE_3_VOICE_1_SHOCKED_1,
-	SFX_FEMALE_3_VOICE_1_SHOCKED_2,
-	SFX_FEMALE_3_VOICE_1_SHOCKED_3,
-	SFX_FEMALE_3_VOICE_1_SHOCKED_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_6,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DRIVER_ABUSE_7,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_5,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_6,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CHAT_7,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_DODGE_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_EYING_5,
-	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_FIGHT_4,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_CARJACKED_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_1,
-	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_2,
-	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_3,
-	SFX_CASUAL_MALE_OLD_VOICE_1_MUGGED_4,
-	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_STUDENT_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_STUDENT_MALE_VOICE_1_CHAT_1,
-	SFX_STUDENT_MALE_VOICE_1_CHAT_2,
-	SFX_STUDENT_MALE_VOICE_1_CHAT_3,
-	SFX_STUDENT_MALE_VOICE_1_CHAT_4,
-	SFX_STUDENT_MALE_VOICE_1_CHAT_5,
-	SFX_STUDENT_MALE_VOICE_1_DODGE_1,
-	SFX_STUDENT_MALE_VOICE_1_DODGE_2,
-	SFX_STUDENT_MALE_VOICE_1_DODGE_3,
-	SFX_STUDENT_MALE_VOICE_1_DODGE_4,
-	SFX_STUDENT_MALE_VOICE_1_FIGHT_1,
-	SFX_STUDENT_MALE_VOICE_1_FIGHT_2,
-	SFX_STUDENT_MALE_VOICE_1_FIGHT_3,
-	SFX_STUDENT_MALE_VOICE_1_FIGHT_4,
-	SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_STUDENT_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_STUDENT_MALE_VOICE_1_MUGGED_1,
-	SFX_STUDENT_MALE_VOICE_1_MUGGED_2,
-	SFX_STUDENT_MALE_VOICE_1_SHOCKED_1,
-	SFX_STUDENT_MALE_VOICE_1_SHOCKED_2,
-	SFX_STUDENT_MALE_VOICE_1_SHOCKED_3,
-	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_STUDENT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_STUDENT_FEMALE_VOICE_1_CHAT_1,
-	SFX_STUDENT_FEMALE_VOICE_1_CHAT_2,
-	SFX_STUDENT_FEMALE_VOICE_1_CHAT_3,
-	SFX_STUDENT_FEMALE_VOICE_1_CHAT_4,
-	SFX_STUDENT_FEMALE_VOICE_1_DODGE_1,
-	SFX_STUDENT_FEMALE_VOICE_1_DODGE_2,
-	SFX_STUDENT_FEMALE_VOICE_1_DODGE_3,
-	SFX_STUDENT_FEMALE_VOICE_1_DODGE_4,
-	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_1,
-	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_2,
-	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_3,
-	SFX_STUDENT_FEMALE_VOICE_1_FIGHT_4,
-	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_STUDENT_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_STUDENT_FEMALE_VOICE_1_MUGGED_1,
-	SFX_STUDENT_FEMALE_VOICE_1_MUGGED_2,
-	SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_STUDENT_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_HOOD_MALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_HOOD_MALE_VOICE_1_CHAT_1,
-	SFX_HOOD_MALE_VOICE_1_CHAT_2,
-	SFX_HOOD_MALE_VOICE_1_CHAT_3,
-	SFX_HOOD_MALE_VOICE_1_CHAT_4,
-	SFX_HOOD_MALE_VOICE_1_CHAT_5,
-	SFX_HOOD_MALE_VOICE_1_CHAT_6,
-	SFX_HOOD_MALE_VOICE_1_DODGE_1,
-	SFX_HOOD_MALE_VOICE_1_DODGE_2,
-	SFX_HOOD_MALE_VOICE_1_DODGE_3,
-	SFX_HOOD_MALE_VOICE_1_DODGE_4,
-	SFX_HOOD_MALE_VOICE_1_DODGE_5,
-	SFX_HOOD_MALE_VOICE_1_EYING_1,
-	SFX_HOOD_MALE_VOICE_1_EYING_2,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_1,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_2,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_3,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_4,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_5,
-	SFX_HOOD_MALE_VOICE_1_FIGHT_6,
-	SFX_HOOD_MALE_VOICE_1_GUN_COOL_1,
-	SFX_HOOD_MALE_VOICE_1_GUN_COOL_2,
-	SFX_HOOD_MALE_VOICE_1_GUN_COOL_3,
-	SFX_HOOD_MALE_VOICE_1_GUN_COOL_4,
-	SFX_HOOD_MALE_VOICE_1_GUN_COOL_5,
-	SFX_HOOD_MALE_VOICE_1_CARJACKED_1,
-	SFX_HOOD_MALE_VOICE_1_CARJACKED_2,
-	SFX_HOOD_MALE_VOICE_1_CARJACKING_1,
-	SFX_HOOD_MALE_VOICE_1_CARJACKING_2,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_HOOD_MALE_VOICE_2_DRIVER_ABUSE_7,
-	SFX_HOOD_MALE_VOICE_2_CHAT_1,
-	SFX_HOOD_MALE_VOICE_2_CHAT_2,
-	SFX_HOOD_MALE_VOICE_2_CHAT_3,
-	SFX_HOOD_MALE_VOICE_2_CHAT_4,
-	SFX_HOOD_MALE_VOICE_2_CHAT_5,
-	SFX_HOOD_MALE_VOICE_2_CHAT_6,
-	SFX_HOOD_MALE_VOICE_2_DODGE_1,
-	SFX_HOOD_MALE_VOICE_2_DODGE_2,
-	SFX_HOOD_MALE_VOICE_2_DODGE_3,
-	SFX_HOOD_MALE_VOICE_2_DODGE_4,
-	SFX_HOOD_MALE_VOICE_2_DODGE_5,
-	SFX_HOOD_MALE_VOICE_2_EYING_1,
-	SFX_HOOD_MALE_VOICE_2_EYING_2,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_1,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_2,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_3,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_4,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_5,
-	SFX_HOOD_MALE_VOICE_2_FIGHT_6,
-	SFX_HOOD_MALE_VOICE_2_GUN_COOL_1,
-	SFX_HOOD_MALE_VOICE_2_GUN_COOL_2,
-	SFX_HOOD_MALE_VOICE_2_GUN_COOL_3,
-	SFX_HOOD_MALE_VOICE_2_GUN_COOL_4,
-	SFX_HOOD_MALE_VOICE_2_GUN_COOL_5,
-	SFX_HOOD_MALE_VOICE_2_CARJACKED_1,
-	SFX_HOOD_MALE_VOICE_2_CARJACKED_2,
-	SFX_HOOD_MALE_VOICE_2_CARJACKING_1,
-	SFX_HOOD_MALE_VOICE_2_CARJACKING_2,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_YARDIE_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_1,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_2,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_3,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_4,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_5,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_6,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_7,
-	SFX_YARDIE_MALE_VOICE_1_CHAT_8,
-	SFX_YARDIE_MALE_VOICE_1_DODGE_1,
-	SFX_YARDIE_MALE_VOICE_1_DODGE_2,
-	SFX_YARDIE_MALE_VOICE_1_DODGE_3,
-	SFX_YARDIE_MALE_VOICE_1_DODGE_4,
-	SFX_YARDIE_MALE_VOICE_1_DODGE_5,
-	SFX_YARDIE_MALE_VOICE_1_EYING_1,
-	SFX_YARDIE_MALE_VOICE_1_EYING_2,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_1,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_2,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_3,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_4,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_5,
-	SFX_YARDIE_MALE_VOICE_1_FIGHT_6,
-	SFX_YARDIE_MALE_VOICE_1_GUN_COOL_1,
-	SFX_YARDIE_MALE_VOICE_1_CARJACKED_1,
-	SFX_YARDIE_MALE_VOICE_1_CARJACKING_1,
-	SFX_YARDIE_MALE_VOICE_1_CARJACKING_2,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_YARDIE_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_1,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_2,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_3,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_4,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_5,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_6,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_7,
-	SFX_YARDIE_MALE_VOICE_2_CHAT_8,
-	SFX_YARDIE_MALE_VOICE_2_DODGE_1,
-	SFX_YARDIE_MALE_VOICE_2_DODGE_2,
-	SFX_YARDIE_MALE_VOICE_2_DODGE_3,
-	SFX_YARDIE_MALE_VOICE_2_DODGE_4,
-	SFX_YARDIE_MALE_VOICE_2_DODGE_5,
-	SFX_YARDIE_MALE_VOICE_2_EYING_1,
-	SFX_YARDIE_MALE_VOICE_2_EYING_2,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_1,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_2,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_3,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_4,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_5,
-	SFX_YARDIE_MALE_VOICE_2_FIGHT_6,
-	SFX_YARDIE_MALE_VOICE_2_GUN_COOL_1,
-	SFX_YARDIE_MALE_VOICE_2_CARJACKED_1,
-	SFX_YARDIE_MALE_VOICE_2_CARJACKING_1,
-	SFX_YARDIE_MALE_VOICE_2_CARJACKING_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_5,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_6,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CHAT_7,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_5,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_DODGE_6,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_5,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_CARAJACKED_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_MUGGED_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_5,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_6,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_BLACK_BUSINESS_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_3,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_4,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_5,
-	SFX_WHITE_WORKER_MALE_VOICE_1_CHAT_6,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_3,
-	SFX_WHITE_WORKER_MALE_VOICE_1_DODGE_4,
-	SFX_WHITE_WORKER_MALE_VOICE_1_EYING_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_EYING_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_FIGHT_3,
-	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_WHITE_WORKER_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_STEWARD_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_STEWARD_MALE_VOICE_1_CHAT_1,
-	SFX_STEWARD_MALE_VOICE_1_CHAT_2,
-	SFX_STEWARD_MALE_VOICE_1_CHAT_3,
-	SFX_STEWARD_MALE_VOICE_1_CHAT_4,
-	SFX_STEWARD_MALE_VOICE_1_DODGE_1,
-	SFX_STEWARD_MALE_VOICE_1_DODGE_2,
-	SFX_STEWARD_MALE_VOICE_1_DODGE_3,
-	SFX_STEWARD_MALE_VOICE_1_FIGHT_1,
-	SFX_STEWARD_MALE_VOICE_1_FIGHT_2,
-	SFX_STEWARD_MALE_VOICE_1_FIGHT_3,
-	SFX_STEWARD_MALE_VOICE_1_FIGHT_4,
-	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_STEWARD_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_STEWARD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_STEWARD_FEMALE_VOICE_1_CHAT_1,
-	SFX_STEWARD_FEMALE_VOICE_1_CHAT_2,
-	SFX_STEWARD_FEMALE_VOICE_1_CHAT_3,
-	SFX_STEWARD_FEMALE_VOICE_1_CHAT_4,
-	SFX_STEWARD_FEMALE_VOICE_1_CHAT_5,
-	SFX_STEWARD_FEMALE_VOICE_1_DODGE_1,
-	SFX_STEWARD_FEMALE_VOICE_1_DODGE_2,
-	SFX_STEWARD_FEMALE_VOICE_1_DODGE_3,
-	SFX_STEWARD_FEMALE_VOICE_1_DODGE_4,
-	SFX_STEWARD_FEMALE_VOICE_1_DODGE_5,
-	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_STEWARD_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_STEWARD_FEMALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_STEWARD_FEMALE_VOICE_2_CHAT_1,
-	SFX_STEWARD_FEMALE_VOICE_2_CHAT_2,
-	SFX_STEWARD_FEMALE_VOICE_2_CHAT_3,
-	SFX_STEWARD_FEMALE_VOICE_2_CHAT_4,
-	SFX_STEWARD_FEMALE_VOICE_2_CHAT_5,
-	SFX_STEWARD_FEMALE_VOICE_2_DODGE_1,
-	SFX_STEWARD_FEMALE_VOICE_2_DODGE_2,
-	SFX_STEWARD_FEMALE_VOICE_2_DODGE_3,
-	SFX_STEWARD_FEMALE_VOICE_2_DODGE_4,
-	SFX_STEWARD_FEMALE_VOICE_2_DODGE_5,
-	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_1,
-	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_2,
-	SFX_STEWARD_FEMALE_VOICE_2_GUN_PANIC_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DRIVER_ABUSE_6,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_4,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_5,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_6,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CHAT_7,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_4,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_5,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_DODGE_6,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_EYING_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_4,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_FIGHT_5,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_2,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_GUN_PANIC_3,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_1,
-	SFX_CHINATOWN_MALE_OLD_VOICE_1_CARJACKED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_6,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CHAT_7,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_DODGE_6,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_GUN_PANIC_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_MUGGED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_RUN_FROM_FIGHT_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_6,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CHAT_7,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_5,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_DODGE_6,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_GUN_PANIC_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CARJACKED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_CARJACKED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_MUGGED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_MUGGED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_RUN_FROM_FIGHT_4,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_1,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_2,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_3,
-	SFX_WHITE_BUSINESS_FEMALE_VOICE_2_SHOCKED_4,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_FAT_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_3,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_4,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_5,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_6,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_7,
-	SFX_BLACK_FAT_MALE_VOICE_1_CHAT_8,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_3,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_4,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_5,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_6,
-	SFX_BLACK_FAT_MALE_VOICE_1_DODGE_7,
-	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_3,
-	SFX_BLACK_FAT_MALE_VOICE_1_CARJACKED_4,
-	SFX_BLACK_FAT_MALE_VOICE_1_LOST_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_LOST_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_LOST_3,
-	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_1,
-	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_2,
-	SFX_BLACK_FAT_MALE_VOICE_1_MUGGED_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CHAT_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_DODGE_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_EYING_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_FIGHT_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_GUN_COOL_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_CARJACKED_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_1_MUGGED_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DRIVER_ABUSE_7,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CHAT_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_DODGE_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_EYING_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_4,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_5,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_FIGHT_6,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_GUN_COOL_3,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CARJACKED_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_CARJACKED_2,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_MUGGED_1,
-	SFX_BLACK_PROJECT_MALE_VOICE_2_MUGGED_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_CHAT_4,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_DODGE_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_EYING_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_FIGHT_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_BLACK_WORKER_MALE_VOICE_1_GUN_PANIC_4,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_1,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_2,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_3,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_4,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_5,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_6,
-	SFX_SHOPPER_VOICE_1_DRIVER_ABUSE_7,
-	SFX_SHOPPER_VOICE_1_CHAT_1,
-	SFX_SHOPPER_VOICE_1_CHAT_2,
-	SFX_SHOPPER_VOICE_1_CHAT_3,
-	SFX_SHOPPER_VOICE_1_CHAT_4,
-	SFX_SHOPPER_VOICE_1_CHAT_5,
-	SFX_SHOPPER_VOICE_1_CHAT_6,
-	SFX_SHOPPER_VOICE_1_CHAT_7,
-	SFX_SHOPPER_VOICE_1_DODGE_1,
-	SFX_SHOPPER_VOICE_1_DODGE_2,
-	SFX_SHOPPER_VOICE_1_DODGE_3,
-	SFX_SHOPPER_VOICE_1_DODGE_4,
-	SFX_SHOPPER_VOICE_1_DODGE_5,
-	SFX_SHOPPER_VOICE_1_DODGE_6,
-	SFX_SHOPPER_VOICE_1_CARJACKED_1,
-	SFX_SHOPPER_VOICE_1_CARJACKED_2,
-	SFX_SHOPPER_VOICE_1_MUGGED_1,
-	SFX_SHOPPER_VOICE_1_MUGGED_2,
-	SFX_SHOPPER_VOICE_1_SHOCKED_1,
-	SFX_SHOPPER_VOICE_1_SHOCKED_2,
-	SFX_SHOPPER_VOICE_1_SHOCKED_3,
-	SFX_SHOPPER_VOICE_1_SHOCKED_4,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_1,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_2,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_3,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_4,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_5,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_6,
-	SFX_SHOPPER_VOICE_2_DRIVER_ABUSE_7,
-	SFX_SHOPPER_VOICE_2_CHAT_1,
-	SFX_SHOPPER_VOICE_2_CHAT_2,
-	SFX_SHOPPER_VOICE_2_CHAT_3,
-	SFX_SHOPPER_VOICE_2_CHAT_4,
-	SFX_SHOPPER_VOICE_2_CHAT_5,
-	SFX_SHOPPER_VOICE_2_CHAT_6,
-	SFX_SHOPPER_VOICE_2_CHAT_7,
-	SFX_SHOPPER_VOICE_2_DODGE_1,
-	SFX_SHOPPER_VOICE_2_DODGE_2,
-	SFX_SHOPPER_VOICE_2_DODGE_3,
-	SFX_SHOPPER_VOICE_2_DODGE_4,
-	SFX_SHOPPER_VOICE_2_DODGE_5,
-	SFX_SHOPPER_VOICE_2_DODGE_6,
-	SFX_SHOPPER_VOICE_2_CARJACKED_1,
-	SFX_SHOPPER_VOICE_2_CARJACKED_2,
-	SFX_SHOPPER_VOICE_2_MUGGED_1,
-	SFX_SHOPPER_VOICE_2_MUGGED_2,
-	SFX_SHOPPER_VOICE_2_SHOCKED_1,
-	SFX_SHOPPER_VOICE_2_SHOCKED_2,
-	SFX_SHOPPER_VOICE_2_SHOCKED_3,
-	SFX_SHOPPER_VOICE_2_SHOCKED_4,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_1,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_2,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_3,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_4,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_5,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_6,
-	SFX_SHOPPER_VOICE_3_DRIVER_ABUSE_7,
-	SFX_SHOPPER_VOICE_3_CHAT_1,
-	SFX_SHOPPER_VOICE_3_CHAT_2,
-	SFX_SHOPPER_VOICE_3_CHAT_3,
-	SFX_SHOPPER_VOICE_3_CHAT_4,
-	SFX_SHOPPER_VOICE_3_CHAT_5,
-	SFX_SHOPPER_VOICE_3_CHAT_6,
-	SFX_SHOPPER_VOICE_3_CHAT_7,
-	SFX_SHOPPER_VOICE_3_DODGE_1,
-	SFX_SHOPPER_VOICE_3_DODGE_2,
-	SFX_SHOPPER_VOICE_3_DODGE_3,
-	SFX_SHOPPER_VOICE_3_DODGE_4,
-	SFX_SHOPPER_VOICE_3_DODGE_5,
-	SFX_SHOPPER_VOICE_3_DODGE_6,
-	SFX_SHOPPER_VOICE_3_CARJACKED_1,
-	SFX_SHOPPER_VOICE_3_CARJACKED_2,
-	SFX_SHOPPER_VOICE_3_MUGGED_1,
-	SFX_SHOPPER_VOICE_3_MUGGED_2,
-	SFX_SHOPPER_VOICE_3_SHOCKED_1,
-	SFX_SHOPPER_VOICE_3_SHOCKED_2,
-	SFX_SHOPPER_VOICE_3_SHOCKED_3,
-	SFX_SHOPPER_VOICE_3_SHOCKED_4,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_COLUMBIAN_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_3,
-	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_4,
-	SFX_COLUMBIAN_MALE_VOICE_1_CHAT_5,
-	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_3,
-	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_4,
-	SFX_COLUMBIAN_MALE_VOICE_1_DODGE_5,
-	SFX_COLUMBIAN_MALE_VOICE_1_EYING_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_EYING_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_3,
-	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_4,
-	SFX_COLUMBIAN_MALE_VOICE_1_FIGHT_5,
-	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKED_2,
-	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_1,
-	SFX_COLUMBIAN_MALE_VOICE_1_CARJACKING_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_COLUMBIAN_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_3,
-	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_4,
-	SFX_COLUMBIAN_MALE_VOICE_2_CHAT_5,
-	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_3,
-	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_4,
-	SFX_COLUMBIAN_MALE_VOICE_2_DODGE_5,
-	SFX_COLUMBIAN_MALE_VOICE_2_EYING_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_EYING_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_3,
-	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_4,
-	SFX_COLUMBIAN_MALE_VOICE_2_FIGHT_5,
-	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKED_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKED_2,
-	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKING_1,
-	SFX_COLUMBIAN_MALE_VOICE_2_CARJACKING_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_3,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_4,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_5,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_6,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CHAT_7,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_3,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_4,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_5,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_DODGE_6,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_MUGGED_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_CHINATOWN_YOUNG_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_1,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_2,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_3,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_4,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_5,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_CHAT_6,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_1,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_2,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_3,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_4,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_DODGE_5,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_GUN_PANIC_3,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_1,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_MUGGED_2,
-	SFX_CHINATOWN_OLD_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_GENERIC_FEMALE_DEATH_1,
-	SFX_GENERIC_FEMALE_DEATH_2,
-	SFX_GENERIC_FEMALE_DEATH_3,
-	SFX_GENERIC_FEMALE_DEATH_4,
-	SFX_GENERIC_FEMALE_DEATH_5,
-	SFX_GENERIC_FEMALE_DEATH_6,
-	SFX_GENERIC_FEMALE_DEATH_7,
-	SFX_GENERIC_FEMALE_DEATH_8,
-	SFX_GENERIC_FEMALE_DEATH_9,
-	SFX_GENERIC_FEMALE_DEATH_10,
-	SFX_GENERIC_FEMALE_FIRE_1,
-	SFX_GENERIC_FEMALE_FIRE_2,
-	SFX_GENERIC_FEMALE_FIRE_3,
-	SFX_GENERIC_FEMALE_FIRE_4,
-	SFX_GENERIC_FEMALE_FIRE_5,
-	SFX_GENERIC_FEMALE_FIRE_6,
-	SFX_GENERIC_FEMALE_FIRE_7,
-	SFX_GENERIC_FEMALE_FIRE_8,
-	SFX_GENERIC_FEMALE_FIRE_9,
-	SFX_GENERIC_FEMALE_GRUNT_1,
-	SFX_GENERIC_FEMALE_GRUNT_2,
-	SFX_GENERIC_FEMALE_GRUNT_3,
-	SFX_GENERIC_FEMALE_GRUNT_4,
-	SFX_GENERIC_FEMALE_GRUNT_5,
-	SFX_GENERIC_FEMALE_GRUNT_6,
-	SFX_GENERIC_FEMALE_GRUNT_7,
-	SFX_GENERIC_FEMALE_GRUNT_8,
-	SFX_GENERIC_FEMALE_GRUNT_9,
-	SFX_GENERIC_FEMALE_GRUNT_10,
-	SFX_GENERIC_FEMALE_GRUNT_11,
-	SFX_GENERIC_FEMALE_PANIC_1,
-	SFX_GENERIC_FEMALE_PANIC_2,
-	SFX_GENERIC_FEMALE_PANIC_3,
-	SFX_GENERIC_FEMALE_PANIC_4,
-	SFX_GENERIC_FEMALE_PANIC_5,
-	SFX_GENERIC_FEMALE_PANIC_6,
-	SFX_GENERIC_FEMALE_PANIC_7,
-	SFX_GENERIC_FEMALE_PANIC_8,
-	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_CRIMINAL_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_2,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_3,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_4,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_5,
-	SFX_BLACK_CRIMINAL_VOICE_1_DODGE_6,
-	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_2,
-	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_3,
-	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_4,
-	SFX_BLACK_CRIMINAL_VOICE_1_FIGHT_5,
-	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_2,
-	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_3,
-	SFX_BLACK_CRIMINAL_VOICE_1_GUN_COOL_4,
-	SFX_BLACK_CRIMINAL_VOICE_1_CARJACKING_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_1,
-	SFX_BLACK_CRIMINAL_VOICE_1_MUGGING_2,
-	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_CRIMINAL_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_2,
-	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_3,
-	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_4,
-	SFX_WHITE_CRIMINAL_VOICE_1_DODGE_5,
-	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_2,
-	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_3,
-	SFX_WHITE_CRIMINAL_VOICE_1_FIGHT_4,
-	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_2,
-	SFX_WHITE_CRIMINAL_VOICE_1_GUN_COOL_3,
-	SFX_WHITE_CRIMINAL_VOICE_1_CARJACKING_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_1,
-	SFX_WHITE_CRIMINAL_VOICE_1_MUGGING_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DRIVER_ABUSE_5,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_4,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CHAT_5,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_DODGE_4,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_4,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_FIGHT_5,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_GUN_PANIC_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_CARJACKED_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MUGGED_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_1,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_2,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_3,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_4,
-	SFX_BUSINESS_MALE_OLD_VOICE_1_MRUN_FROM_FIGHT_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CHAT_6,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_DODGE_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_FIGHT_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_GUN_PANIC_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_CARJACKED_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_1_MUGGED_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DRIVER_ABUSE_7,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CHAT_6,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_DODGE_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_4,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_FIGHT_5,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_GUN_PANIC_3,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CARJACKED_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_CARJACKED_2,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_MUGGED_1,
-	SFX_LITTLE_ITALY_MALE_VOICE_2_MUGGED_2,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_TRIAD_MALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_1,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_2,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_3,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_4,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_5,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_6,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_7,
-	SFX_TRIAD_MALE_VOICE_1_CHAT_8,
-	SFX_TRIAD_MALE_VOICE_1_DODGE_1,
-	SFX_TRIAD_MALE_VOICE_1_DODGE_2,
-	SFX_TRIAD_MALE_VOICE_1_DODGE_3,
-	SFX_TRIAD_MALE_VOICE_1_DODGE_4,
-	SFX_TRIAD_MALE_VOICE_1_EYING_1,
-	SFX_TRIAD_MALE_VOICE_1_EYING_2,
-	SFX_TRIAD_MALE_VOICE_1_EYING_3,
-	SFX_TRIAD_MALE_VOICE_1_FIGHT_1,
-	SFX_TRIAD_MALE_VOICE_1_FIGHT_2,
-	SFX_TRIAD_MALE_VOICE_1_FIGHT_3,
-	SFX_TRIAD_MALE_VOICE_1_FIGHT_4,
-	SFX_TRIAD_MALE_VOICE_1_FIGHT_5,
-	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_1,
-	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_2,
-	SFX_TRIAD_MALE_VOICE_1_GUN_COOL_3,
-	SFX_TRIAD_MALE_VOICE_1_CARJACKED_1,
-	SFX_TRIAD_MALE_VOICE_1_CARJACKED_2,
-	SFX_TRIAD_MALE_VOICE_1_CARJACKING_1,
-	SFX_TRIAD_MALE_VOICE_1_CARJACKING_2,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_MAFIA_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_1,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_2,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_3,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_4,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_5,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_6,
-	SFX_MAFIA_MALE_VOICE_1_CHAT_7,
-	SFX_MAFIA_MALE_VOICE_1_DODGE_1,
-	SFX_MAFIA_MALE_VOICE_1_DODGE_2,
-	SFX_MAFIA_MALE_VOICE_1_DODGE_3,
-	SFX_MAFIA_MALE_VOICE_1_DODGE_4,
-	SFX_MAFIA_MALE_VOICE_1_DODGE_5,
-	SFX_MAFIA_MALE_VOICE_1_EYING_1,
-	SFX_MAFIA_MALE_VOICE_1_EYING_2,
-	SFX_MAFIA_MALE_VOICE_1_EYING_3,
-	SFX_MAFIA_MALE_VOICE_1_FIGHT_1,
-	SFX_MAFIA_MALE_VOICE_1_FIGHT_2,
-	SFX_MAFIA_MALE_VOICE_1_FIGHT_3,
-	SFX_MAFIA_MALE_VOICE_1_FIGHT_4,
-	SFX_MAFIA_MALE_VOICE_1_FIGHT_5,
-	SFX_MAFIA_MALE_VOICE_1_CARJACKED_1,
-	SFX_MAFIA_MALE_VOICE_1_CARJACKED_2,
-	SFX_MAFIA_MALE_VOICE_1_CARJACKING_1,
-	SFX_MAFIA_MALE_VOICE_1_CARJACKING_2,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_MAFIA_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_1,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_2,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_3,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_4,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_5,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_6,
-	SFX_MAFIA_MALE_VOICE_2_CHAT_7,
-	SFX_MAFIA_MALE_VOICE_2_DODGE_1,
-	SFX_MAFIA_MALE_VOICE_2_DODGE_2,
-	SFX_MAFIA_MALE_VOICE_2_DODGE_3,
-	SFX_MAFIA_MALE_VOICE_2_DODGE_4,
-	SFX_MAFIA_MALE_VOICE_2_DODGE_5,
-	SFX_MAFIA_MALE_VOICE_2_EYING_1,
-	SFX_MAFIA_MALE_VOICE_2_EYING_2,
-	SFX_MAFIA_MALE_VOICE_2_EYING_3,
-	SFX_MAFIA_MALE_VOICE_2_FIGHT_1,
-	SFX_MAFIA_MALE_VOICE_2_FIGHT_2,
-	SFX_MAFIA_MALE_VOICE_2_FIGHT_3,
-	SFX_MAFIA_MALE_VOICE_2_FIGHT_4,
-	SFX_MAFIA_MALE_VOICE_2_FIGHT_5,
-	SFX_MAFIA_MALE_VOICE_2_CARJACKED_1,
-	SFX_MAFIA_MALE_VOICE_2_CARJACKED_2,
-	SFX_MAFIA_MALE_VOICE_2_CARJACKING_1,
-	SFX_MAFIA_MALE_VOICE_2_CARJACKING_2,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_1,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_2,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_3,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_4,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_5,
-	SFX_MAFIA_MALE_VOICE_3_DRIVER_ABUSE_6,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_1,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_2,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_3,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_4,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_5,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_6,
-	SFX_MAFIA_MALE_VOICE_3_CHAT_7,
-	SFX_MAFIA_MALE_VOICE_3_DODGE_1,
-	SFX_MAFIA_MALE_VOICE_3_DODGE_2,
-	SFX_MAFIA_MALE_VOICE_3_DODGE_3,
-	SFX_MAFIA_MALE_VOICE_3_DODGE_4,
-	SFX_MAFIA_MALE_VOICE_3_DODGE_5,
-	SFX_MAFIA_MALE_VOICE_3_EYING_1,
-	SFX_MAFIA_MALE_VOICE_3_EYING_2,
-	SFX_MAFIA_MALE_VOICE_3_EYING_3,
-	SFX_MAFIA_MALE_VOICE_3_FIGHT_1,
-	SFX_MAFIA_MALE_VOICE_3_FIGHT_2,
-	SFX_MAFIA_MALE_VOICE_3_FIGHT_3,
-	SFX_MAFIA_MALE_VOICE_3_FIGHT_4,
-	SFX_MAFIA_MALE_VOICE_3_FIGHT_5,
-	SFX_MAFIA_MALE_VOICE_3_CARJACKED_1,
-	SFX_MAFIA_MALE_VOICE_3_CARJACKED_2,
-	SFX_MAFIA_MALE_VOICE_3_CARJACKING_1,
-	SFX_MAFIA_MALE_VOICE_3_CARJACKING_2,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_YAKUZA_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_YAKUZA_MALE_VOICE_1_CHAT_1,
-	SFX_YAKUZA_MALE_VOICE_1_CHAT_2,
-	SFX_YAKUZA_MALE_VOICE_1_CHAT_3,
-	SFX_YAKUZA_MALE_VOICE_1_CHAT_4,
-	SFX_YAKUZA_MALE_VOICE_1_CHAT_5,
-	SFX_YAKUZA_MALE_VOICE_1_DODGE_1,
-	SFX_YAKUZA_MALE_VOICE_1_DODGE_2,
-	SFX_YAKUZA_MALE_VOICE_1_DODGE_3,
-	SFX_YAKUZA_MALE_VOICE_1_DODGE_4,
-	SFX_YAKUZA_MALE_VOICE_1_FIGHT_1,
-	SFX_YAKUZA_MALE_VOICE_1_FIGHT_2,
-	SFX_YAKUZA_MALE_VOICE_1_FIGHT_3,
-	SFX_YAKUZA_MALE_VOICE_1_FIGHT_4,
-	SFX_YAKUZA_MALE_VOICE_1_FIGHT_5,
-	SFX_YAKUZA_MALE_VOICE_1_CARJACKED_1,
-	SFX_YAKUZA_MALE_VOICE_1_CARJACKED_2,
-	SFX_YAKUZA_MALE_VOICE_1_CARJACKING_1,
-	SFX_YAKUZA_MALE_VOICE_1_CARJACKING_2,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_YAKUZA_MALE_VOICE_2_DRIVER_ABUSE_6,
-	SFX_YAKUZA_MALE_VOICE_2_CHAT_1,
-	SFX_YAKUZA_MALE_VOICE_2_CHAT_2,
-	SFX_YAKUZA_MALE_VOICE_2_CHAT_3,
-	SFX_YAKUZA_MALE_VOICE_2_CHAT_4,
-	SFX_YAKUZA_MALE_VOICE_2_CHAT_5,
-	SFX_YAKUZA_MALE_VOICE_2_DODGE_1,
-	SFX_YAKUZA_MALE_VOICE_2_DODGE_2,
-	SFX_YAKUZA_MALE_VOICE_2_DODGE_3,
-	SFX_YAKUZA_MALE_VOICE_2_DODGE_4,
-	SFX_YAKUZA_MALE_VOICE_2_FIGHT_1,
-	SFX_YAKUZA_MALE_VOICE_2_FIGHT_2,
-	SFX_YAKUZA_MALE_VOICE_2_FIGHT_3,
-	SFX_YAKUZA_MALE_VOICE_2_FIGHT_4,
-	SFX_YAKUZA_MALE_VOICE_2_FIGHT_5,
-	SFX_YAKUZA_MALE_VOICE_2_CARJACKED_1,
-	SFX_YAKUZA_MALE_VOICE_2_CARJACKED_2,
-	SFX_YAKUZA_MALE_VOICE_2_CARJACKING_1,
-	SFX_YAKUZA_MALE_VOICE_2_CARJACKING_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_4,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_5,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_6,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CHAT_7,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_4,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_DODGE_5,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_EYING_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_4,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_FIGHT_5,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_1,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_2,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_GUN_PANIC_3,
-	SFX_WHITE_MALE_CONSTRUCTION_VOICE_1_CARJACKED_1,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_1,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_2,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_3,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_4,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_5,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_DRIVER_ABUSE_6,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_1,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_2,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_3,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_4,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_5,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_6,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_1_CARJACKED_7,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_1,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_2,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_3,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_4,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_5,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_DRIVER_ABUSE_6,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_1,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_2,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_3,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_4,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_5,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_6,
-	SFX_ASIAN_TAXI_DRIVER_VOICE_2_CARJACKED_7,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_1,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_2,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_3,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_4,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_5,
-	SFX_SECURITY_GUARD_VOICE_1_DRIVER_ABUSE_6,
-	SFX_SECURITY_GUARD_VOICE_1_FIGHT_1,
-	SFX_SECURITY_GUARD_VOICE_1_FIGHT_2,
-	SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_1,
-	SFX_SECURITY_GUARD_VOICE_1_GUN_COOL_2,
-	SFX_SECURITY_GUARD_VOICE_1_GUN_PANIC_1,
-	SFX_SECURITY_GUARD_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_CHAT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DODGE_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_MUGGED_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_FIGHT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_5,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_6,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_7,
-	SFX_BLACK_PROSTITUTE_VOICE_1_SOLICIT_8,
-	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_1,
-	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_2,
-	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_3,
-	SFX_BLACK_PROSTITUTE_VOICE_1_GUN_COOL_4,
-	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_CHAT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DODGE_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_MUGGED_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_FIGHT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_4,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_5,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_6,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_7,
-	SFX_BLACK_PROSTITUTE_VOICE_2_SOLICIT_8,
-	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_1,
-	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_2,
-	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_3,
-	SFX_BLACK_PROSTITUTE_VOICE_2_GUN_COOL_4,
-	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_1_CHAT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DODGE_3,
-	SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_MUGGED_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_PROSTITUTE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_1_FIGHT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_5,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_6,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_7,
-	SFX_WHITE_PROSTITUTE_VOICE_1_SOLICIT_8,
-	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_2_CHAT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DODGE_3,
-	SFX_WHITE_PROSTITUTE_VOICE_2_MUGGED_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_MUGGED_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_WHITE_PROSTITUTE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_2_FIGHT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_1,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_2,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_3,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_4,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_5,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_6,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_7,
-	SFX_WHITE_PROSTITUTE_VOICE_2_SOLICIT_8,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_3,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_4,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_5,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CHAT_6,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_3,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_4,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_5,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_6,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DODGE_7,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_MUGGED_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_LITTLE_ITALY_YOUNG_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_3,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_4,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_5,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_6,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CHAT_7,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_3,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_4,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_5,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DODGE_6,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_MUGGED_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_LITTLE_ITALY_OLD_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_GENERIC_MALE_DEATH_1,
-	SFX_GENERIC_MALE_DEATH_2,
-	SFX_GENERIC_MALE_DEATH_3,
-	SFX_GENERIC_MALE_DEATH_4,
-	SFX_GENERIC_MALE_DEATH_5,
-	SFX_GENERIC_MALE_DEATH_6,
-	SFX_GENERIC_MALE_DEATH_7,
-	SFX_GENERIC_MALE_DEATH_8,
-	SFX_GENERIC_MALE_FIRE_1,
-	SFX_GENERIC_MALE_FIRE_2,
-	SFX_GENERIC_MALE_FIRE_3,
-	SFX_GENERIC_MALE_FIRE_4,
-	SFX_GENERIC_MALE_FIRE_5,
-	SFX_GENERIC_MALE_FIRE_6,
-	SFX_GENERIC_MALE_FIRE_7,
-	SFX_GENERIC_MALE_FIRE_8,
-	SFX_GENERIC_MALE_GRUNT_1,
-	SFX_GENERIC_MALE_GRUNT_2,
-	SFX_GENERIC_MALE_GRUNT_3,
-	SFX_GENERIC_MALE_GRUNT_4,
-	SFX_GENERIC_MALE_GRUNT_5,
-	SFX_GENERIC_MALE_GRUNT_6,
-	SFX_GENERIC_MALE_GRUNT_7,
-	SFX_GENERIC_MALE_GRUNT_8,
-	SFX_GENERIC_MALE_GRUNT_9,
-	SFX_GENERIC_MALE_GRUNT_10,
-	SFX_GENERIC_MALE_GRUNT_11,
-	SFX_GENERIC_MALE_GRUNT_12,
-	SFX_GENERIC_MALE_GRUNT_13,
-	SFX_GENERIC_MALE_GRUNT_14,
-	SFX_GENERIC_MALE_GRUNT_15,
-	SFX_GENERIC_MALE_PANIC_1,
-	SFX_GENERIC_MALE_PANIC_2,
-	SFX_GENERIC_MALE_PANIC_3,
-	SFX_GENERIC_MALE_PANIC_4,
-	SFX_GENERIC_MALE_PANIC_5,
-	SFX_GENERIC_MALE_PANIC_6,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_3,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_4,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_5,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_6,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_7,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_8,
-	SFX_WHITE_FAT_MALE_VOICE_1_CHAT_9,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_3,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_4,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_5,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_6,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_7,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_8,
-	SFX_WHITE_FAT_MALE_VOICE_1_DODGE_9,
-	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_CARJACKED_3,
-	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_MUGGED_3,
-	SFX_WHITE_FAT_MALE_VOICE_1_LOST_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_LOST_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_8,
-	SFX_WHITE_FAT_MALE_VOICE_1_DRIVER_ABUSE_9,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_3,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_4,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_5,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_6,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_7,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CHAT_8,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_3,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_4,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_5,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DODGE_6,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_MUGGED_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_LOST_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_DRIVER_ABUSE_8,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_3,
-	SFX_WHITE_FAT_FEMALE_VOICE_1_SHOCKED_4,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_3,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CHAT_4,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DODGE_3,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_CARJACKED_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_MUGGED_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_6,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_7,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_DRIVER_ABUSE_8,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_SHOCKED_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_GUN_PANIC_2,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_1,
-	SFX_WHITE_CASUAL_FEMALE_VOICE_1_RUN_FROM_FIGHT_2,
-	SFX_DIABLO_MALE_VOICE_1_CHAT_1,
-	SFX_DIABLO_MALE_VOICE_1_CHAT_2,
-	SFX_DIABLO_MALE_VOICE_1_CHAT_3,
-	SFX_DIABLO_MALE_VOICE_1_CHAT_4,
-	SFX_DIABLO_MALE_VOICE_1_CHAT_5,
-	SFX_DIABLO_MALE_VOICE_1_DODGE_1,
-	SFX_DIABLO_MALE_VOICE_1_DODGE_2,
-	SFX_DIABLO_MALE_VOICE_1_DODGE_3,
-	SFX_DIABLO_MALE_VOICE_1_DODGE_4,
-	SFX_DIABLO_MALE_VOICE_1_CARJACKED_1,
-	SFX_DIABLO_MALE_VOICE_1_CARJACKED_2,
-	SFX_DIABLO_MALE_VOICE_1_CARJACKING_1,
-	SFX_DIABLO_MALE_VOICE_1_CARJACKING_2,
-	SFX_DIABLO_MALE_VOICE_1_FIGHT_1,
-	SFX_DIABLO_MALE_VOICE_1_FIGHT_2,
-	SFX_DIABLO_MALE_VOICE_1_FIGHT_3,
-	SFX_DIABLO_MALE_VOICE_1_FIGHT_4,
-	SFX_DIABLO_MALE_VOICE_1_EYING_1,
-	SFX_DIABLO_MALE_VOICE_1_EYING_2,
-	SFX_DIABLO_MALE_VOICE_1_EYING_3,
-	SFX_DIABLO_MALE_VOICE_1_EYING_4,
-	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_1,
-	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_2,
-	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_3,
-	SFX_DIABLO_MALE_VOICE_1_GUN_COOL_4,
-	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_1,
-	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_2,
-	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_3,
-	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_4,
-	SFX_DIABLO_MALE_VOICE_1_DRIVER_ABUSE_5,
-	SFX_DIABLO_MALE_VOICE_2_CHAT_1,
-	SFX_DIABLO_MALE_VOICE_2_CHAT_2,
-	SFX_DIABLO_MALE_VOICE_2_CHAT_3,
-	SFX_DIABLO_MALE_VOICE_2_CHAT_4,
-	SFX_DIABLO_MALE_VOICE_2_CHAT_5,
-	SFX_DIABLO_MALE_VOICE_2_DODGE_1,
-	SFX_DIABLO_MALE_VOICE_2_DODGE_2,
-	SFX_DIABLO_MALE_VOICE_2_DODGE_3,
-	SFX_DIABLO_MALE_VOICE_2_DODGE_4,
-	SFX_DIABLO_MALE_VOICE_2_CARJACKED_1,
-	SFX_DIABLO_MALE_VOICE_2_CARJACKED_2,
-	SFX_DIABLO_MALE_VOICE_2_CARJACKING_1,
-	SFX_DIABLO_MALE_VOICE_2_CARJACKING_2,
-	SFX_DIABLO_MALE_VOICE_2_FIGHT_1,
-	SFX_DIABLO_MALE_VOICE_2_FIGHT_2,
-	SFX_DIABLO_MALE_VOICE_2_FIGHT_3,
-	SFX_DIABLO_MALE_VOICE_2_FIGHT_4,
-	SFX_DIABLO_MALE_VOICE_2_EYING_1,
-	SFX_DIABLO_MALE_VOICE_2_EYING_2,
-	SFX_DIABLO_MALE_VOICE_2_EYING_3,
-	SFX_DIABLO_MALE_VOICE_2_EYING_4,
-	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_1,
-	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_2,
-	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_3,
-	SFX_DIABLO_MALE_VOICE_2_GUN_COOL_4,
-	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_1,
-	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_2,
-	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_3,
-	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_4,
-	SFX_DIABLO_MALE_VOICE_2_DRIVER_ABUSE_5,
-	SFX_AMMU_D,
-	SFX_AMMU_E,
-	SFX_AMMU_F,
-	TOTAL_AUDIO_SAMPLES,
+	TOTAL_AUDIO_SAMPLES = 9941,
 	NO_SAMPLE,
 
 	// shorthands
 	SAMPLEBANK_START = SFX_CAR_HORN_JEEP,
-	SAMPLEBANK_END = SFX_PAGER,
-	SAMPLEBANK_MAX = SFX_PAGER + 1,
-	SAMPLEBANK_PED_START = SFX_COP_VOICE_1_ARREST_1,
-	SAMPLEBANK_PED_END = SFX_AMMU_F,
-	SAMPLEBANK_PED_MAX = SFX_AMMU_F + 1,
+	SAMPLEBANK_END = SFX_FOOTSTEP_SAND_4,
+	SAMPLEBANK_MAX = SFX_FOOTSTEP_SAND_4 + 1,
+	SAMPLEBANK_PED_START = SFX_FOOTSTEP_SAND_4 + 1,
+	SAMPLEBANK_PED_END = 9940,
+	SAMPLEBANK_PED_MAX = SAMPLEBANK_PED_END + 1,
 };
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index b8d6dc03..940f41ce 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -64,7 +64,8 @@ cMusicManager::PlayerInCar()
 	case MI_TRAIN:
 	case MI_SPEEDER:
 	case MI_REEFER:
-	case MI_GHOST: return false;
+//	case MI_GHOST:
+		return false;
 	default: return true;
 	}
 }
@@ -116,7 +117,7 @@ cMusicManager::DisplayRadioStationName()
 
 				while(gRetuneCounter) {
 					if(pRetune == RADIO_OFF) {
-						pRetune = HEAD_RADIO;
+						pRetune = WILDSTYLE;
 					} else if(pRetune < USERTRACK) {
 						pRetune = pRetune + 1;
 					}
@@ -130,20 +131,20 @@ cMusicManager::DisplayRadioStationName()
 		wchar *string = nil;
 
 		switch(pRetune) {
-		case HEAD_RADIO: string = TheText.Get("FEA_FM0"); break;
-		case DOUBLE_CLEF: string = TheText.Get("FEA_FM1"); break;
-		case JAH_RADIO: string = TheText.Get("FEA_FM2"); break;
-		case RISE_FM: string = TheText.Get("FEA_FM3"); break;
-		case LIPS_106: string = TheText.Get("FEA_FM4"); break;
-		case GAME_FM: string = TheText.Get("FEA_FM5"); break;
-		case MSX_FM: string = TheText.Get("FEA_FM6"); break;
-		case FLASHBACK: string = TheText.Get("FEA_FM7"); break;
-		case CHATTERBOX: string = TheText.Get("FEA_FM8"); break;
+		case WILDSTYLE: string = TheText.Get("FEA_FM0"); break;
+		case FLASH_FM: string = TheText.Get("FEA_FM1"); break;
+		case KCHAT: string = TheText.Get("FEA_FM2"); break;
+		case FEVER: string = TheText.Get("FEA_FM3"); break;
+		case V_ROCK: string = TheText.Get("FEA_FM4"); break;
+		case VCPR: string = TheText.Get("FEA_FM5"); break;
+		case RADIO_ESPANTOSO: string = TheText.Get("FEA_FM6"); break;
+		case EMOTION: string = TheText.Get("FEA_FM7"); break;
+		case WAVE: string = TheText.Get("FEA_FM8"); break;
 		case USERTRACK: string = TheText.Get("FEA_FM9"); break;
 		default: return;
 		};
 
-		if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
+		if(pRetune > WAVE && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
 
 		if(string && pCurrentStation != string ||
 		   m_nCurrentStreamedSound == STREAMED_SOUND_RADIO_MP3_PLAYER &&
@@ -222,7 +223,7 @@ cMusicManager::Initialise()
 		m_bDoTrackService = false;
 		m_bIgnoreTimeDelay = false;
 		m_bRadioSetByScript = false;
-		m_nRadioStation = HEAD_RADIO;
+		m_nRadioStation = WILDSTYLE;
 		m_nRadioPosition = -1;
 		m_nRadioInCar = NO_STREAMED_SOUND;
 		gNumRetunePresses = 0;
@@ -296,7 +297,7 @@ cMusicManager::ChangeMusicMode(uint8 mode)
 uint8
 cMusicManager::GetRadioInCar(void)
 {
-	if (!m_bIsInitialised) return HEAD_RADIO;
+	if (!m_bIsInitialised) return WILDSTYLE;
 	if (PlayerInCar()) {
 		CVehicle *veh = FindPlayerVehicle();
 		if (veh != nil){
@@ -404,9 +405,6 @@ cMusicManager::ServiceFrontEndMode()
 					if (!AudioManager.m_nUserPause)
 						ChangeMusicMode(MUSICMODE_GAME);
 					break;
-				case STREAMED_SOUND_GAME_COMPLETED:
-					ChangeMusicMode(MUSICMODE_GAME);
-					break;
 				default:
 					break;
 				}
@@ -625,14 +623,14 @@ cMusicManager::StopFrontEndTrack()
 }
 
 void
-cMusicManager::PlayAnnouncement(uint8 announcement)
+cMusicManager::PlayAnnouncement(uint32 announcement)
 {
 	if (IsInitialised() && !m_bDisabled && !m_bAnnouncementInProgress)
 		m_nAnnouncement = announcement;
 }
 
 void
-cMusicManager::PlayFrontEndTrack(uint8 track, uint8 bPlayInFrontend)
+cMusicManager::PlayFrontEndTrack(uint32 track, uint8 bPlayInFrontend)
 {
 	if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS) {
 		if (m_nMusicMode == MUSICMODE_GAME) {
@@ -667,7 +665,7 @@ cMusicManager::PlayFrontEndTrack(uint8 track, uint8 bPlayInFrontend)
 }
 
 void
-cMusicManager::PreloadCutSceneMusic(uint8 track)
+cMusicManager::PreloadCutSceneMusic(uint32 track)
 {
 	if (IsInitialised() && !m_bDisabled && track < TOTAL_STREAMED_SOUNDS && m_nMusicMode == MUSICMODE_CUTSCENE) {
 		AudioManager.ResetPoliceRadio();
@@ -847,7 +845,7 @@ cMusicManager::ServiceAnnouncement()
 	return false;
 }
 
-uint8
+uint32
 cMusicManager::GetCarTuning()
 {
 	CVehicle *veh = FindPlayerVehicle();
@@ -858,12 +856,12 @@ cMusicManager::GetCarTuning()
 	return veh->m_nRadioStation;
 }
 
-uint8
+uint32
 cMusicManager::GetNextCarTuning()
 {
 	CVehicle *veh = FindPlayerVehicle();
 	if (veh == nil) return RADIO_OFF;
-	if (UsesPoliceRadio(veh)) return POLICE_RADIO;
+	if (UsesPoliceRadio(veh)) return STREAMED_SOUND_RADIO_POLICE;
 	if (gNumRetunePresses != 0) {
 		if (SampleManager.IsMP3RadioChannelAvailable()) {
 			if (veh->m_nRadioStation == RADIO_OFF)
@@ -876,7 +874,7 @@ cMusicManager::GetNextCarTuning()
 		} else if (gNumRetunePresses + veh->m_nRadioStation >= USERTRACK) {
 			while (gNumRetunePresses) {
 				if (veh->m_nRadioStation == RADIO_OFF)
-					veh->m_nRadioStation = HEAD_RADIO;
+					veh->m_nRadioStation = WILDSTYLE;
 				else if (veh->m_nRadioStation < USERTRACK)
 					++veh->m_nRadioStation;
 
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index e8b94da6..217b037b 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -18,12 +18,12 @@ public:
 	bool m_bIsInitialised;
 	bool m_bDisabled;
 	uint8 m_nMusicMode;
-	uint8 m_nCurrentStreamedSound;
-	uint8 m_nPreviousStreamedSound;
+	uint32 m_nCurrentStreamedSound;
+	uint32 m_nPreviousStreamedSound;
 	bool m_bFrontendTrackFinished;
 	bool m_bPlayInFrontend;
 	bool m_bSetNextStation;
-	uint8 m_nAnnouncement;
+	uint32 m_nAnnouncement;
 	bool m_bPreviousPlayerInCar;
 	bool m_bPlayerInCar;
 	bool m_bAnnouncementInProgress;
@@ -36,9 +36,9 @@ public:
 	bool m_bIgnoreTimeDelay;
 	bool m_bDontServiceAmbienceTrack;
 	bool m_bRadioSetByScript;
-	uint8 m_nRadioStation;
+	uint32 m_nRadioStation;
 	int32 m_nRadioPosition;
-	uint8 m_nRadioInCar;
+	uint32 m_nRadioInCar;
 
 public:
 	cMusicManager();
@@ -55,9 +55,9 @@ public:
 	bool PlayerInCar();
 	void DisplayRadioStationName();
 
-	void PlayAnnouncement(uint8);
-	void PlayFrontEndTrack(uint8, uint8);
-	void PreloadCutSceneMusic(uint8);
+	void PlayAnnouncement(uint32);
+	void PlayFrontEndTrack(uint32, uint8);
+	void PreloadCutSceneMusic(uint32);
 	void PlayPreloadedCutSceneMusic(void);
 	void StopCutSceneMusic(void);
 	uint8 GetRadioInCar(void);
@@ -79,8 +79,8 @@ public:
 	void ComputeAmbienceVol(uint8 reset, uint8& outVolume);
 	bool ServiceAnnouncement();
 
-	uint8 GetCarTuning();
-	uint8 GetNextCarTuning();
+	uint32 GetCarTuning();
+	uint32 GetNextCarTuning();
 	bool ChangeRadioChannel();
 };
 
diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp
index af346479..5843fd09 100644
--- a/src/audio/PoliceRadio.cpp
+++ b/src/audio/PoliceRadio.cpp
@@ -24,8 +24,6 @@ struct tPoliceRadioZone {
 };
 
 tPoliceRadioZone ZoneSfx[NUMAUDIOZONES];
-char SubZo2Label[8];
-char SubZo3Label[8];
 
 int32 g_nMissionAudioSfx = TOTAL_AUDIO_SAMPLES;
 int8 g_nMissionAudioPlayingStatus = 2;
@@ -42,46 +40,22 @@ cAudioManager::InitialisePoliceRadioZones()
 	strcpy(ZoneSfx[i].m_aName, name); \
 	ZoneSfx[i].m_nSampleIndex = sample;
 
-	SETZONESFX(0, "HOSPI_2", SFX_POLICE_RADIO_ROCKFORD);
-	SETZONESFX(1, "CONSTRU", SFX_POLICE_RADIO_FORT_STAUNTON);
-	SETZONESFX(2, "STADIUM", SFX_POLICE_RADIO_ASPATRIA);
-	SETZONESFX(3, "YAKUSA", SFX_POLICE_RADIO_TORRINGTON);
-	SETZONESFX(4, "SHOPING", SFX_POLICE_RADIO_BEDFORD_POINT);
-	SETZONESFX(5, "COM_EAS", SFX_POLICE_RADIO_NEWPORT);
-	SETZONESFX(6, "PARK", SFX_POLICE_RADIO_BELLEVILLE_PARK);
-	SETZONESFX(7, "UNIVERS", SFX_POLICE_RADIO_LIBERTY_CAMPUS);
-	SETZONESFX(8, "BIG_DAM", SFX_POLICE_RADIO_COCHRANE_DAM);
-	SETZONESFX(9, "SUB_IND", SFX_POLICE_RADIO_PIKE_CREEK);
-	SETZONESFX(10, "SWANKS", SFX_POLICE_RADIO_CEDAR_GROVE);
-	SETZONESFX(11, "PROJECT", SFX_POLICE_RADIO_WICHITA_GARDENS);
-	SETZONESFX(12, "AIRPORT", SFX_POLICE_RADIO_FRANCIS_INTERNATIONAL_AIRPORT);
-	SETZONESFX(13, "PORT_W", SFX_POLICE_RADIO_CALLAHAN_POINT);
-	SETZONESFX(14, "PORT_S", SFX_POLICE_RADIO_ATLANTIC_QUAYS);
-	SETZONESFX(15, "PORT_E", SFX_POLICE_RADIO_PORTLAND_HARBOUR);
-	SETZONESFX(16, "PORT_I", SFX_POLICE_RADIO_TRENTON);
-	SETZONESFX(17, "CHINA", SFX_POLICE_RADIO_CHINATOWN);
-	SETZONESFX(18, "REDLIGH", SFX_POLICE_RADIO_RED_LIGHT_DISTRICT);
-	SETZONESFX(19, "TOWERS", SFX_POLICE_RADIO_HEPBURN_HEIGHTS);
-	SETZONESFX(20, "LITTLEI", SFX_POLICE_RADIO_SAINT_MARKS);
-	SETZONESFX(21, "HARWOOD", SFX_POLICE_RADIO_HARWOOD);
-	SETZONESFX(22, "EASTBAY", SFX_POLICE_RADIO_PORTLAND_BEACH);
-	SETZONESFX(23, "S_VIEW", SFX_POLICE_RADIO_PORTLAND_STRAIGHTS);
-	SETZONESFX(24, "CITYZON", SFX_POLICE_RADIO_LIBERTY_CITY);
-	SETZONESFX(25, "IND_ZON", SFX_POLICE_RADIO_PORTLAND);
-	SETZONESFX(26, "COM_ZON", SFX_POLICE_RADIO_STAUNTON_ISLAND);
-	SETZONESFX(27, "SUB_ZON", SFX_POLICE_RADIO_SHORESIDE_VALE);
-	SETZONESFX(28, "SUB_ZO2", SFX_POLICE_RADIO_SHORESIDE_VALE);
-	SETZONESFX(29, "SUB_ZO3", SFX_POLICE_RADIO_SHORESIDE_VALE);
-	SETZONESFX(30, "A", SFX_POLICE_RADIO_ROCKFORD);
-	SETZONESFX(31, "A", SFX_POLICE_RADIO_ROCKFORD);
-	SETZONESFX(32, "A", SFX_POLICE_RADIO_ROCKFORD);
-	SETZONESFX(33, "A", SFX_POLICE_RADIO_ROCKFORD);
-	SETZONESFX(34, "A", SFX_POLICE_RADIO_ROCKFORD);
+	SETZONESFX(0, "VICE_C", SFX_POLICE_RADIO_VICE_CITY);
+	SETZONESFX(1, "IND_ZON", SFX_POLICE_RADIO_VICE_CITY_BEACH);
+	SETZONESFX(2, "COM_ZON", SFX_POLICE_RADIO_VICE_CITY_MAINLAND);
+	SETZONESFX(3, "BEACH1", SFX_POLICE_RADIO_OCEAN_BEACH);
+	SETZONESFX(4, "BEACH2", SFX_POLICE_RADIO_WASHINGTON_BEACH);
+	SETZONESFX(5, "BEACH3", SFX_POLICE_RADIO_VICE_POINT);
+	SETZONESFX(6, "GOLFC", SFX_POLICE_RADIO_LEAF_LINKS);
+	SETZONESFX(7, "STARI", SFX_POLICE_RADIO_STRAFISH_ISLAND);
+	SETZONESFX(8, "DOCKS", SFX_POLICE_RADIO_VICE_PORT);
+	SETZONESFX(9, "HAVANA", SFX_POLICE_RADIO_LITTLE_HAVANA);
+	SETZONESFX(10, "HAITI", SFX_POLICE_RADIO_LITTLE_HAITI);
+	SETZONESFX(11, "PORNI", SFX_POLICE_RADIO_PRAWN_ISLAND);
+	SETZONESFX(12, "DTOWN", SFX_POLICE_RADIO_DOWNTOWN);
+	SETZONESFX(13, "A_PORT", SFX_POLICE_RADIO_ESCOBAR_INTERNATIONAL);
 
 #undef SETZONESFX
-
-	strcpy(SubZo2Label, "SUB_ZO2");
-	strcpy(SubZo3Label, "SUB_ZO3");
 }
 
 void
@@ -244,7 +218,7 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 			if (!wantedLevel) {
 				if (gSpecialSuspectLastSeenReport) {
 					gSpecialSuspectLastSeenReport = 0;
-				} else if (((sample >= SFX_POLICE_RADIO_MESSAGE_NOISE_1) && (sample <= SFX_POLICE_RADIO_MESSAGE_NOISE_3)) || sample == TOTAL_AUDIO_SAMPLES) {
+				} else if (sample == SFX_POLICE_RADIO_MESSAGE_NOISE_1 || sample == TOTAL_AUDIO_SAMPLES) {
 					bChannelOpen = false;
 					processed = true;
 				}
@@ -255,8 +229,6 @@ cAudioManager::ServicePoliceRadioChannel(int32 wantedLevel)
 				SampleManager.InitialiseChannel(policeChannel, sample, 0);
 				switch (sample) {
 				case SFX_POLICE_RADIO_MESSAGE_NOISE_1:
-				case SFX_POLICE_RADIO_MESSAGE_NOISE_2:
-				case SFX_POLICE_RADIO_MESSAGE_NOISE_3:
 					freq = m_anRandomTable[4] % 2000 + 10025;
 					bChannelOpen = bChannelOpen == false;
 					break;
@@ -311,7 +283,7 @@ cAudioManager::SetupCrimeReport()
 				sampleIndex = ZoneSfx[j].m_nSampleIndex;
 				m_sPoliceRadioQueue.Add(m_anRandomTable[4] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1);
 				m_sPoliceRadioQueue.Add(m_anRandomTable[0] % 3 + SFX_WEVE_GOT);
-				m_sPoliceRadioQueue.Add(m_anRandomTable[1] % 2 + SFX_A_10_1);
+				m_sPoliceRadioQueue.Add(SFX_A_10);
 				switch (m_sPoliceRadioQueue.crimes[i].type) {
 				case CRIME_PED_BURNED: m_sPoliceRadioQueue.crimes[i].type = CRIME_HIT_PED; break;
 				case CRIME_COP_BURNED: m_sPoliceRadioQueue.crimes[i].type = CRIME_HIT_COP; break;
@@ -321,37 +293,31 @@ cAudioManager::SetupCrimeReport()
 				}
 				m_sPoliceRadioQueue.Add(m_sPoliceRadioQueue.crimes[i].type + SFX_CRIME_1 - 1);
 				m_sPoliceRadioQueue.Add(SFX_IN);
-				if (sampleIndex == SFX_POLICE_RADIO_SHORESIDE_VALE &&
-					(strcmp(zone->name, SubZo2Label) == 0 || strcmp(zone->name, SubZo3Label) == 0)) {
+				rangeX = zone->maxx - zone->minx;
+				rangeY = zone->maxy - zone->miny;
+				halfX = 0.5f * rangeX + zone->minx;
+				halfY = 0.5f * rangeY + zone->miny;
+				quarterX = 0.25f * rangeX;
+				quarterY = 0.25f * rangeY;
+
+				if (m_sPoliceRadioQueue.crimes[i].position.y > halfY + quarterY) {
 					m_sPoliceRadioQueue.Add(SFX_NORTH);
-					m_sPoliceRadioQueue.Add(SFX_EAST);
-				} else {
-					rangeX = zone->maxx - zone->minx;
-					rangeY = zone->maxy - zone->miny;
-					halfX = 0.5f * rangeX + zone->minx;
-					halfY = 0.5f * rangeY + zone->miny;
-					quarterX = 0.25f * rangeX;
-					quarterY = 0.25f * rangeY;
-
-					if (m_sPoliceRadioQueue.crimes[i].position.y > halfY + quarterY) {
-						m_sPoliceRadioQueue.Add(SFX_NORTH);
-						processed = true;
-					} else if (m_sPoliceRadioQueue.crimes[i].position.y < halfY - quarterY) {
-						m_sPoliceRadioQueue.Add(SFX_SOUTH);
-						processed = true;
-					}
-
-					if (m_sPoliceRadioQueue.crimes[i].position.x > halfX + quarterX)
-						m_sPoliceRadioQueue.Add(SFX_EAST);
-					else if (m_sPoliceRadioQueue.crimes[i].position.x < halfX - quarterX)
-						m_sPoliceRadioQueue.Add(SFX_WEST);
-					else if (!processed)
-						m_sPoliceRadioQueue.Add(SFX_CENTRAL);
-
-					m_sPoliceRadioQueue.Add(sampleIndex);
-					m_sPoliceRadioQueue.Add(m_anRandomTable[2] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1);
-					m_sPoliceRadioQueue.Add(TOTAL_AUDIO_SAMPLES);
+					processed = true;
+				} else if (m_sPoliceRadioQueue.crimes[i].position.y < halfY - quarterY) {
+					m_sPoliceRadioQueue.Add(SFX_SOUTH);
+					processed = true;
 				}
+
+				if (m_sPoliceRadioQueue.crimes[i].position.x > halfX + quarterX)
+					m_sPoliceRadioQueue.Add(SFX_EAST);
+				else if (m_sPoliceRadioQueue.crimes[i].position.x < halfX - quarterX)
+					m_sPoliceRadioQueue.Add(SFX_WEST);
+				else if (!processed)
+					m_sPoliceRadioQueue.Add(SFX_CENTRAL);
+
+				m_sPoliceRadioQueue.Add(sampleIndex);
+				m_sPoliceRadioQueue.Add(m_anRandomTable[2] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1);
+				m_sPoliceRadioQueue.Add(TOTAL_AUDIO_SAMPLES);
 				break;
 			}
 		}
@@ -538,43 +504,45 @@ cAudioManager::SetupSuspectLastSeenReport()
 					color_pre_modifier = gCarColourTable[color1][0];
 					color_post_modifier = gCarColourTable[color1][2];
 					switch (veh->GetModelIndex()) {
+// TODO(MIAMI): just making this compile
 #ifdef FIX_BUGS
-					case MI_COLUMB:
-						main_color = SFX_POLICE_RADIO_BLUE;
-						color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
+	//				case MI_COLUMB:
+	//					main_color = SFX_POLICE_RADIO_BLUE;
+	//					color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
 #endif
 					case MI_LANDSTAL:
-					case MI_BLISTA: sample = SFX_POLICE_RADIO_CRUISER; break;
+	//				case MI_BLISTA: 
+						sample = SFX_POLICE_RADIO_CRUISER; break;
 #ifdef FIX_BUGS
-					case MI_YARDIE:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_RED;
-						color_post_modifier = SFX_POLICE_RADIO_YELLOW;
-						sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
-					case MI_DIABLOS:
-						main_color = SFX_POLICE_RADIO_BLACK;
+	//				case MI_YARDIE:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_RED;
+	//					color_post_modifier = SFX_POLICE_RADIO_YELLOW;
+	//					sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
+	//				case MI_DIABLOS:
+	//					main_color = SFX_POLICE_RADIO_BLACK;
 #endif
 					case MI_IDAHO:
-					case MI_STALLION: sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
+	//				case MI_STALLION: sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
 #ifdef FIX_BUGS
-					case MI_YAKUZA:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_SILVER;
-						color_post_modifier = SFX_POLICE_RADIO_RED;
+	//				case MI_YAKUZA:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_SILVER;
+	//					color_post_modifier = SFX_POLICE_RADIO_RED;
 #endif
 					case MI_STINGER:
 					case MI_INFERNUS:
 					case MI_CHEETAH:
 					case MI_BANSHEE: sample = SFX_POLICE_RADIO_SPORTS_CAR; break;
 #ifdef FIX_BUGS
-					case MI_MAFIA:
-						color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_GREY;
-					case MI_KURUMA:
+	//				case MI_MAFIA:
+	//					color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_GREY;
+					case MI_WASHING:
 #endif
 					case MI_PEREN:
 					case MI_SENTINEL:
-					case MI_FBICAR: sample = SFX_POLICE_RADIO_SALOON; break;
+	//				case MI_FBICAR: sample = SFX_POLICE_RADIO_SALOON; break;
 					case MI_PATRIOT:
 					case MI_BOBCAT: sample = SFX_POLICE_RADIO_PICKUP; break;
 					case MI_FIRETRUCK: sample = SFX_POLICE_RADIO_FIRE_TRUCK; break;
@@ -584,22 +552,19 @@ cAudioManager::SetupSuspectLastSeenReport()
 #endif
 					case MI_TRASH:
 					case MI_BARRACKS: sample = SFX_POLICE_RADIO_TRUCK; break;
-					case MI_STRETCH: sample = SFX_POLICE_RADIO_LIMO; break;
-#ifdef FIX_BUGS
-					case MI_CORPSE:
-#endif
+	//				case MI_STRETCH: sample = SFX_POLICE_RADIO_LIMO; break;
 					case MI_MANANA:
 					case MI_ESPERANT: sample = SFX_POLICE_RADIO_2_DOOR; break;
 #ifdef FIX_BUGS
-					case MI_HOODS:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_BLUE;
-						color_post_modifier = SFX_POLICE_RADIO_GREEN;
-					case MI_BELLYUP:
+	//				case MI_HOODS:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_BLUE;
+	//					color_post_modifier = SFX_POLICE_RADIO_GREEN;
+	//				case MI_BELLYUP:
 					case MI_YANKEE:
-					case MI_TOYZ:
-					case MI_MRWONGS:
-					case MI_PANLANT:
+					case MI_TOPFUN:
+	//				case MI_MRWONGS:
+	//				case MI_PANLANT:
 #endif
 					case MI_PONY:
 					case MI_MULE:
@@ -610,7 +575,8 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_AMBULAN: sample = SFX_POLICE_RADIO_AMBULANCE; break;
 					case MI_TAXI:
 					case MI_CABBIE:
-					case MI_BORGNINE: sample = SFX_POLICE_RADIO_TAXI; break;
+					case MI_ZEBRA: sample = SFX_POLICE_RADIO_TAXI; break;
+					case MI_KAUFMAN: sample = SFX_POLICE_RADIO_TAXI; break;
 					case MI_MRWHOOP:
 						sample = SFX_POLICE_RADIO_ICE_CREAM_VAN;
 						break;
@@ -619,7 +585,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 #ifdef FIX_BUGS
 					case MI_SPEEDER:
 					case MI_REEFER:
-					case MI_GHOST:
+	//				case MI_GHOST:
 #endif
 					case MI_PREDATOR: sample = SFX_POLICE_RADIO_BOAT; break;
 					case MI_BUS:
@@ -629,12 +595,12 @@ cAudioManager::SetupSuspectLastSeenReport()
 						main_color = TOTAL_AUDIO_SAMPLES;
 						color_post_modifier = TOTAL_AUDIO_SAMPLES;
 						break;
-					case MI_TRAIN:
-						sample = SFX_POLICE_RADIO_SUBWAY_CAR;
-						main_color = TOTAL_AUDIO_SAMPLES;
-						color_post_modifier = TOTAL_AUDIO_SAMPLES;
+	//				case MI_TRAIN:
+	//					sample = SFX_POLICE_RADIO_SUBWAY_CAR;
+	//					main_color = TOTAL_AUDIO_SAMPLES;
+	//					color_post_modifier = TOTAL_AUDIO_SAMPLES;
 
-						break;
+	//					break;
 					default:
 						debug("\n *** UNKNOWN CAR MODEL INDEX %d *** ", veh->GetModelIndex());
 						return;
@@ -643,14 +609,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 					m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_SUSPECT);
 					if (m_anRandomTable[3] % 2) 
 						m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_LAST_SEEN);
-#ifdef FIX_BUGS
-					if (main_color == SFX_POLICE_RADIO_ORANGE && color_pre_modifier == TOTAL_AUDIO_SAMPLES)
-#else
-					if (main_color == SFX_POLICE_RADIO_ORANGE)
-#endif
-						m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_IN_AN);
-					else
-						m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_IN_A);
+					m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_IN_A);
 					if (color_pre_modifier != TOTAL_AUDIO_SAMPLES)
 						m_sPoliceRadioQueue.Add(color_pre_modifier);
 					if (main_color != TOTAL_AUDIO_SAMPLES)
@@ -729,34 +688,27 @@ cAudioManager::PlaySuspectLastSeen(float x, float y, float z)
 					m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_SUSPECT);
 					m_sPoliceRadioQueue.Add(SFX_POLICE_RADIO_LAST_SEEN);
 					m_sPoliceRadioQueue.Add(SFX_IN);
-					if (sample == SFX_POLICE_RADIO_SHORESIDE_VALE &&
-						(strcmp(zone->name, SubZo2Label) == 0 ||
-							strcmp(zone->name, SubZo3Label) == 0)) {
+					rangeX = zone->maxx - zone->minx;
+					rangeY = zone->maxy - zone->miny;
+					halfX = 0.5f * rangeX + zone->minx;
+					halfY = 0.5f * rangeY + zone->miny;
+					quarterX = 0.25f * rangeX;
+					quarterY = 0.25f * rangeY;
+
+					if (vec.y > halfY + quarterY) {
 						m_sPoliceRadioQueue.Add(SFX_NORTH);
-						m_sPoliceRadioQueue.Add(SFX_EAST);
-					} else {
-						rangeX = zone->maxx - zone->minx;
-						rangeY = zone->maxy - zone->miny;
-						halfX = 0.5f * rangeX + zone->minx;
-						halfY = 0.5f * rangeY + zone->miny;
-						quarterX = 0.25f * rangeX;
-						quarterY = 0.25f * rangeY;
-
-						if (vec.y > halfY + quarterY) {
-							m_sPoliceRadioQueue.Add(SFX_NORTH);
-							processed = true;
-						} else if (vec.y < halfY - quarterY) {
-							m_sPoliceRadioQueue.Add(SFX_SOUTH);
-							processed = true;
-						}
-
-						if (vec.x > halfX + quarterX)
-							m_sPoliceRadioQueue.Add(SFX_EAST);
-						else if (vec.x < halfX - quarterX)
-							m_sPoliceRadioQueue.Add(SFX_WEST);
-						else if (!processed)
-							m_sPoliceRadioQueue.Add(SFX_CENTRAL);
+						processed = true;
+					} else if (vec.y < halfY - quarterY) {
+						m_sPoliceRadioQueue.Add(SFX_SOUTH);
+						processed = true;
 					}
+
+					if (vec.x > halfX + quarterX)
+						m_sPoliceRadioQueue.Add(SFX_EAST);
+					else if (vec.x < halfX - quarterX)
+						m_sPoliceRadioQueue.Add(SFX_WEST);
+					else if (!processed)
+						m_sPoliceRadioQueue.Add(SFX_CENTRAL);
 					m_sPoliceRadioQueue.Add(sample);
 					m_sPoliceRadioQueue.Add(m_anRandomTable[2] % 3 + SFX_POLICE_RADIO_MESSAGE_NOISE_1);
 					m_sPoliceRadioQueue.Add(TOTAL_AUDIO_SAMPLES);
diff --git a/src/audio/audio_enums.h b/src/audio/audio_enums.h
index 8136ff66..90b87f1d 100644
--- a/src/audio/audio_enums.h
+++ b/src/audio/audio_enums.h
@@ -2,17 +2,18 @@
 
 enum eRadioStation
 {
-	HEAD_RADIO,
-	DOUBLE_CLEF,
-	JAH_RADIO,
-	RISE_FM,
-	LIPS_106,
-	GAME_FM,
-	MSX_FM,
-	FLASHBACK,
-	CHATTERBOX,
+	WILDSTYLE,
+	FLASH_FM,
+	KCHAT,
+	FEVER,
+	V_ROCK,
+	VCPR,
+	RADIO_ESPANTOSO,
+	EMOTION,
+	WAVE,
 	USERTRACK,
 	POLICE_RADIO,
+	//TAXI_RADIO,
 	RADIO_OFF,
 };
 
@@ -27,202 +28,1230 @@ enum eMusicMode
 
 enum eStreamedSounds
 {
-	STREAMED_SOUND_RADIO_HEAD,
-	STREAMED_SOUND_RADIO_CLASSIC,
-	STREAMED_SOUND_RADIO_KJAH,
-	STREAMED_SOUND_RADIO_RISE,
-	STREAMED_SOUND_RADIO_LIPS,
-	STREAMED_SOUND_RADIO_GAME,
-	STREAMED_SOUND_RADIO_MSX,
+	STREAMED_SOUND_RADIO_WILD,
 	STREAMED_SOUND_RADIO_FLASH,
-	STREAMED_SOUND_RADIO_CHAT,
+	STREAMED_SOUND_RADIO_KCHAT,
+	STREAMED_SOUND_RADIO_FEVER,
+	STREAMED_SOUND_RADIO_VROCK,
+	STREAMED_SOUND_RADIO_VCPR,
+	STREAMED_SOUND_RADIO_ESPANTOSO,
+	STREAMED_SOUND_RADIO_EMOTION,
+	STREAMED_SOUND_RADIO_WAVE,
 	STREAMED_SOUND_RADIO_MP3_PLAYER,
-	STREAMED_SOUND_RADIO_POLICE,
 	STREAMED_SOUND_CITY_AMBIENT,
 	STREAMED_SOUND_WATER_AMBIENT,
-	STREAMED_SOUND_ANNOUNCE_COMMERCIAL_OPEN,
-	STREAMED_SOUND_ANNOUNCE_SUBURBAN_OPEN,
-	STREAMED_SOUND_NEWS_INTRO,
-	STREAMED_SOUND_BANK_INTRO,
-	STREAMED_SOUND_CUTSCENE_LUIGI1_LG,
-	STREAMED_SOUND_CUTSCENE_LUIGI2_DSB,
-	STREAMED_SOUND_CUTSCENE_LUIGI3_DM,
-	STREAMED_SOUND_CUTSCENE_LUIGI4_PAP,
-	STREAMED_SOUND_CUTSCENE_LUIGI5_TFB,
-	STREAMED_SOUND_CUTSCENE_JOEY0_DM2,
-	STREAMED_SOUND_CUTSCENE_JOEY1_LFL,
-	STREAMED_SOUND_CUTSCENE_JOEY2_KCL,
-	STREAMED_SOUND_CUTSCENE_JOEY3_VH,
-	STREAMED_SOUND_CUTSCENE_JOEY4_ETH,
-	STREAMED_SOUND_CUTSCENE_JOEY5_DST,
-	STREAMED_SOUND_CUTSCENE_JOEY6_TBJ,
-	STREAMED_SOUND_CUTSCENE_TONI1_TOL,
-	STREAMED_SOUND_CUTSCENE_TONI2_TPU,
-	STREAMED_SOUND_CUTSCENE_TONI3_MAS,
-	STREAMED_SOUND_CUTSCENE_TONI4_TAT,
-	STREAMED_SOUND_CUTSCENE_TONI5_BF,
-	STREAMED_SOUND_CUTSCENE_SAL0_MAS,
-	STREAMED_SOUND_CUTSCENE_SAL1_PF,
-	STREAMED_SOUND_CUTSCENE_SAL2_CTG,
-	STREAMED_SOUND_CUTSCENE_SAL3_RTC,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQ,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBA,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBB,
-	STREAMED_SOUND_CUTSCENE_SAL2_CTG2,
-	STREAMED_SOUND_CUTSCENE_SAL4_BDBD,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQB,
-	STREAMED_SOUND_CUTSCENE_SAL5_LRQC,
-	STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO,
-	STREAMED_SOUND_CUTSCENE_ASUKA_2_PP,
-	STREAMED_SOUND_CUTSCENE_ASUKA_3_SS,
-	STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR,
-	STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT,
-	STREAMED_SOUND_CUTSCENE_KENJI1_KBO,
-	STREAMED_SOUND_CUTSCENE_KENJI2_GIS,
-	STREAMED_SOUND_CUTSCENE_KENJI3_DS,
-	STREAMED_SOUND_CUTSCENE_KENJI4_SHI,
-	STREAMED_SOUND_CUTSCENE_KENJI5_SD,
-	STREAMED_SOUND_CUTSCENE_RAY0_PDR2,
-	STREAMED_SOUND_CUTSCENE_RAY1_SW,
-	STREAMED_SOUND_CUTSCENE_RAY2_AP,
-	STREAMED_SOUND_CUTSCENE_RAY3_ED,
-	STREAMED_SOUND_CUTSCENE_RAY4_GF,
-	STREAMED_SOUND_CUTSCENE_RAY5_PB,
-	STREAMED_SOUND_CUTSCENE_RAY6_MM,
-	STREAMED_SOUND_CUTSCENE_DONALD1_STOG,
-	STREAMED_SOUND_CUTSCENE_DONALD2_KK,
-	STREAMED_SOUND_CUTSCENE_DONALD3_ADO,
-	STREAMED_SOUND_CUTSCENE_DONALD5_ES,
-	STREAMED_SOUND_CUTSCENE_DONALD7_MLD,
-	STREAMED_SOUND_CUTSCENE_DONALD4_GTA,
-	STREAMED_SOUND_CUTSCENE_DONALD4_GTA2,
-	STREAMED_SOUND_CUTSCENE_DONALD6_STS,
-	STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT,
-	STREAMED_SOUND_CUTSCENE_ASUKA7_ETG,
-	STREAMED_SOUND_CUTSCENE_ASUKA8_PS,
-	STREAMED_SOUND_CUTSCENE_ASUKA9_ASD,
-	STREAMED_SOUND_CUTSCENE_KENJI4_SHI2,
-	STREAMED_SOUND_CUTSCENE_CATALINA1_TEX,
+	STREAMED_SOUND_BEACH_AMBIENT,
+	STREAMED_SOUND_HAVANA_CITY_AMBIENT,
+	STREAMED_SOUND_HAVANA_WATER_AMBIENT,
+	STREAMED_SOUND_HAVANA_BEACH_AMBIENT,
+	STREAMED_SOUND_MALL_AMBIENT,
+	STREAMED_SOUND_STRIPCLUB_AMBIENT,
+	STREAMED_SOUND_MALIBU_AMBIENT,
+	STREAMED_SOUND_HOTEL_AMBIENT,
+	STREAMED_SOUND_DIRTRING_AMBIENT,
+	STREAMED_SOUND_LAW4RIOT_AMBIENT,
+	STREAMED_SOUND_AMBSIL_AMBIENT,
+	STREAMED_SOUND_RADIO_POLICE,
+	STREAMED_SOUND_RADIO_TAXI,
+	STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED,
+	STREAMED_SOUND_ANNOUNCE_BRIDGE_OPEN,
+	STREAMED_SOUND_CUTSCENE_ASS_1,
+	STREAMED_SOUND_CUTSCENE_ASS_2,
+	STREAMED_SOUND_CUTSCENE_BANK_1,
+	STREAMED_SOUND_CUTSCENE_BANK_2A,
+	STREAMED_SOUND_CUTSCENE_BANK_2B,
+	STREAMED_SOUND_CUTSCENE_BANK_3A,
+	STREAMED_SOUND_CUTSCENE_BANK_3B,
+	STREAMED_SOUND_CUTSCENE_BANK_4,
+	STREAMED_SOUND_CUTSCENE_BIKE_1,
+	STREAMED_SOUND_CUTSCENE_BIKE_2,
+	STREAMED_SOUND_CUTSCENE_BIKE_3,
+	STREAMED_SOUND_CUTSCENE_BUD_1,
+	STREAMED_SOUND_CUTSCENE_BUD_2,
+	STREAMED_SOUND_CUTSCENE_BUD_3,
+	STREAMED_SOUND_CUTSCENE_CAP_1,
+	STREAMED_SOUND_CUTSCENE_CAR_1,
+	STREAMED_SOUND_CUTSCENE_CNT_1A,
+	STREAMED_SOUND_CUTSCENE_CNT_1B,
+	STREAMED_SOUND_CUTSCENE_CNT_2,
+	STREAMED_SOUND_CUTSCENE_COK_1,
+	STREAMED_SOUND_CUTSCENE_COK_2A,
+	STREAMED_SOUND_CUTSCENE_COK_2B,
+	STREAMED_SOUND_CUTSCENE_COK_3,
+	STREAMED_SOUND_CUTSCENE_COK_4A,
+	STREAMED_SOUND_CUTSCENE_COK_4A2,
+	STREAMED_SOUND_CUTSCENE_COK_4B,
+	STREAMED_SOUND_CUTSCENE_COL_1,
+	STREAMED_SOUND_CUTSCENE_COL_2,
+	STREAMED_SOUND_CUTSCENE_COL_3A,
+	STREAMED_SOUND_CUTSCENE_COL_4A,
+	STREAMED_SOUND_CUTSCENE_COL_5A,
+	STREAMED_SOUND_CUTSCENE_COL_5B,
+	STREAMED_SOUND_CUTSCENE_CUB_1,
+	STREAMED_SOUND_CUTSCENE_CUB_2,
+	STREAMED_SOUND_CUTSCENE_CUB_3,
+	STREAMED_SOUND_CUTSCENE_CUB_4,
+	STREAMED_SOUND_CUTSCENE_DRUG_1,
+	STREAMED_SOUND_CUTSCENE_FIN,
+	STREAMED_SOUND_CUTSCENE_FIN2,
+	STREAMED_SOUND_CUTSCENE_FINALE,
+	STREAMED_SOUND_CUTSCENE_HAT_1,
+	STREAMED_SOUND_CUTSCENE_HAT_2,
+	STREAMED_SOUND_CUTSCENE_HAT_3,
+	STREAMED_SOUND_CUTSCENE_ICE_1,
+	STREAMED_SOUND_CUTSCENE_INT_A,
+	STREAMED_SOUND_CUTSCENE_INT_B,
+	STREAMED_SOUND_CUTSCENE_INT_D,
+	STREAMED_SOUND_CUTSCENE_INT_M,
+	STREAMED_SOUND_CUTSCENE_LAW_1A,
+	STREAMED_SOUND_CUTSCENE_LAW_1B,
+	STREAMED_SOUND_CUTSCENE_LAW_2A,
+	STREAMED_SOUND_CUTSCENE_LAW_2B,
+	STREAMED_SOUND_CUTSCENE_LAW_2C,
+	STREAMED_SOUND_CUTSCENE_LAW_3,
+	STREAMED_SOUND_CUTSCENE_LAW_4,
+	STREAMED_SOUND_CUTSCENE_PHIL_1,
+	STREAMED_SOUND_CUTSCENE_PHIL_2,
+	STREAMED_SOUND_CUTSCENE_PORN_1,
+	STREAMED_SOUND_CUTSCENE_PORN_2,
+	STREAMED_SOUND_CUTSCENE_PORN_3,
+	STREAMED_SOUND_CUTSCENE_PORN_4,
+	STREAMED_SOUND_CUTSCENE_RESC_1A,
+	STREAMED_SOUND_CUTSCENE_ROK_1,
+	STREAMED_SOUND_CUTSCENE_ROK_2,
+	STREAMED_SOUND_CUTSCENE_ROK_3A,
+	STREAMED_SOUND_CUTSCENE_STRIPA,
+	STREAMED_SOUND_CUTSCENE_TAX_1,
+	STREAMED_SOUND_CUTSCENE_TEX_1,
+	STREAMED_SOUND_CUTSCENE_TEX_2,
+	STREAMED_SOUND_CUTSCENE_TEX_3,
+	STREAMED_SOUND_CUTSCENE_GLIGHT,
+	STREAMED_SOUND_CUTSCENE_FIST,
 	STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1,
 	STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2,
-	STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3,
-	STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH1,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH2,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH3,
-	STREAMED_SOUND_CUTSCENE_YARDIE_PH4,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH1,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH2,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH3,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH4,
-	STREAMED_SOUND_CUTSCENE_HOODS_PH5,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH1,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH2,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH3,
-	STREAMED_SOUND_CUTSCENE_MARTY_PH4,
 	STREAMED_SOUND_MISSION_COMPLETED,
-	STREAMED_SOUND_GAME_COMPLETED,
-	STREAMED_SOUND_MISSION_LIB_A1,
-	STREAMED_SOUND_MISSION_LIB_A2,
-	STREAMED_SOUND_MISSION_LIB_A,
-	STREAMED_SOUND_MISSION_LIB_B,
-	STREAMED_SOUND_MISSION_LIB_C,
-	STREAMED_SOUND_MISSION_LIB_D,
-	STREAMED_SOUND_MISSION_L2_A,
-	STREAMED_SOUND_MISSION_J4T_1,
-	STREAMED_SOUND_MISSION_J4T_2,
-	STREAMED_SOUND_MISSION_J4T_3,
-	STREAMED_SOUND_MISSION_J4T_4,
-	STREAMED_SOUND_MISSION_J4_A,
-	STREAMED_SOUND_MISSION_J4_B,
-	STREAMED_SOUND_MISSION_J4_C,
-	STREAMED_SOUND_MISSION_J4_D,
-	STREAMED_SOUND_MISSION_J4_E,
-	STREAMED_SOUND_MISSION_J4_F,
-	STREAMED_SOUND_MISSION_J6_1,
-	STREAMED_SOUND_MISSION_J6_A,
-	STREAMED_SOUND_MISSION_J6_B,
-	STREAMED_SOUND_MISSION_J6_C,
-	STREAMED_SOUND_MISSION_J6_D,
-	STREAMED_SOUND_MISSION_T4_A,
-	STREAMED_SOUND_MISSION_S1_A,
-	STREAMED_SOUND_MISSION_S1_A1,
-	STREAMED_SOUND_MISSION_S1_B,
-	STREAMED_SOUND_MISSION_S1_C,
-	STREAMED_SOUND_MISSION_S1_C1,
-	STREAMED_SOUND_MISSION_S1_D,
-	STREAMED_SOUND_MISSION_S1_E,
-	STREAMED_SOUND_MISSION_S1_F,
-	STREAMED_SOUND_MISSION_S1_G,
-	STREAMED_SOUND_MISSION_S1_H,
-	STREAMED_SOUND_MISSION_S1_I,
-	STREAMED_SOUND_MISSION_S1_J,
-	STREAMED_SOUND_MISSION_S1_K,
-	STREAMED_SOUND_MISSION_S1_L,
-	STREAMED_SOUND_MISSION_S3_A,
-	STREAMED_SOUND_MISSION_S3_B,
-	STREAMED_SOUND_MISSION_EL3_A,
-	STREAMED_SOUND_MISSION_MF1_A,
-	STREAMED_SOUND_MISSION_MF2_A,
-	STREAMED_SOUND_MISSION_MF3_A,
-	STREAMED_SOUND_MISSION_MF3_B,
-	STREAMED_SOUND_MISSION_MF3_B1,
-	STREAMED_SOUND_MISSION_MF3_C,
-	STREAMED_SOUND_MISSION_MF4_A,
-	STREAMED_SOUND_MISSION_MF4_B,
-	STREAMED_SOUND_MISSION_MF4_C,
-	STREAMED_SOUND_MISSION_A1_A,
-	STREAMED_SOUND_MISSION_A3_A,
-	STREAMED_SOUND_MISSION_A5_A,
-	STREAMED_SOUND_MISSION_A4_A,
-	STREAMED_SOUND_MISSION_A4_B,
-	STREAMED_SOUND_MISSION_A4_C,
-	STREAMED_SOUND_MISSION_A4_D,
-	STREAMED_SOUND_MISSION_K1_A,
-	STREAMED_SOUND_MISSION_K3_A,
-	STREAMED_SOUND_MISSION_R1_A,
-	STREAMED_SOUND_MISSION_R2_A,
-	STREAMED_SOUND_MISSION_R2_B,
-	STREAMED_SOUND_MISSION_R2_C,
-	STREAMED_SOUND_MISSION_R2_D,
-	STREAMED_SOUND_MISSION_R2_E,
-	STREAMED_SOUND_MISSION_R2_F,
-	STREAMED_SOUND_MISSION_R2_G,
-	STREAMED_SOUND_MISSION_R2_H,
-	STREAMED_SOUND_MISSION_R5_A,
-	STREAMED_SOUND_MISSION_R6_A,
-	STREAMED_SOUND_MISSION_R6_A1,
-	STREAMED_SOUND_MISSION_R6_B,
-	STREAMED_SOUND_MISSION_LO2_A,
-	STREAMED_SOUND_MISSION_LO6_A,
-	STREAMED_SOUND_MISSION_YD2_A,
-	STREAMED_SOUND_MISSION_YD2_B,
-	STREAMED_SOUND_MISSION_YD2_C,
-	STREAMED_SOUND_MISSION_YD2_C1,
-	STREAMED_SOUND_MISSION_YD2_D,
-	STREAMED_SOUND_MISSION_YD2_E,
-	STREAMED_SOUND_MISSION_YD2_F,
-	STREAMED_SOUND_MISSION_YD2_G,
-	STREAMED_SOUND_MISSION_YD2_H,
-	STREAMED_SOUND_MISSION_YD2_ASS,
-	STREAMED_SOUND_MISSION_YD2_OK,
-	STREAMED_SOUND_MISSION_H5_A,
-	STREAMED_SOUND_MISSION_H5_B,
-	STREAMED_SOUND_MISSION_H5_C,
-	STREAMED_SOUND_MISSION_AMMU_A,
-	STREAMED_SOUND_MISSION_AMMU_B,
-	STREAMED_SOUND_MISSION_AMMU_C,
-	STREAMED_SOUND_MISSION_DOOR_1,
-	STREAMED_SOUND_MISSION_DOOR_2,
-	STREAMED_SOUND_MISSION_DOOR_3,
-	STREAMED_SOUND_MISSION_DOOR_4,
-	STREAMED_SOUND_MISSION_DOOR_5,
-	STREAMED_SOUND_MISSION_DOOR_6,
-	STREAMED_SOUND_MISSION_T3_A,
-	STREAMED_SOUND_MISSION_T3_B,
-	STREAMED_SOUND_MISSION_T3_C,
-	STREAMED_SOUND_MISSION_K1_B,
-	STREAMED_SOUND_MISSION_CAT1,
+	STREAMED_SOUND_MISSION_COMPLETED4,
+	STREAMED_SOUND_MISSION_MOBR1,
+	STREAMED_SOUND_MISSION_PAGER,
+	STREAMED_SOUND_MISSION_CARREV,
+	STREAMED_SOUND_MISSION_BIKEREV,
+	STREAMED_SOUND_MISSION_LIFTOP,
+	STREAMED_SOUND_MISSION_LIFTCL,
+	STREAMED_SOUND_MISSION_LIFTRUN,
+	STREAMED_SOUND_MISSION_LIFTBEL,
+	STREAMED_SOUND_MISSION_INLIFT,
+	STREAMED_SOUND_MISSION_SFX_01,
+	STREAMED_SOUND_MISSION_SFX_02,
+	STREAMED_SOUND_MISSION_CAMERAL,
+	STREAMED_SOUND_MISSION_CAMERAR,
+	STREAMED_SOUND_MISSION_CHEER1,
+	STREAMED_SOUND_MISSION_CHEER2,
+	STREAMED_SOUND_MISSION_CHEER3,
+	STREAMED_SOUND_MISSION_CHEER4,
+	STREAMED_SOUND_MISSION_OOH1,
+	STREAMED_SOUND_MISSION_OOH2,
+	STREAMED_SOUND_MISSION_RACE1,
+	STREAMED_SOUND_MISSION_RACE2,
+	STREAMED_SOUND_MISSION_RACE3,
+	STREAMED_SOUND_MISSION_RACE4,
+	STREAMED_SOUND_MISSION_RACE5,
+	STREAMED_SOUND_MISSION_RACE6,
+	STREAMED_SOUND_MISSION_RACE7,
+	STREAMED_SOUND_MISSION_RACE8,
+	STREAMED_SOUND_MISSION_RACE9,
+	STREAMED_SOUND_MISSION_RACE10,
+	STREAMED_SOUND_MISSION_RACE11,
+	STREAMED_SOUND_MISSION_RACE12,
+	STREAMED_SOUND_MISSION_RACE13,
+	STREAMED_SOUND_MISSION_RACE14,
+	STREAMED_SOUND_MISSION_RACE15,
+	STREAMED_SOUND_MISSION_HOT1,
+	STREAMED_SOUND_MISSION_HOT2,
+	STREAMED_SOUND_MISSION_HOT3,
+	STREAMED_SOUND_MISSION_HOT4,
+	STREAMED_SOUND_MISSION_HOT5,
+	STREAMED_SOUND_MISSION_HOT6,
+	STREAMED_SOUND_MISSION_HOT7,
+	STREAMED_SOUND_MISSION_HOT8,
+	STREAMED_SOUND_MISSION_HOT9,
+	STREAMED_SOUND_MISSION_HOT10,
+	STREAMED_SOUND_MISSION_HOT11,
+	STREAMED_SOUND_MISSION_HOT12,
+	STREAMED_SOUND_MISSION_HOT13,
+	STREAMED_SOUND_MISSION_HOT14,
+	STREAMED_SOUND_MISSION_HOT15,
+	STREAMED_SOUND_MISSION_LANSTP1,
+	STREAMED_SOUND_MISSION_LANSTP2,
+	STREAMED_SOUND_MISSION_LANAMU1,
+	STREAMED_SOUND_MISSION_LANAMU2,
+	STREAMED_SOUND_MISSION_AIRHORNL,
+	STREAMED_SOUND_MISSION_AIRHORNR,
+	STREAMED_SOUND_MISSION_SNIPSCRL,
+	STREAMED_SOUND_MISSION_SNIPSHORT,
+	STREAMED_SOUND_MISSION_BLOWROOF,
+	STREAMED_SOUND_MISSION_ASS_1,
+	STREAMED_SOUND_MISSION_ASS_2,
+	STREAMED_SOUND_MISSION_ASS_3,
+	STREAMED_SOUND_MISSION_ASS_4,
+	STREAMED_SOUND_MISSION_ASS_5,
+	STREAMED_SOUND_MISSION_ASS_6,
+	STREAMED_SOUND_MISSION_ASS_7,
+	STREAMED_SOUND_MISSION_ASS_8,
+	STREAMED_SOUND_MISSION_ASS_9,
+	STREAMED_SOUND_MISSION_ASS_10,
+	STREAMED_SOUND_MISSION_ASS_11,
+	STREAMED_SOUND_MISSION_ASS_12,
+	STREAMED_SOUND_MISSION_ASS_13,
+	STREAMED_SOUND_MISSION_ASS_14,
+	STREAMED_SOUND_MISSION_BIKE1_1,
+	STREAMED_SOUND_MISSION_BIKE1_2,
+	STREAMED_SOUND_MISSION_BIKE1_3,
+	STREAMED_SOUND_MISSION_BNK1_1,
+	STREAMED_SOUND_MISSION_BNK1_2,
+	STREAMED_SOUND_MISSION_BNK1_3,
+	STREAMED_SOUND_MISSION_BNK1_4,
+	STREAMED_SOUND_MISSION_BNK1_5,
+	STREAMED_SOUND_MISSION_BNK1_6,
+	STREAMED_SOUND_MISSION_BNK1_7,
+	STREAMED_SOUND_MISSION_BNK1_8,
+	STREAMED_SOUND_MISSION_BNK1_10,
+	STREAMED_SOUND_MISSION_BNK1_11,
+	STREAMED_SOUND_MISSION_BNK1_12,
+	STREAMED_SOUND_MISSION_BNK1_13,
+	STREAMED_SOUND_MISSION_BNK1_14,
+	STREAMED_SOUND_MISSION_BNK2_1,
+	STREAMED_SOUND_MISSION_BNK2_2,
+	STREAMED_SOUND_MISSION_BNK2_3,
+	STREAMED_SOUND_MISSION_BNK2_4,
+	STREAMED_SOUND_MISSION_BNK2_5,
+	STREAMED_SOUND_MISSION_BNK2_6,
+	STREAMED_SOUND_MISSION_BNK2_7,
+	STREAMED_SOUND_MISSION_BNK2_8,
+	STREAMED_SOUND_MISSION_BNK2_9,
+	STREAMED_SOUND_MISSION_BNK3_1,
+	STREAMED_SOUND_MISSION_BNK3_2,
+	STREAMED_SOUND_MISSION_BNK3_3A,
+	STREAMED_SOUND_MISSION_BNK3_3B,
+	STREAMED_SOUND_MISSION_BNK3_3C,
+	STREAMED_SOUND_MISSION_BNK3_4A,
+	STREAMED_SOUND_MISSION_BNK3_4B,
+	STREAMED_SOUND_MISSION_BNK3_4C,
+	STREAMED_SOUND_MISSION_BNK4_1,
+	STREAMED_SOUND_MISSION_BNK4_2,
+	STREAMED_SOUND_MISSION_BNK4_3A,
+	STREAMED_SOUND_MISSION_BNK4_3B,
+	STREAMED_SOUND_MISSION_BNK4_3C,
+	STREAMED_SOUND_MISSION_BNK4_3D,
+	STREAMED_SOUND_MISSION_BNK4_3E,
+	STREAMED_SOUND_MISSION_BNK4_3F,
+	STREAMED_SOUND_MISSION_BNK4_3G,
+	STREAMED_SOUND_MISSION_BNK4_3H,
+	STREAMED_SOUND_MISSION_BNK4_3I,
+	STREAMED_SOUND_MISSION_BNK4_3J,
+	STREAMED_SOUND_MISSION_BNK4_3K,
+	STREAMED_SOUND_MISSION_BNK4_3M,
+	STREAMED_SOUND_MISSION_BNK4_3O,
+	STREAMED_SOUND_MISSION_BNK4_3P,
+	STREAMED_SOUND_MISSION_BNK4_3Q,
+	STREAMED_SOUND_MISSION_BNK4_3R,
+	STREAMED_SOUND_MISSION_BNK4_3S,
+	STREAMED_SOUND_MISSION_BNK4_3T,
+	STREAMED_SOUND_MISSION_BNK4_3U,
+	STREAMED_SOUND_MISSION_BNK4_3V,
+	STREAMED_SOUND_MISSION_BNK4_4A,
+	STREAMED_SOUND_MISSION_BNK4_4B,
+	STREAMED_SOUND_MISSION_BNK4_5,
+	STREAMED_SOUND_MISSION_BNK4_6,
+	STREAMED_SOUND_MISSION_BNK4_7,
+	STREAMED_SOUND_MISSION_BNK4_8,
+	STREAMED_SOUND_MISSION_BNK4_9,
+	STREAMED_SOUND_MISSION_BNK4_10,
+	STREAMED_SOUND_MISSION_BNK4_11,
+	STREAMED_SOUND_MISSION_BK4_12A,
+	STREAMED_SOUND_MISSION_BK4_12B,
+	STREAMED_SOUND_MISSION_BK4_12C,
+	STREAMED_SOUND_MISSION_BNK4_13,
+	STREAMED_SOUND_MISSION_BK4_14A,
+	STREAMED_SOUND_MISSION_BK4_14B,
+	STREAMED_SOUND_MISSION_BNK4_15,
+	STREAMED_SOUND_MISSION_BNK4_16,
+	STREAMED_SOUND_MISSION_BNK4_17,
+	STREAMED_SOUND_MISSION_BNK4_18,
+	STREAMED_SOUND_MISSION_BK4_19A,
+	STREAMED_SOUND_MISSION_BK4_19B,
+	STREAMED_SOUND_MISSION_BK4_20A,
+	STREAMED_SOUND_MISSION_BK4_20B,
+	STREAMED_SOUND_MISSION_BNK4_21,
+	STREAMED_SOUND_MISSION_BNK422A,
+	STREAMED_SOUND_MISSION_BNK422B,
+	STREAMED_SOUND_MISSION_BK4_23A,
+	STREAMED_SOUND_MISSION_BK4_23B,
+	STREAMED_SOUND_MISSION_BK4_23C,
+	STREAMED_SOUND_MISSION_BK4_23D,
+	STREAMED_SOUND_MISSION_BK4_24A,
+	STREAMED_SOUND_MISSION_BK4_24B,
+	STREAMED_SOUND_MISSION_BNK4_25,
+	STREAMED_SOUND_MISSION_BNK4_26,
+	STREAMED_SOUND_MISSION_BNK4_27,
+	STREAMED_SOUND_MISSION_BNK4_28,
+	STREAMED_SOUND_MISSION_BNK4_29,
+	STREAMED_SOUND_MISSION_BNK4_30,
+	STREAMED_SOUND_MISSION_BK4_31A,
+	STREAMED_SOUND_MISSION_BK4_31B,
+	STREAMED_SOUND_MISSION_BNK4_32,
+	STREAMED_SOUND_MISSION_BK4_34A,
+	STREAMED_SOUND_MISSION_BK4_34B,
+	STREAMED_SOUND_MISSION_BK4_35A,
+	STREAMED_SOUND_MISSION_BK4_35B,
+	STREAMED_SOUND_MISSION_BNK4_36,
+	STREAMED_SOUND_MISSION_BNK4_37,
+	STREAMED_SOUND_MISSION_BNK4_38,
+	STREAMED_SOUND_MISSION_BNK4_39,
+	STREAMED_SOUND_MISSION_BK4_40A,
+	STREAMED_SOUND_MISSION_BK4_40B,
+	STREAMED_SOUND_MISSION_BNK4_41,
+	STREAMED_SOUND_MISSION_BNK4_42,
+	STREAMED_SOUND_MISSION_BNK4_43,
+	STREAMED_SOUND_MISSION_BNK4_44,
+	STREAMED_SOUND_MISSION_BNK4_45,
+	STREAMED_SOUND_MISSION_BNK4_46,
+	STREAMED_SOUND_MISSION_BNK4_47,
+	STREAMED_SOUND_MISSION_BNK4_48,
+	STREAMED_SOUND_MISSION_BNK4_49,
+	STREAMED_SOUND_MISSION_BNK450A,
+	STREAMED_SOUND_MISSION_BNK450B,
+	STREAMED_SOUND_MISSION_BNK4_51,
+	STREAMED_SOUND_MISSION_BNK4_94,
+	STREAMED_SOUND_MISSION_BNK4_95,
+	STREAMED_SOUND_MISSION_BNK4_96,
+	STREAMED_SOUND_MISSION_BNK4_97,
+	STREAMED_SOUND_MISSION_BNK4_98,
+	STREAMED_SOUND_MISSION_BNK4_99,
+	STREAMED_SOUND_MISSION_BUD1_1,
+	STREAMED_SOUND_MISSION_BUD1_2,
+	STREAMED_SOUND_MISSION_BUD1_3,
+	STREAMED_SOUND_MISSION_BUD1_4,
+	STREAMED_SOUND_MISSION_BUD1_5,
+	STREAMED_SOUND_MISSION_BUD1_9,
+	STREAMED_SOUND_MISSION_BUD1_10,
+	STREAMED_SOUND_MISSION_BUD2_1,
+	STREAMED_SOUND_MISSION_BUD2_2,
+	STREAMED_SOUND_MISSION_BUD2_3,
+	STREAMED_SOUND_MISSION_BUD2_4,
+	STREAMED_SOUND_MISSION_BUD2_5,
+	STREAMED_SOUND_MISSION_BUD2_6,
+	STREAMED_SOUND_MISSION_BUD2_7,
+	STREAMED_SOUND_MISSION_BUD3_1,
+	STREAMED_SOUND_MISSION_BUD3_1A,
+	STREAMED_SOUND_MISSION_BUD3_1B,
+	STREAMED_SOUND_MISSION_BUD3_1C,
+	STREAMED_SOUND_MISSION_BUD3_2,
+	STREAMED_SOUND_MISSION_BUD3_3,
+	STREAMED_SOUND_MISSION_BUD3_4,
+	STREAMED_SOUND_MISSION_BUD3_5,
+	STREAMED_SOUND_MISSION_BUD3_6,
+	STREAMED_SOUND_MISSION_BUD3_7,
+	STREAMED_SOUND_MISSION_BUD3_8A,
+	STREAMED_SOUND_MISSION_BUD3_8B,
+	STREAMED_SOUND_MISSION_BUD3_8C,
+	STREAMED_SOUND_MISSION_BUD3_9A,
+	STREAMED_SOUND_MISSION_BUD3_9B,
+	STREAMED_SOUND_MISSION_BUD3_9C,
+	STREAMED_SOUND_MISSION_CAP1_2,
+	STREAMED_SOUND_MISSION_CAP1_3,
+	STREAMED_SOUND_MISSION_CAP1_4,
+	STREAMED_SOUND_MISSION_CAP1_5,
+	STREAMED_SOUND_MISSION_CAP1_6,
+	STREAMED_SOUND_MISSION_CAP1_7,
+	STREAMED_SOUND_MISSION_CAP1_8,
+	STREAMED_SOUND_MISSION_CAP1_9,
+	STREAMED_SOUND_MISSION_CAP1_10,
+	STREAMED_SOUND_MISSION_CAP1_11,
+	STREAMED_SOUND_MISSION_CAP1_12,
+	STREAMED_SOUND_MISSION_CNT1_1,
+	STREAMED_SOUND_MISSION_CNT1_2,
+	STREAMED_SOUND_MISSION_CNT1_3,
+	STREAMED_SOUND_MISSION_CNT1_4,
+	STREAMED_SOUND_MISSION_CNT1_5,
+	STREAMED_SOUND_MISSION_CNT2_1,
+	STREAMED_SOUND_MISSION_CNT2_2,
+	STREAMED_SOUND_MISSION_CNT2_3,
+	STREAMED_SOUND_MISSION_CNT2_4,
+	STREAMED_SOUND_MISSION_COK1_1,
+	STREAMED_SOUND_MISSION_COK1_2,
+	STREAMED_SOUND_MISSION_COK1_3,
+	STREAMED_SOUND_MISSION_COK1_4,
+	STREAMED_SOUND_MISSION_COK1_5,
+	STREAMED_SOUND_MISSION_COK1_6,
+	STREAMED_SOUND_MISSION_COK2_1,
+	STREAMED_SOUND_MISSION_COK2_2,
+	STREAMED_SOUND_MISSION_COK2_3,
+	STREAMED_SOUND_MISSION_COK2_4,
+	STREAMED_SOUND_MISSION_COK2_5,
+	STREAMED_SOUND_MISSION_COK2_6,
+	STREAMED_SOUND_MISSION_COK2_7A,
+	STREAMED_SOUND_MISSION_COK2_7B,
+	STREAMED_SOUND_MISSION_COK2_7C,
+	STREAMED_SOUND_MISSION_COK2_8A,
+	STREAMED_SOUND_MISSION_COK2_8B,
+	STREAMED_SOUND_MISSION_COK2_8C,
+	STREAMED_SOUND_MISSION_COK2_8D,
+	STREAMED_SOUND_MISSION_COK2_9,
+	STREAMED_SOUND_MISSION_COK210A,
+	STREAMED_SOUND_MISSION_COK210B,
+	STREAMED_SOUND_MISSION_COK210C,
+	STREAMED_SOUND_MISSION_COK212A,
+	STREAMED_SOUND_MISSION_COK212B,
+	STREAMED_SOUND_MISSION_COK2_13,
+	STREAMED_SOUND_MISSION_COK2_14,
+	STREAMED_SOUND_MISSION_COK2_15,
+	STREAMED_SOUND_MISSION_COK2_16,
+	STREAMED_SOUND_MISSION_COK2_20,
+	STREAMED_SOUND_MISSION_COK2_21,
+	STREAMED_SOUND_MISSION_COK2_22,
+	STREAMED_SOUND_MISSION_COK3_1,
+	STREAMED_SOUND_MISSION_COK3_2,
+	STREAMED_SOUND_MISSION_COK3_3,
+	STREAMED_SOUND_MISSION_COK3_4,
+	STREAMED_SOUND_MISSION_COK4_1,
+	STREAMED_SOUND_MISSION_COK4_2,
+	STREAMED_SOUND_MISSION_COK4_3,
+	STREAMED_SOUND_MISSION_COK4_4,
+	STREAMED_SOUND_MISSION_COK4_5,
+	STREAMED_SOUND_MISSION_COK4_6,
+	STREAMED_SOUND_MISSION_COK4_7,
+	STREAMED_SOUND_MISSION_COK4_8,
+	STREAMED_SOUND_MISSION_COK4_9,
+	STREAMED_SOUND_MISSION_COK4_9A,
+	STREAMED_SOUND_MISSION_COK4_10,
+	STREAMED_SOUND_MISSION_COK4_11,
+	STREAMED_SOUND_MISSION_COK4_12,
+	STREAMED_SOUND_MISSION_COK4_13,
+	STREAMED_SOUND_MISSION_COK4_14,
+	STREAMED_SOUND_MISSION_COK4_15,
+	STREAMED_SOUND_MISSION_COK4_16,
+	STREAMED_SOUND_MISSION_COK4_17,
+	STREAMED_SOUND_MISSION_COK4_18,
+	STREAMED_SOUND_MISSION_COK4_19,
+	STREAMED_SOUND_MISSION_COK4_20,
+	STREAMED_SOUND_MISSION_COK4_21,
+	STREAMED_SOUND_MISSION_COK4_22,
+	STREAMED_SOUND_MISSION_COK4_23,
+	STREAMED_SOUND_MISSION_COK4_24,
+	STREAMED_SOUND_MISSION_COK4_25,
+	STREAMED_SOUND_MISSION_COK4_26,
+	STREAMED_SOUND_MISSION_COK4_27,
+	STREAMED_SOUND_MISSION_COL1_1,
+	STREAMED_SOUND_MISSION_COL1_2,
+	STREAMED_SOUND_MISSION_COL1_3,
+	STREAMED_SOUND_MISSION_COL1_4,
+	STREAMED_SOUND_MISSION_COL1_5,
+	STREAMED_SOUND_MISSION_COL1_6,
+	STREAMED_SOUND_MISSION_COL1_7,
+	STREAMED_SOUND_MISSION_COL1_8,
+	STREAMED_SOUND_MISSION_COL2_1,
+	STREAMED_SOUND_MISSION_COL2_2,
+	STREAMED_SOUND_MISSION_COL2_3,
+	STREAMED_SOUND_MISSION_COL2_4,
+	STREAMED_SOUND_MISSION_COL2_5,
+	STREAMED_SOUND_MISSION_COL2_6A,
+	STREAMED_SOUND_MISSION_COL2_7,
+	STREAMED_SOUND_MISSION_COL2_8,
+	STREAMED_SOUND_MISSION_COL2_9,
+	STREAMED_SOUND_MISSION_COL2_10,
+	STREAMED_SOUND_MISSION_COL2_11,
+	STREAMED_SOUND_MISSION_COL2_12,
+	STREAMED_SOUND_MISSION_COL2_13,
+	STREAMED_SOUND_MISSION_COL2_14,
+	STREAMED_SOUND_MISSION_COL2_15,
+	STREAMED_SOUND_MISSION_COL2_16,
+	STREAMED_SOUND_MISSION_COL3_1,
+	STREAMED_SOUND_MISSION_COL3_2,
+	STREAMED_SOUND_MISSION_COL3_2A,
+	STREAMED_SOUND_MISSION_COL3_2B,
+	STREAMED_SOUND_MISSION_COL3_3,
+	STREAMED_SOUND_MISSION_COL3_4,
+	STREAMED_SOUND_MISSION_COL3_5,
+	STREAMED_SOUND_MISSION_COL3_6,
+	STREAMED_SOUND_MISSION_COL3_7,
+	STREAMED_SOUND_MISSION_COL3_8,
+	STREAMED_SOUND_MISSION_COL3_9,
+	STREAMED_SOUND_MISSION_COL3_10,
+	STREAMED_SOUND_MISSION_COL3_11,
+	STREAMED_SOUND_MISSION_COL3_12,
+	STREAMED_SOUND_MISSION_COL3_13,
+	STREAMED_SOUND_MISSION_COL3_14,
+	STREAMED_SOUND_MISSION_COL3_15,
+	STREAMED_SOUND_MISSION_COL3_16,
+	STREAMED_SOUND_MISSION_COL3_17,
+	STREAMED_SOUND_MISSION_COL3_18,
+	STREAMED_SOUND_MISSION_COL3_19,
+	STREAMED_SOUND_MISSION_COL3_20,
+	STREAMED_SOUND_MISSION_COL3_21,
+	STREAMED_SOUND_MISSION_COL3_23,
+	STREAMED_SOUND_MISSION_COL3_24,
+	STREAMED_SOUND_MISSION_COL3_25,
+	STREAMED_SOUND_MISSION_COL4_1,
+	STREAMED_SOUND_MISSION_COL4_2,
+	STREAMED_SOUND_MISSION_COL4_3,
+	STREAMED_SOUND_MISSION_COL4_4,
+	STREAMED_SOUND_MISSION_COL4_5,
+	STREAMED_SOUND_MISSION_COL4_6,
+	STREAMED_SOUND_MISSION_COL4_7,
+	STREAMED_SOUND_MISSION_COL4_8,
+	STREAMED_SOUND_MISSION_COL4_9,
+	STREAMED_SOUND_MISSION_COL4_10,
+	STREAMED_SOUND_MISSION_COL4_11,
+	STREAMED_SOUND_MISSION_COL4_12,
+	STREAMED_SOUND_MISSION_COL4_13,
+	STREAMED_SOUND_MISSION_COL4_14,
+	STREAMED_SOUND_MISSION_COL4_15,
+	STREAMED_SOUND_MISSION_COL4_16,
+	STREAMED_SOUND_MISSION_COL4_17,
+	STREAMED_SOUND_MISSION_COL4_18,
+	STREAMED_SOUND_MISSION_COL4_19,
+	STREAMED_SOUND_MISSION_COL4_20,
+	STREAMED_SOUND_MISSION_COL4_21,
+	STREAMED_SOUND_MISSION_COL4_22,
+	STREAMED_SOUND_MISSION_COL4_23,
+	STREAMED_SOUND_MISSION_COL4_24,
+	STREAMED_SOUND_MISSION_COL4_25,
+	STREAMED_SOUND_MISSION_COL4_26,
+	STREAMED_SOUND_MISSION_COL5_1,
+	STREAMED_SOUND_MISSION_COL5_2,
+	STREAMED_SOUND_MISSION_COL5_3,
+	STREAMED_SOUND_MISSION_COL5_4,
+	STREAMED_SOUND_MISSION_COL5_5,
+	STREAMED_SOUND_MISSION_COL5_6,
+	STREAMED_SOUND_MISSION_COL5_7,
+	STREAMED_SOUND_MISSION_COL5_8,
+	STREAMED_SOUND_MISSION_COL5_9,
+	STREAMED_SOUND_MISSION_COL5_10,
+	STREAMED_SOUND_MISSION_COL5_11,
+	STREAMED_SOUND_MISSION_COL5_12,
+	STREAMED_SOUND_MISSION_COL5_13,
+	STREAMED_SOUND_MISSION_COL5_14,
+	STREAMED_SOUND_MISSION_COL5_15,
+	STREAMED_SOUND_MISSION_COL5_16,
+	STREAMED_SOUND_MISSION_COL5_17,
+	STREAMED_SOUND_MISSION_COL5_18,
+	STREAMED_SOUND_MISSION_COL5_19,
+	STREAMED_SOUND_MISSION_COL5_20,
+	STREAMED_SOUND_MISSION_COL5_21,
+	STREAMED_SOUND_MISSION_COL5_22,
+	STREAMED_SOUND_MISSION_CUB1_1,
+	STREAMED_SOUND_MISSION_CUB1_2,
+	STREAMED_SOUND_MISSION_CUB1_3,
+	STREAMED_SOUND_MISSION_CUB1_4,
+	STREAMED_SOUND_MISSION_CUB1_5,
+	STREAMED_SOUND_MISSION_CUB1_6,
+	STREAMED_SOUND_MISSION_CUB1_7,
+	STREAMED_SOUND_MISSION_CUB1_8,
+	STREAMED_SOUND_MISSION_CUB1_9,
+	STREAMED_SOUND_MISSION_CUB1_10,
+	STREAMED_SOUND_MISSION_CUB2_1,
+	STREAMED_SOUND_MISSION_CUB2_2,
+	STREAMED_SOUND_MISSION_CUB2_3A,
+	STREAMED_SOUND_MISSION_CUB2_3B,
+	STREAMED_SOUND_MISSION_CUB2_3C,
+	STREAMED_SOUND_MISSION_CUB2_4A,
+	STREAMED_SOUND_MISSION_CUB2_5,
+	STREAMED_SOUND_MISSION_CUB2_6,
+	STREAMED_SOUND_MISSION_CUB2_7,
+	STREAMED_SOUND_MISSION_CUB2_8,
+	STREAMED_SOUND_MISSION_CUB2_9,
+	STREAMED_SOUND_MISSION_CUB2_10,
+	STREAMED_SOUND_MISSION_CUB2_11,
+	STREAMED_SOUND_MISSION_CUB3_1,
+	STREAMED_SOUND_MISSION_CUB3_2,
+	STREAMED_SOUND_MISSION_CUB3_3,
+	STREAMED_SOUND_MISSION_CUB3_4,
+	STREAMED_SOUND_MISSION_CUB4_1,
+	STREAMED_SOUND_MISSION_CUB4_2,
+	STREAMED_SOUND_MISSION_CUB4_3,
+	STREAMED_SOUND_MISSION_CUB4_4,
+	STREAMED_SOUND_MISSION_CUB4_5,
+	STREAMED_SOUND_MISSION_CUB4_5A,
+	STREAMED_SOUND_MISSION_CUB4_6,
+	STREAMED_SOUND_MISSION_CUB4_7,
+	STREAMED_SOUND_MISSION_CUB4_8,
+	STREAMED_SOUND_MISSION_CUB4_9,
+	STREAMED_SOUND_MISSION_CUB4_10,
+	STREAMED_SOUND_MISSION_CUB4_11,
+	STREAMED_SOUND_MISSION_CUB4_12,
+	STREAMED_SOUND_MISSION_CUB4_13,
+	STREAMED_SOUND_MISSION_CUB4_14,
+	STREAMED_SOUND_MISSION_CUB4_15,
+	STREAMED_SOUND_MISSION_CUB4_16,
+	STREAMED_SOUND_MISSION_GOLF_1,
+	STREAMED_SOUND_MISSION_GOLF_2,
+	STREAMED_SOUND_MISSION_GOLF_3,
+	STREAMED_SOUND_MISSION_BAR_1,
+	STREAMED_SOUND_MISSION_BAR_2,
+	STREAMED_SOUND_MISSION_BAR_3,
+	STREAMED_SOUND_MISSION_BAR_4,
+	STREAMED_SOUND_MISSION_BAR_5,
+	STREAMED_SOUND_MISSION_BAR_6,
+	STREAMED_SOUND_MISSION_BAR_7,
+	STREAMED_SOUND_MISSION_BAR_8,
+	STREAMED_SOUND_MISSION_STRIP_1,
+	STREAMED_SOUND_MISSION_STRIP_2,
+	STREAMED_SOUND_MISSION_STRIP_3,
+	STREAMED_SOUND_MISSION_STRIP_4,
+	STREAMED_SOUND_MISSION_STRIP_5,
+	STREAMED_SOUND_MISSION_STRIP_6,
+	STREAMED_SOUND_MISSION_STRIP_7,
+	STREAMED_SOUND_MISSION_STRIP_8,
+	STREAMED_SOUND_MISSION_STRIP_9,
+	STREAMED_SOUND_MISSION_STAR_1,
+	STREAMED_SOUND_MISSION_STAR_2,
+	STREAMED_SOUND_MISSION_STAR_3,
+	STREAMED_SOUND_MISSION_STAR_4,
+	STREAMED_SOUND_MISSION_FIN_1A,
+	STREAMED_SOUND_MISSION_FIN_1B,
+	STREAMED_SOUND_MISSION_FIN_1C,
+	STREAMED_SOUND_MISSION_FIN_2B,
+	STREAMED_SOUND_MISSION_FIN_2C,
+	STREAMED_SOUND_MISSION_FIN_3,
+	STREAMED_SOUND_MISSION_FIN_4,
+	STREAMED_SOUND_MISSION_FIN_5,
+	STREAMED_SOUND_MISSION_FIN_6,
+	STREAMED_SOUND_MISSION_FIN_10,
+	STREAMED_SOUND_MISSION_FIN_11A,
+	STREAMED_SOUND_MISSION_FIN_11B,
+	STREAMED_SOUND_MISSION_FIN_12A,
+	STREAMED_SOUND_MISSION_FIN_12B,
+	STREAMED_SOUND_MISSION_FIN_12C,
+	STREAMED_SOUND_MISSION_FIN_13,
+	STREAMED_SOUND_MISSION_FINKILL,
+	STREAMED_SOUND_MISSION_LAW1_1,
+	STREAMED_SOUND_MISSION_LAW1_2,
+	STREAMED_SOUND_MISSION_LAW1_3,
+	STREAMED_SOUND_MISSION_LAW1_4,
+	STREAMED_SOUND_MISSION_LAW1_5,
+	STREAMED_SOUND_MISSION_LAW1_6,
+	STREAMED_SOUND_MISSION_LAW1_7,
+	STREAMED_SOUND_MISSION_LAW1_8,
+	STREAMED_SOUND_MISSION_LAW1_9,
+	STREAMED_SOUND_MISSION_LAW1_10,
+	STREAMED_SOUND_MISSION_LAW2_1,
+	STREAMED_SOUND_MISSION_LAW2_2,
+	STREAMED_SOUND_MISSION_LAW2_3,
+	STREAMED_SOUND_MISSION_LAW2_4,
+	STREAMED_SOUND_MISSION_LAW2_5,
+	STREAMED_SOUND_MISSION_LAW2_6,
+	STREAMED_SOUND_MISSION_LAW2_7,
+	STREAMED_SOUND_MISSION_LAW2_8,
+	STREAMED_SOUND_MISSION_LAW2_9,
+	STREAMED_SOUND_MISSION_LAW2_10,
+	STREAMED_SOUND_MISSION_LAW3_1,
+	STREAMED_SOUND_MISSION_LAW3_2,
+	STREAMED_SOUND_MISSION_LAW3_3,
+	STREAMED_SOUND_MISSION_LAW3_4,
+	STREAMED_SOUND_MISSION_LAW3_5,
+	STREAMED_SOUND_MISSION_LAW3_6,
+	STREAMED_SOUND_MISSION_LAW3_10,
+	STREAMED_SOUND_MISSION_LAW3_11,
+	STREAMED_SOUND_MISSION_LAW3_12,
+	STREAMED_SOUND_MISSION_LAW3_13,
+	STREAMED_SOUND_MISSION_LAW3_14,
+	STREAMED_SOUND_MISSION_LAW3_16,
+	STREAMED_SOUND_MISSION_LAW3_17,
+	STREAMED_SOUND_MISSION_LAW3_18,
+	STREAMED_SOUND_MISSION_LAW3_19,
+	STREAMED_SOUND_MISSION_LAW3_20,
+	STREAMED_SOUND_MISSION_LAW3_21,
+	STREAMED_SOUND_MISSION_LAW3_22,
+	STREAMED_SOUND_MISSION_LAW3_23,
+	STREAMED_SOUND_MISSION_LAW3_24,
+	STREAMED_SOUND_MISSION_LAW3_25,
+	STREAMED_SOUND_MISSION_LAW4_1A,
+	STREAMED_SOUND_MISSION_LAW4_1B,
+	STREAMED_SOUND_MISSION_LAW4_1C,
+	STREAMED_SOUND_MISSION_LAW4_1D,
+	STREAMED_SOUND_MISSION_LAW4_10,
+	STREAMED_SOUND_MISSION_LAW4_3,
+	STREAMED_SOUND_MISSION_LAW4_4,
+	STREAMED_SOUND_MISSION_LAW4_5,
+	STREAMED_SOUND_MISSION_LAW4_6,
+	STREAMED_SOUND_MISSION_LAW4_7,
+	STREAMED_SOUND_MISSION_LAW4_8,
+	STREAMED_SOUND_MISSION_LAW4_9,
+	STREAMED_SOUND_MISSION_PHIL1_2,
+	STREAMED_SOUND_MISSION_PHIL1_3,
+	STREAMED_SOUND_MISSION_PHIL2_1,
+	STREAMED_SOUND_MISSION_PHIL2_2,
+	STREAMED_SOUND_MISSION_PHIL2_3,
+	STREAMED_SOUND_MISSION_PHIL2_4,
+	STREAMED_SOUND_MISSION_PHIL2_5,
+	STREAMED_SOUND_MISSION_PHIL2_6,
+	STREAMED_SOUND_MISSION_PHIL2_7,
+	STREAMED_SOUND_MISSION_PHIL2_8,
+	STREAMED_SOUND_MISSION_PHIL2_9,
+	STREAMED_SOUND_MISSION_PHIL210,
+	STREAMED_SOUND_MISSION_PHIL211,
+	STREAMED_SOUND_MISSION_PORN1_1,
+	STREAMED_SOUND_MISSION_PORN1_2,
+	STREAMED_SOUND_MISSION_PORN1_3,
+	STREAMED_SOUND_MISSION_PRN1_3A,
+	STREAMED_SOUND_MISSION_PORN1_4,
+	STREAMED_SOUND_MISSION_PORN1_5,
+	STREAMED_SOUND_MISSION_PORN1_6,
+	STREAMED_SOUND_MISSION_PORN1_7,
+	STREAMED_SOUND_MISSION_PORN1_8,
+	STREAMED_SOUND_MISSION_PORN1_9,
+	STREAMED_SOUND_MISSION_PRN1_10,
+	STREAMED_SOUND_MISSION_PRN1_11,
+	STREAMED_SOUND_MISSION_PRN1_12,
+	STREAMED_SOUND_MISSION_PRN1_13,
+	STREAMED_SOUND_MISSION_PRN1_14,
+	STREAMED_SOUND_MISSION_PRN1_15,
+	STREAMED_SOUND_MISSION_PRN1_16,
+	STREAMED_SOUND_MISSION_PRN1_17,
+	STREAMED_SOUND_MISSION_PRN1_18,
+	STREAMED_SOUND_MISSION_PRN1_19,
+	STREAMED_SOUND_MISSION_PRN1_20,
+	STREAMED_SOUND_MISSION_PRN1_21,
+	STREAMED_SOUND_MISSION_PORN3_1,
+	STREAMED_SOUND_MISSION_PORN3_2,
+	STREAMED_SOUND_MISSION_PORN3_3,
+	STREAMED_SOUND_MISSION_PORN3_4,
+	STREAMED_SOUND_MISSION_PSYCH_1,
+	STREAMED_SOUND_MISSION_PSYCH_2,
+	STREAMED_SOUND_MISSION_ROK2_01,
+	STREAMED_SOUND_MISSION_ROK3_1,
+	STREAMED_SOUND_MISSION_ROK3_2,
+	STREAMED_SOUND_MISSION_ROK3_3,
+	STREAMED_SOUND_MISSION_ROK3_4,
+	STREAMED_SOUND_MISSION_ROK3_5,
+	STREAMED_SOUND_MISSION_ROK3_6,
+	STREAMED_SOUND_MISSION_ROK3_7,
+	STREAMED_SOUND_MISSION_ROK3_8,
+	STREAMED_SOUND_MISSION_ROK3_9,
+	STREAMED_SOUND_MISSION_ROK3_10,
+	STREAMED_SOUND_MISSION_ROK3_11,
+	STREAMED_SOUND_MISSION_ROK3_12,
+	STREAMED_SOUND_MISSION_ROK3_13,
+	STREAMED_SOUND_MISSION_ROK3_14,
+	STREAMED_SOUND_MISSION_ROK3_15,
+	STREAMED_SOUND_MISSION_ROK3_16,
+	STREAMED_SOUND_MISSION_ROK3_17,
+	STREAMED_SOUND_MISSION_ROK3_18,
+	STREAMED_SOUND_MISSION_ROK3_19,
+	STREAMED_SOUND_MISSION_ROK3_20,
+	STREAMED_SOUND_MISSION_ROK3_21,
+	STREAMED_SOUND_MISSION_ROK3_22,
+	STREAMED_SOUND_MISSION_ROK3_23,
+	STREAMED_SOUND_MISSION_ROK3_24,
+	STREAMED_SOUND_MISSION_ROK3_25,
+	STREAMED_SOUND_MISSION_ROK3_26,
+	STREAMED_SOUND_MISSION_ROK3_27,
+	STREAMED_SOUND_MISSION_ROK3_62,
+	STREAMED_SOUND_MISSION_ROK3_63,
+	STREAMED_SOUND_MISSION_ROK3_64,
+	STREAMED_SOUND_MISSION_ROK3_65,
+	STREAMED_SOUND_MISSION_ROK3_66,
+	STREAMED_SOUND_MISSION_ROK3_67,
+	STREAMED_SOUND_MISSION_ROK3_68,
+	STREAMED_SOUND_MISSION_ROK3_69,
+	STREAMED_SOUND_MISSION_ROK3_70,
+	STREAMED_SOUND_MISSION_ROK3_71,
+	STREAMED_SOUND_MISSION_ROK3_73,
+	STREAMED_SOUND_MISSION_RESC_1,
+	STREAMED_SOUND_MISSION_RESC_2,
+	STREAMED_SOUND_MISSION_RESC_3,
+	STREAMED_SOUND_MISSION_RESC_4,
+	STREAMED_SOUND_MISSION_RESC_5,
+	STREAMED_SOUND_MISSION_RESC_6,
+	STREAMED_SOUND_MISSION_RESC_7,
+	STREAMED_SOUND_MISSION_RESC_8,
+	STREAMED_SOUND_MISSION_RESC_9,
+	STREAMED_SOUND_MISSION_RESC_10,
+	STREAMED_SOUND_MISSION_ROK1_1A,
+	STREAMED_SOUND_MISSION_ROK1_1B,
+	STREAMED_SOUND_MISSION_ROK1_5,
+	STREAMED_SOUND_MISSION_ROK1_6,
+	STREAMED_SOUND_MISSION_ROK1_7,
+	STREAMED_SOUND_MISSION_ROK1_8,
+	STREAMED_SOUND_MISSION_ROK1_9,
+	STREAMED_SOUND_MISSION_TAX1_1,
+	STREAMED_SOUND_MISSION_TAX1_2,
+	STREAMED_SOUND_MISSION_TAX1_3,
+	STREAMED_SOUND_MISSION_TAX1_4,
+	STREAMED_SOUND_MISSION_TAX1_5,
+	STREAMED_SOUND_MISSION_TAX2_1,
+	STREAMED_SOUND_MISSION_TAX2_2,
+	STREAMED_SOUND_MISSION_TAX2_3,
+	STREAMED_SOUND_MISSION_TAX2_4,
+	STREAMED_SOUND_MISSION_TAX2_5,
+	STREAMED_SOUND_MISSION_TAX2_6,
+	STREAMED_SOUND_MISSION_TAX2_7,
+	STREAMED_SOUND_MISSION_TAX3_1,
+	STREAMED_SOUND_MISSION_TAX3_2,
+	STREAMED_SOUND_MISSION_TAX3_3,
+	STREAMED_SOUND_MISSION_TAX3_4,
+	STREAMED_SOUND_MISSION_TAX3_5,
+	STREAMED_SOUND_MISSION_TEX1_1,
+	STREAMED_SOUND_MISSION_TEX1_2,
+	STREAMED_SOUND_MISSION_TEX1_3,
+	STREAMED_SOUND_MISSION_TEX1_4,
+	STREAMED_SOUND_MISSION_TEX1_5,
+	STREAMED_SOUND_MISSION_TEX1_6,
+	STREAMED_SOUND_MISSION_TEX2_1,
+	STREAMED_SOUND_MISSION_TEX3_1,
+	STREAMED_SOUND_MISSION_TEX3_2,
+	STREAMED_SOUND_MISSION_TEX3_3,
+	STREAMED_SOUND_MISSION_TEX3_4,
+	STREAMED_SOUND_MISSION_TEX3_5,
+	STREAMED_SOUND_MISSION_TEX3_6,
+	STREAMED_SOUND_MISSION_TEX3_7,
+	STREAMED_SOUND_MISSION_TEX3_8,
+	STREAMED_SOUND_MISSION_HAT_1A,
+	STREAMED_SOUND_MISSION_INTRO1,
+	STREAMED_SOUND_MISSION_INTRO2,
+	STREAMED_SOUND_MISSION_INTRO3,
+	STREAMED_SOUND_MISSION_INTRO4,
+	STREAMED_SOUND_MISSION_MOB_01A,
+	STREAMED_SOUND_MISSION_MOB_01B,
+	STREAMED_SOUND_MISSION_MOB_01C,
+	STREAMED_SOUND_MISSION_MOB_02A,
+	STREAMED_SOUND_MISSION_MOB_02B,
+	STREAMED_SOUND_MISSION_MOB_02C,
+	STREAMED_SOUND_MISSION_MOB_03A,
+	STREAMED_SOUND_MISSION_MOB_03B,
+	STREAMED_SOUND_MISSION_MOB_03C,
+	STREAMED_SOUND_MISSION_MOB_03D,
+	STREAMED_SOUND_MISSION_MOB_03E,
+	STREAMED_SOUND_MISSION_SHARK_1,
+	STREAMED_SOUND_MISSION_SHARK_2,
+	STREAMED_SOUND_MISSION_SHARK_3,
+	STREAMED_SOUND_MISSION_SHARK_4,
+	STREAMED_SOUND_MISSION_SHARK_5,
+	STREAMED_SOUND_MISSION_MOB_04A,
+	STREAMED_SOUND_MISSION_MOB_04B,
+	STREAMED_SOUND_MISSION_MOB_04C,
+	STREAMED_SOUND_MISSION_MOB_04D,
+	STREAMED_SOUND_MISSION_MOB_05A,
+	STREAMED_SOUND_MISSION_MOB_05B,
+	STREAMED_SOUND_MISSION_MOB_05C,
+	STREAMED_SOUND_MISSION_MOB_05D,
+	STREAMED_SOUND_MISSION_MOB_06A,
+	STREAMED_SOUND_MISSION_MOB_06B,
+	STREAMED_SOUND_MISSION_MOB_06C,
+	STREAMED_SOUND_MISSION_MOB_07A,
+	STREAMED_SOUND_MISSION_MOB_07B,
+	STREAMED_SOUND_MISSION_MOB_08A,
+	STREAMED_SOUND_MISSION_MOB_08B,
+	STREAMED_SOUND_MISSION_MOB_08C,
+	STREAMED_SOUND_MISSION_MOB_08D,
+	STREAMED_SOUND_MISSION_MOB_08E,
+	STREAMED_SOUND_MISSION_MOB_08F,
+	STREAMED_SOUND_MISSION_MOB_08G,
+	STREAMED_SOUND_MISSION_MOB_09A,
+	STREAMED_SOUND_MISSION_MOB_09B,
+	STREAMED_SOUND_MISSION_MOB_09C,
+	STREAMED_SOUND_MISSION_MOB_09D,
+	STREAMED_SOUND_MISSION_MOB_09E,
+	STREAMED_SOUND_MISSION_MOB_09F,
+	STREAMED_SOUND_MISSION_MOB_10A,
+	STREAMED_SOUND_MISSION_MOB_10B,
+	STREAMED_SOUND_MISSION_MOB_10C,
+	STREAMED_SOUND_MISSION_MOB_10D,
+	STREAMED_SOUND_MISSION_MOB_10E,
+	STREAMED_SOUND_MISSION_MOB_11A,
+	STREAMED_SOUND_MISSION_MOB_11B,
+	STREAMED_SOUND_MISSION_MOB_11C,
+	STREAMED_SOUND_MISSION_MOB_11D,
+	STREAMED_SOUND_MISSION_MOB_11E,
+	STREAMED_SOUND_MISSION_MOB_11F,
+	STREAMED_SOUND_MISSION_MOB_14A,
+	STREAMED_SOUND_MISSION_MOB_14B,
+	STREAMED_SOUND_MISSION_MOB_14C,
+	STREAMED_SOUND_MISSION_MOB_14D,
+	STREAMED_SOUND_MISSION_MOB_14E,
+	STREAMED_SOUND_MISSION_MOB_14F,
+	STREAMED_SOUND_MISSION_MOB_14G,
+	STREAMED_SOUND_MISSION_MOB_14H,
+	STREAMED_SOUND_MISSION_MOB_16A,
+	STREAMED_SOUND_MISSION_MOB_16B,
+	STREAMED_SOUND_MISSION_MOB_16C,
+	STREAMED_SOUND_MISSION_MOB_16D,
+	STREAMED_SOUND_MISSION_MOB_16E,
+	STREAMED_SOUND_MISSION_MOB_16F,
+	STREAMED_SOUND_MISSION_MOB_16G,
+	STREAMED_SOUND_MISSION_MOB_17A,
+	STREAMED_SOUND_MISSION_MOB_17B,
+	STREAMED_SOUND_MISSION_MOB_17C,
+	STREAMED_SOUND_MISSION_MOB_17D,
+	STREAMED_SOUND_MISSION_MOB_17E,
+	STREAMED_SOUND_MISSION_MOB_17G,
+	STREAMED_SOUND_MISSION_MOB_17H,
+	STREAMED_SOUND_MISSION_MOB_17I,
+	STREAMED_SOUND_MISSION_MOB_17J,
+	STREAMED_SOUND_MISSION_MOB_17K,
+	STREAMED_SOUND_MISSION_MOB_17L,
+	STREAMED_SOUND_MISSION_MOB_18A,
+	STREAMED_SOUND_MISSION_MOB_18B,
+	STREAMED_SOUND_MISSION_MOB_18C,
+	STREAMED_SOUND_MISSION_MOB_18D,
+	STREAMED_SOUND_MISSION_MOB_18E,
+	STREAMED_SOUND_MISSION_MOB_18F,
+	STREAMED_SOUND_MISSION_MOB_18G,
+	STREAMED_SOUND_MISSION_MOB_20A,
+	STREAMED_SOUND_MISSION_MOB_20B,
+	STREAMED_SOUND_MISSION_MOB_20C,
+	STREAMED_SOUND_MISSION_MOB_20D,
+	STREAMED_SOUND_MISSION_MOB_20E,
+	STREAMED_SOUND_MISSION_MOB_24A,
+	STREAMED_SOUND_MISSION_MOB_24B,
+	STREAMED_SOUND_MISSION_MOB_24C,
+	STREAMED_SOUND_MISSION_MOB_24D,
+	STREAMED_SOUND_MISSION_MOB_24E,
+	STREAMED_SOUND_MISSION_MOB_24F,
+	STREAMED_SOUND_MISSION_MOB_24G,
+	STREAMED_SOUND_MISSION_MOB_24H,
+	STREAMED_SOUND_MISSION_MOB_25A,
+	STREAMED_SOUND_MISSION_MOB_25B,
+	STREAMED_SOUND_MISSION_MOB_25C,
+	STREAMED_SOUND_MISSION_MOB_25D,
+	STREAMED_SOUND_MISSION_MOB_26A,
+	STREAMED_SOUND_MISSION_MOB_26B,
+	STREAMED_SOUND_MISSION_MOB_26C,
+	STREAMED_SOUND_MISSION_MOB_26D,
+	STREAMED_SOUND_MISSION_MOB_26E,
+	STREAMED_SOUND_MISSION_MOB_29A,
+	STREAMED_SOUND_MISSION_MOB_29B,
+	STREAMED_SOUND_MISSION_MOB_29C,
+	STREAMED_SOUND_MISSION_MOB_29D,
+	STREAMED_SOUND_MISSION_MOB_29E,
+	STREAMED_SOUND_MISSION_MOB_29F,
+	STREAMED_SOUND_MISSION_MOB_29G,
+	STREAMED_SOUND_MISSION_MOB_30A,
+	STREAMED_SOUND_MISSION_MOB_30B,
+	STREAMED_SOUND_MISSION_MOB_30C,
+	STREAMED_SOUND_MISSION_MOB_30D,
+	STREAMED_SOUND_MISSION_MOB_30E,
+	STREAMED_SOUND_MISSION_MOB_30F,
+	STREAMED_SOUND_MISSION_MOB_33A,
+	STREAMED_SOUND_MISSION_MOB_33B,
+	STREAMED_SOUND_MISSION_MOB_33C,
+	STREAMED_SOUND_MISSION_MOB_33D,
+	STREAMED_SOUND_MISSION_MOB_34A,
+	STREAMED_SOUND_MISSION_MOB_34B,
+	STREAMED_SOUND_MISSION_MOB_34C,
+	STREAMED_SOUND_MISSION_MOB_34D,
+	STREAMED_SOUND_MISSION_MOB_35A,
+	STREAMED_SOUND_MISSION_MOB_35B,
+	STREAMED_SOUND_MISSION_MOB_35C,
+	STREAMED_SOUND_MISSION_MOB_35D,
+	STREAMED_SOUND_MISSION_MOB_36A,
+	STREAMED_SOUND_MISSION_MOB_36B,
+	STREAMED_SOUND_MISSION_MOB_36C,
+	STREAMED_SOUND_MISSION_MOB_40A,
+	STREAMED_SOUND_MISSION_MOB_40B,
+	STREAMED_SOUND_MISSION_MOB_40C,
+	STREAMED_SOUND_MISSION_MOB_40D,
+	STREAMED_SOUND_MISSION_MOB_40E,
+	STREAMED_SOUND_MISSION_MOB_40F,
+	STREAMED_SOUND_MISSION_MOB_40G,
+	STREAMED_SOUND_MISSION_MOB_40H,
+	STREAMED_SOUND_MISSION_MOB_40I,
+	STREAMED_SOUND_MISSION_MOB_41A,
+	STREAMED_SOUND_MISSION_MOB_41B,
+	STREAMED_SOUND_MISSION_MOB_41C,
+	STREAMED_SOUND_MISSION_MOB_41D,
+	STREAMED_SOUND_MISSION_MOB_41E,
+	STREAMED_SOUND_MISSION_MOB_41F,
+	STREAMED_SOUND_MISSION_MOB_41G,
+	STREAMED_SOUND_MISSION_MOB_41H,
+	STREAMED_SOUND_MISSION_MOB_42A,
+	STREAMED_SOUND_MISSION_MOB_42B,
+	STREAMED_SOUND_MISSION_MOB_42C,
+	STREAMED_SOUND_MISSION_MOB_42D,
+	STREAMED_SOUND_MISSION_MOB_42E,
+	STREAMED_SOUND_MISSION_MOB_43A,
+	STREAMED_SOUND_MISSION_MOB_43B,
+	STREAMED_SOUND_MISSION_MOB_43C,
+	STREAMED_SOUND_MISSION_MOB_43D,
+	STREAMED_SOUND_MISSION_MOB_43E,
+	STREAMED_SOUND_MISSION_MOB_43F,
+	STREAMED_SOUND_MISSION_MOB_43G,
+	STREAMED_SOUND_MISSION_MOB_43H,
+	STREAMED_SOUND_MISSION_MOB_45A,
+	STREAMED_SOUND_MISSION_MOB_45B,
+	STREAMED_SOUND_MISSION_MOB_45C,
+	STREAMED_SOUND_MISSION_MOB_45D,
+	STREAMED_SOUND_MISSION_MOB_45E,
+	STREAMED_SOUND_MISSION_MOB_45F,
+	STREAMED_SOUND_MISSION_MOB_45G,
+	STREAMED_SOUND_MISSION_MOB_45H,
+	STREAMED_SOUND_MISSION_MOB_45I,
+	STREAMED_SOUND_MISSION_MOB_45J,
+	STREAMED_SOUND_MISSION_MOB_45K,
+	STREAMED_SOUND_MISSION_MOB_45L,
+	STREAMED_SOUND_MISSION_MOB_45M,
+	STREAMED_SOUND_MISSION_MOB_45N,
+	STREAMED_SOUND_MISSION_MOB_46A,
+	STREAMED_SOUND_MISSION_MOB_46B,
+	STREAMED_SOUND_MISSION_MOB_46C,
+	STREAMED_SOUND_MISSION_MOB_46D,
+	STREAMED_SOUND_MISSION_MOB_46E,
+	STREAMED_SOUND_MISSION_MOB_46F,
+	STREAMED_SOUND_MISSION_MOB_46G,
+	STREAMED_SOUND_MISSION_MOB_46H,
+	STREAMED_SOUND_MISSION_MOB_47A,
+	STREAMED_SOUND_MISSION_MOB_52A,
+	STREAMED_SOUND_MISSION_MOB_52B,
+	STREAMED_SOUND_MISSION_MOB_52C,
+	STREAMED_SOUND_MISSION_MOB_52D,
+	STREAMED_SOUND_MISSION_MOB_52E,
+	STREAMED_SOUND_MISSION_MOB_52F,
+	STREAMED_SOUND_MISSION_MOB_52G,
+	STREAMED_SOUND_MISSION_MOB_52H,
+	STREAMED_SOUND_MISSION_MOB_54A,
+	STREAMED_SOUND_MISSION_MOB_54B,
+	STREAMED_SOUND_MISSION_MOB_54C,
+	STREAMED_SOUND_MISSION_MOB_54D,
+	STREAMED_SOUND_MISSION_MOB_54E,
+	STREAMED_SOUND_MISSION_MOB_55A,
+	STREAMED_SOUND_MISSION_MOB_55B,
+	STREAMED_SOUND_MISSION_MOB_55C,
+	STREAMED_SOUND_MISSION_MOB_55D,
+	STREAMED_SOUND_MISSION_MOB_55E,
+	STREAMED_SOUND_MISSION_MOB_55F,
+	STREAMED_SOUND_MISSION_MOB_56A,
+	STREAMED_SOUND_MISSION_MOB_56B,
+	STREAMED_SOUND_MISSION_MOB_56C,
+	STREAMED_SOUND_MISSION_MOB_56D,
+	STREAMED_SOUND_MISSION_MOB_56E,
+	STREAMED_SOUND_MISSION_MOB_56F,
+	STREAMED_SOUND_MISSION_MOB_57A,
+	STREAMED_SOUND_MISSION_MOB_57B,
+	STREAMED_SOUND_MISSION_MOB_57C,
+	STREAMED_SOUND_MISSION_MOB_57D,
+	STREAMED_SOUND_MISSION_MOB_57E,
+	STREAMED_SOUND_MISSION_MOB_58A,
+	STREAMED_SOUND_MISSION_MOB_58B,
+	STREAMED_SOUND_MISSION_MOB_58C,
+	STREAMED_SOUND_MISSION_MOB_58D,
+	STREAMED_SOUND_MISSION_MOB_58E,
+	STREAMED_SOUND_MISSION_MOB_58F,
+	STREAMED_SOUND_MISSION_MOB_58G,
+	STREAMED_SOUND_MISSION_MOB_61A,
+	STREAMED_SOUND_MISSION_MOB_61B,
+	STREAMED_SOUND_MISSION_MOB_62A,
+	STREAMED_SOUND_MISSION_MOB_62B,
+	STREAMED_SOUND_MISSION_MOB_62C,
+	STREAMED_SOUND_MISSION_MOB_62D,
+	STREAMED_SOUND_MISSION_MOB_63A,
+	STREAMED_SOUND_MISSION_MOB_63B,
+	STREAMED_SOUND_MISSION_MOB_63C,
+	STREAMED_SOUND_MISSION_MOB_63D,
+	STREAMED_SOUND_MISSION_MOB_63E,
+	STREAMED_SOUND_MISSION_MOB_63F,
+	STREAMED_SOUND_MISSION_MOB_63G,
+	STREAMED_SOUND_MISSION_MOB_63H,
+	STREAMED_SOUND_MISSION_MOB_63I,
+	STREAMED_SOUND_MISSION_MOB_63J,
+	STREAMED_SOUND_MISSION_MOB_66A,
+	STREAMED_SOUND_MISSION_MOB_66B,
+	STREAMED_SOUND_MISSION_MOB_68A,
+	STREAMED_SOUND_MISSION_MOB_68B,
+	STREAMED_SOUND_MISSION_MOB_68C,
+	STREAMED_SOUND_MISSION_MOB_68D,
+	STREAMED_SOUND_MISSION_MOB_70A,
+	STREAMED_SOUND_MISSION_MOB_70B,
+	STREAMED_SOUND_MISSION_MOB_71A,
+	STREAMED_SOUND_MISSION_MOB_71B,
+	STREAMED_SOUND_MISSION_MOB_71C,
+	STREAMED_SOUND_MISSION_MOB_71D,
+	STREAMED_SOUND_MISSION_MOB_71E,
+	STREAMED_SOUND_MISSION_MOB_71F,
+	STREAMED_SOUND_MISSION_MOB_71G,
+	STREAMED_SOUND_MISSION_MOB_71H,
+	STREAMED_SOUND_MISSION_MOB_71I,
+	STREAMED_SOUND_MISSION_MOB_71J,
+	STREAMED_SOUND_MISSION_MOB_71K,
+	STREAMED_SOUND_MISSION_MOB_71L,
+	STREAMED_SOUND_MISSION_MOB_71M,
+	STREAMED_SOUND_MISSION_MOB_71N,
+	STREAMED_SOUND_MISSION_MOB_72A,
+	STREAMED_SOUND_MISSION_MOB_72B,
+	STREAMED_SOUND_MISSION_MOB_72C,
+	STREAMED_SOUND_MISSION_MOB_72D,
+	STREAMED_SOUND_MISSION_MOB_72E,
+	STREAMED_SOUND_MISSION_MOB_72F,
+	STREAMED_SOUND_MISSION_MOB_72G,
+	STREAMED_SOUND_MISSION_MOB_73A,
+	STREAMED_SOUND_MISSION_MOB_73C,
+	STREAMED_SOUND_MISSION_MOB_73D,
+	STREAMED_SOUND_MISSION_MOB_73F,
+	STREAMED_SOUND_MISSION_MOB_73G,
+	STREAMED_SOUND_MISSION_MOB_73I,
+	STREAMED_SOUND_MISSION_MOB_95A,
+	STREAMED_SOUND_MISSION_MOB_96A,
+	STREAMED_SOUND_MISSION_MOB_98A,
+	STREAMED_SOUND_MISSION_MOB_99A,
+	STREAMED_SOUND_MISSION_JOB1_1B,
+	STREAMED_SOUND_MISSION_JOB1_1C,
+	STREAMED_SOUND_MISSION_JOB1_1D,
+	STREAMED_SOUND_MISSION_JOB2_1B,
+	STREAMED_SOUND_MISSION_JOB2_2,
+	STREAMED_SOUND_MISSION_JOB2_3,
+	STREAMED_SOUND_MISSION_JOB2_4,
+	STREAMED_SOUND_MISSION_JOB2_5,
+	STREAMED_SOUND_MISSION_JOB2_6,
+	STREAMED_SOUND_MISSION_JOB2_7,
+	STREAMED_SOUND_MISSION_JOB2_8,
+	STREAMED_SOUND_MISSION_JOB2_9,
+	STREAMED_SOUND_MISSION_JOB3_1,
+	STREAMED_SOUND_MISSION_JOB3_2,
+	STREAMED_SOUND_MISSION_JOB3_3,
+	STREAMED_SOUND_MISSION_JOB4_1,
+	STREAMED_SOUND_MISSION_JOB4_2,
+	STREAMED_SOUND_MISSION_JOB4_3,
+	STREAMED_SOUND_MISSION_JOB5_1,
+	STREAMED_SOUND_MISSION_JOB5_2,
+	STREAMED_SOUND_MISSION_JOB5_3,
+	STREAMED_SOUND_MISSION_BJM1_20,
+	STREAMED_SOUND_MISSION_BJM1_4,
+	STREAMED_SOUND_MISSION_BJM1_5,
+	STREAMED_SOUND_MISSION_MERC_39,
+	STREAMED_SOUND_MISSION_MONO_1,
+	STREAMED_SOUND_MISSION_MONO_2,
+	STREAMED_SOUND_MISSION_MONO_3,
+	STREAMED_SOUND_MISSION_MONO_4,
+	STREAMED_SOUND_MISSION_MONO_5,
+	STREAMED_SOUND_MISSION_MONO_6,
+	STREAMED_SOUND_MISSION_MONO_7,
+	STREAMED_SOUND_MISSION_MONO_8,
+	STREAMED_SOUND_MISSION_MONO_9,
+	STREAMED_SOUND_MISSION_MONO10,
+	STREAMED_SOUND_MISSION_MONO11,
+	STREAMED_SOUND_MISSION_MONO12,
+	STREAMED_SOUND_MISSION_MONO13,
+	STREAMED_SOUND_MISSION_MONO14,
+	STREAMED_SOUND_MISSION_MONO15,
+	STREAMED_SOUND_MISSION_MONO16,
+	STREAMED_SOUND_MISSION_FUD_01,
+	STREAMED_SOUND_MISSION_FUD_02,
+	STREAMED_SOUND_MISSION_FUD_03,
+	STREAMED_SOUND_MISSION_FUD_04,
+	STREAMED_SOUND_MISSION_FUD_05,
+	STREAMED_SOUND_MISSION_FUD_06,
+	STREAMED_SOUND_MISSION_FUD_07,
+	STREAMED_SOUND_MISSION_FUD_08,
+	STREAMED_SOUND_MISSION_FUD_09,
+	STREAMED_SOUND_MISSION_FUD_10,
+	STREAMED_SOUND_MISSION_FUD_11,
+	STREAMED_SOUND_MISSION_FUD_12,
+	STREAMED_SOUND_MISSION_FUD_13,
+	STREAMED_SOUND_MISSION_FUD_14,
+	STREAMED_SOUND_MISSION_FUD_15,
+	STREAMED_SOUND_MISSION_FUD_16,
+	STREAMED_SOUND_MISSION_FUD_17,
+	STREAMED_SOUND_MISSION_FUD_18,
+	STREAMED_SOUND_MISSION_FUD_19,
+	STREAMED_SOUND_MISSION_FUD_20,
+	STREAMED_SOUND_MISSION_BURG_01,
+	STREAMED_SOUND_MISSION_BURG_02,
+	STREAMED_SOUND_MISSION_BURG_03,
+	STREAMED_SOUND_MISSION_BURG_04,
+	STREAMED_SOUND_MISSION_BURG_05,
+	STREAMED_SOUND_MISSION_BURG_06,
+	STREAMED_SOUND_MISSION_BURG_07,
+	STREAMED_SOUND_MISSION_BURG_08,
+	STREAMED_SOUND_MISSION_BURG_09,
+	STREAMED_SOUND_MISSION_BURG_10,
+	STREAMED_SOUND_MISSION_BURG_11,
+	STREAMED_SOUND_MISSION_BURG_12,
+	STREAMED_SOUND_MISSION_CRUST01,
+	STREAMED_SOUND_MISSION_CRUST02,
+	STREAMED_SOUND_MISSION_CRUST03,
+	STREAMED_SOUND_MISSION_CRUST04,
+	STREAMED_SOUND_MISSION_CRUST05,
+	STREAMED_SOUND_MISSION_CRUST06,
+	STREAMED_SOUND_MISSION_CRUST07,
+	STREAMED_SOUND_MISSION_CRUST08,
+	STREAMED_SOUND_MISSION_CRUST09,
+	STREAMED_SOUND_MISSION_BAND_01,
+	STREAMED_SOUND_MISSION_BAND_02,
+	STREAMED_SOUND_MISSION_BAND_03,
+	STREAMED_SOUND_MISSION_BAND_04,
+	STREAMED_SOUND_MISSION_BAND_05,
+	STREAMED_SOUND_MISSION_BAND_06,
+	STREAMED_SOUND_MISSION_BAND_07,
+	STREAMED_SOUND_MISSION_BAND_08,
+	STREAMED_SOUND_MISSION_SHAFT01,
+	STREAMED_SOUND_MISSION_SHAFT02,
+	STREAMED_SOUND_MISSION_SHAFT03,
+	STREAMED_SOUND_MISSION_SHAFT04,
+	STREAMED_SOUND_MISSION_SHAFT05,
+	STREAMED_SOUND_MISSION_SHAFT06,
+	STREAMED_SOUND_MISSION_SHAFT07,
+	STREAMED_SOUND_MISSION_SHAFT08,
+	STREAMED_SOUND_MISSION_PISS_01,
+	STREAMED_SOUND_MISSION_PISS_02,
+	STREAMED_SOUND_MISSION_PISS_03,
+	STREAMED_SOUND_MISSION_PISS_04,
+	STREAMED_SOUND_MISSION_PISS_05,
+	STREAMED_SOUND_MISSION_PISS_06,
+	STREAMED_SOUND_MISSION_PISS_07,
+	STREAMED_SOUND_MISSION_PISS_08,
+	STREAMED_SOUND_MISSION_PISS_09,
+	STREAMED_SOUND_MISSION_PISS_10,
+	STREAMED_SOUND_MISSION_PISS_11,
+	STREAMED_SOUND_MISSION_PISS_12,
+	STREAMED_SOUND_MISSION_PISS_13,
+	STREAMED_SOUND_MISSION_PISS_14,
+	STREAMED_SOUND_MISSION_PISS_15,
+	STREAMED_SOUND_MISSION_PISS_16,
+	STREAMED_SOUND_MISSION_PISS_17,
+	STREAMED_SOUND_MISSION_PISS_18,
+	STREAMED_SOUND_MISSION_PISS_19,
+	STREAMED_SOUND_MISSION_GIMME01,
+	STREAMED_SOUND_MISSION_GIMME02,
+	STREAMED_SOUND_MISSION_GIMME03,
+	STREAMED_SOUND_MISSION_GIMME04,
+	STREAMED_SOUND_MISSION_GIMME05,
+	STREAMED_SOUND_MISSION_GIMME06,
+	STREAMED_SOUND_MISSION_GIMME07,
+	STREAMED_SOUND_MISSION_GIMME08,
+	STREAMED_SOUND_MISSION_GIMME09,
+	STREAMED_SOUND_MISSION_GIMME10,
+	STREAMED_SOUND_MISSION_GIMME11,
+	STREAMED_SOUND_MISSION_GIMME12,
+	STREAMED_SOUND_MISSION_GIMME13,
+	STREAMED_SOUND_MISSION_GIMME14,
+	STREAMED_SOUND_MISSION_GIMME15,
+	STREAMED_SOUND_MISSION_BUST_01,
+	STREAMED_SOUND_MISSION_BUST_02,
+	STREAMED_SOUND_MISSION_BUST_03,
+	STREAMED_SOUND_MISSION_BUST_04,
+	STREAMED_SOUND_MISSION_BUST_05,
+	STREAMED_SOUND_MISSION_BUST_06,
+	STREAMED_SOUND_MISSION_BUST_07,
+	STREAMED_SOUND_MISSION_BUST_08,
+	STREAMED_SOUND_MISSION_BUST_09,
+	STREAMED_SOUND_MISSION_BUST_10,
+	STREAMED_SOUND_MISSION_BUST_11,
+	STREAMED_SOUND_MISSION_BUST_12,
+	STREAMED_SOUND_MISSION_BUST_13,
+	STREAMED_SOUND_MISSION_BUST_14,
+	STREAMED_SOUND_MISSION_BUST_15,
+	STREAMED_SOUND_MISSION_BUST_16,
+	STREAMED_SOUND_MISSION_BUST_17,
+	STREAMED_SOUND_MISSION_BUST_18,
+	STREAMED_SOUND_MISSION_BUST_19,
+	STREAMED_SOUND_MISSION_BUST_20,
+	STREAMED_SOUND_MISSION_BUST_21,
+	STREAMED_SOUND_MISSION_BUST_22,
+	STREAMED_SOUND_MISSION_BUST_23,
+	STREAMED_SOUND_MISSION_BUST_24,
+	STREAMED_SOUND_MISSION_BUST_25,
+	STREAMED_SOUND_MISSION_BUST_26,
+	STREAMED_SOUND_MISSION_BUST_27,
+	STREAMED_SOUND_MISSION_BUST_28,
 	TOTAL_STREAMED_SOUNDS,
 	NO_STREAMED_SOUND,
 };
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index 34518f54..0378c07c 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -81,10 +81,17 @@ public:
 
 class CMP3File : public IDecoder
 {
+protected:
 	mpg123_handle *m_pMH;
 	bool m_bOpened;
 	uint32 m_nRate;
 	uint32 m_nChannels;
+	
+	CMP3File() :
+		m_pMH(nil),
+		m_bOpened(false),
+		m_nRate(0),
+		m_nChannels(0) {}
 public:
 	CMP3File(const char *path) :
 		m_pMH(nil),
@@ -171,6 +178,51 @@ public:
 	}
 };
 
+class CADFFile : public CMP3File
+{
+	static ssize_t r_read(void* fh, void* buf, size_t size)
+	{
+		size_t bytesRead = fread(buf, 1, size, (FILE*)fh);
+		uint8* _buf = (uint8*)buf;
+		for (int i = 0; i < size; i++)
+			_buf[i] ^= 0x22;
+		return bytesRead;
+	}
+	static off_t r_seek(void* fh, off_t pos, int seekType)
+	{
+		fseek((FILE*)fh, pos, seekType);
+		return ftell((FILE*)fh);
+	}
+	static void r_close(void* fh)
+	{
+		fclose((FILE*)fh);
+	}
+public:
+	CADFFile(const char* path)
+	{
+		m_pMH = mpg123_new(nil, nil);
+		if (m_pMH)
+		{
+			long rate = 0;
+			int channels = 0;
+			int encoding = 0;
+
+			FILE* f = fopen(path, "rb");
+
+			m_bOpened = mpg123_replace_reader_handle(m_pMH, r_read, r_seek, r_close) == MPG123_OK
+				&& mpg123_open_handle(m_pMH, f) == MPG123_OK &&  mpg123_getformat(m_pMH, &rate, &channels, &encoding) == MPG123_OK;
+			m_nRate = rate;
+			m_nChannels = channels;
+
+			if (IsOpened())
+			{
+				mpg123_format_none(m_pMH);
+				mpg123_format(m_pMH, rate, channels, encoding);
+			}
+		}
+	}
+};
+
 void CStream::Initialise()
 {
 	mpg123_init();
@@ -217,6 +269,8 @@ CStream::CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUF
 		m_pSoundFile = new CMP3File(m_aFilename);
 	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".wav")], ".wav"))
 		m_pSoundFile = new CSndFile(m_aFilename);
+	else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".adf")], ".adf"))
+		m_pSoundFile = new CADFFile(m_aFilename);
 	else 
 		m_pSoundFile = nil;
 	ASSERT(m_pSoundFile != nil);
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 391e884b..6ed239b1 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -200,10 +200,10 @@ public:
 	void  StartChannel            (uint32 nChannel);
 	void  StopChannel             (uint32 nChannel);
 	
-	void  PreloadStreamedFile                                     (uint8 nFile, uint8 nStream);
+	void  PreloadStreamedFile                                    (uint32 nFile, uint8 nStream);
 	void  PauseStream                                        (uint8 nPauseFlag, uint8 nStream);
 	void  StartPreloadedStreamedFile                                           (uint8 nStream);
-	bool  StartStreamedFile                          (uint8 nFile, uint32 nPos, uint8 nStream);
+	bool  StartStreamedFile                         (uint32 nFile, uint32 nPos, uint8 nStream);
 	void  StopStreamedFile                                                     (uint8 nStream);
 	int32 GetStreamedFilePosition                                              (uint8 nStream);
 	void  SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream);
@@ -220,200 +220,1228 @@ extern uint32 BankStartOffset[MAX_SAMPLEBANKS];
 
 static char StreamedNameTable[][25]=
 {
-	"AUDIO\\HEAD.WAV",
-	"AUDIO\\CLASS.WAV",
-	"AUDIO\\KJAH.WAV",
-	"AUDIO\\RISE.WAV",
-	"AUDIO\\LIPS.WAV",
-	"AUDIO\\GAME.WAV",
-	"AUDIO\\MSX.WAV",
-	"AUDIO\\FLASH.WAV",
-	"AUDIO\\CHAT.WAV",
-	"AUDIO\\HEAD.WAV",
-	"AUDIO\\POLICE.WAV",
-	"AUDIO\\CITY.WAV",
-	"AUDIO\\WATER.WAV",
-	"AUDIO\\COMOPEN.WAV",
-	"AUDIO\\SUBOPEN.WAV",
-	"AUDIO\\JB.MP3",
-	"AUDIO\\BET.MP3",
-	"AUDIO\\L1_LG.MP3",
-	"AUDIO\\L2_DSB.MP3",
-	"AUDIO\\L3_DM.MP3",
-	"AUDIO\\L4_PAP.MP3",
-	"AUDIO\\L5_TFB.MP3",
-	"AUDIO\\J0_DM2.MP3",
-	"AUDIO\\J1_LFL.MP3",
-	"AUDIO\\J2_KCL.MP3",
-	"AUDIO\\J3_VH.MP3",
-	"AUDIO\\J4_ETH.MP3",
-	"AUDIO\\J5_DST.MP3",
-	"AUDIO\\J6_TBJ.MP3",
-	"AUDIO\\T1_TOL.MP3",
-	"AUDIO\\T2_TPU.MP3",
-	"AUDIO\\T3_MAS.MP3",
-	"AUDIO\\T4_TAT.MP3",
-	"AUDIO\\T5_BF.MP3",
-	"AUDIO\\S0_MAS.MP3",
-	"AUDIO\\S1_PF.MP3",
-	"AUDIO\\S2_CTG.MP3",
-	"AUDIO\\S3_RTC.MP3",
-	"AUDIO\\S5_LRQ.MP3",
-	"AUDIO\\S4_BDBA.MP3",
-	"AUDIO\\S4_BDBB.MP3",
-	"AUDIO\\S2_CTG2.MP3",
-	"AUDIO\\S4_BDBD.MP3",
-	"AUDIO\\S5_LRQB.MP3",
-	"AUDIO\\S5_LRQC.MP3",
-	"AUDIO\\A1_SSO.WAV",
-	"AUDIO\\A2_PP.WAV",
-	"AUDIO\\A3_SS.WAV",
-	"AUDIO\\A4_PDR.WAV",
-	"AUDIO\\A5_K2FT.WAV",
-	"AUDIO\\K1_KBO.MP3",
-	"AUDIO\\K2_GIS.MP3",
-	"AUDIO\\K3_DS.MP3",
-	"AUDIO\\K4_SHI.MP3",
-	"AUDIO\\K5_SD.MP3",
-	"AUDIO\\R0_PDR2.MP3",
-	"AUDIO\\R1_SW.MP3",
-	"AUDIO\\R2_AP.MP3",
-	"AUDIO\\R3_ED.MP3",
-	"AUDIO\\R4_GF.MP3",
-	"AUDIO\\R5_PB.MP3",
-	"AUDIO\\R6_MM.MP3",
-	"AUDIO\\D1_STOG.MP3",
-	"AUDIO\\D2_KK.MP3",
-	"AUDIO\\D3_ADO.MP3",
-	"AUDIO\\D5_ES.MP3",
-	"AUDIO\\D7_MLD.MP3",
-	"AUDIO\\D4_GTA.MP3",
-	"AUDIO\\D4_GTA2.MP3",
-	"AUDIO\\D6_STS.MP3",
-	"AUDIO\\A6_BAIT.WAV",
-	"AUDIO\\A7_ETG.WAV",
-	"AUDIO\\A8_PS.WAV",
-	"AUDIO\\A9_ASD.WAV",
-	"AUDIO\\K4_SHI2.MP3",
-	"AUDIO\\C1_TEX.MP3",
-	"AUDIO\\EL_PH1.MP3",
-	"AUDIO\\EL_PH2.MP3",
-	"AUDIO\\EL_PH3.MP3",
-	"AUDIO\\EL_PH4.MP3",
-	"AUDIO\\YD_PH1.MP3",
-	"AUDIO\\YD_PH2.MP3",
-	"AUDIO\\YD_PH3.MP3",
-	"AUDIO\\YD_PH4.MP3",
-	"AUDIO\\HD_PH1.MP3",
-	"AUDIO\\HD_PH2.MP3",
-	"AUDIO\\HD_PH3.MP3",
-	"AUDIO\\HD_PH4.MP3",
-	"AUDIO\\HD_PH5.MP3",
-	"AUDIO\\MT_PH1.MP3",
-	"AUDIO\\MT_PH2.MP3",
-	"AUDIO\\MT_PH3.MP3",
-	"AUDIO\\MT_PH4.MP3",
-	"AUDIO\\MISCOM.WAV",
-	"AUDIO\\END.MP3",
-	"AUDIO\\lib_a1.WAV",
-	"AUDIO\\lib_a2.WAV",
-	"AUDIO\\lib_a.WAV",
-	"AUDIO\\lib_b.WAV",
-	"AUDIO\\lib_c.WAV",
-	"AUDIO\\lib_d.WAV",
-	"AUDIO\\l2_a.WAV",
-	"AUDIO\\j4t_1.WAV",
-	"AUDIO\\j4t_2.WAV",
-	"AUDIO\\j4t_3.WAV",
-	"AUDIO\\j4t_4.WAV",
-	"AUDIO\\j4_a.WAV",
-	"AUDIO\\j4_b.WAV",
-	"AUDIO\\j4_c.WAV",
-	"AUDIO\\j4_d.WAV",
-	"AUDIO\\j4_e.WAV",
-	"AUDIO\\j4_f.WAV",
-	"AUDIO\\j6_1.WAV",
-	"AUDIO\\j6_a.WAV",
-	"AUDIO\\j6_b.WAV",
-	"AUDIO\\j6_c.WAV",
-	"AUDIO\\j6_d.WAV",
-	"AUDIO\\t4_a.WAV",
-	"AUDIO\\s1_a.WAV",
-	"AUDIO\\s1_a1.WAV",
-	"AUDIO\\s1_b.WAV",
-	"AUDIO\\s1_c.WAV",
-	"AUDIO\\s1_c1.WAV",
-	"AUDIO\\s1_d.WAV",
-	"AUDIO\\s1_e.WAV",
-	"AUDIO\\s1_f.WAV",
-	"AUDIO\\s1_g.WAV",
-	"AUDIO\\s1_h.WAV",
-	"AUDIO\\s1_i.WAV",
-	"AUDIO\\s1_j.WAV",
-	"AUDIO\\s1_k.WAV",
-	"AUDIO\\s1_l.WAV",
-	"AUDIO\\s3_a.WAV",
-	"AUDIO\\s3_b.WAV",
-	"AUDIO\\el3_a.WAV",
-	"AUDIO\\mf1_a.WAV",
-	"AUDIO\\mf2_a.WAV",
-	"AUDIO\\mf3_a.WAV",
-	"AUDIO\\mf3_b.WAV",
-	"AUDIO\\mf3_b1.WAV",
-	"AUDIO\\mf3_c.WAV",
-	"AUDIO\\mf4_a.WAV",
-	"AUDIO\\mf4_b.WAV",
-	"AUDIO\\mf4_c.WAV",
-	"AUDIO\\a1_a.WAV",
-	"AUDIO\\a3_a.WAV",
-	"AUDIO\\a5_a.WAV",
-	"AUDIO\\a4_a.WAV",
-	"AUDIO\\a4_b.WAV",
-	"AUDIO\\a4_c.WAV",
-	"AUDIO\\a4_d.WAV",
-	"AUDIO\\k1_a.WAV",
-	"AUDIO\\k3_a.WAV",
-	"AUDIO\\r1_a.WAV",
-	"AUDIO\\r2_a.WAV",
-	"AUDIO\\r2_b.WAV",
-	"AUDIO\\r2_c.WAV",
-	"AUDIO\\r2_d.WAV",
-	"AUDIO\\r2_e.WAV",
-	"AUDIO\\r2_f.WAV",
-	"AUDIO\\r2_g.WAV",
-	"AUDIO\\r2_h.WAV",
-	"AUDIO\\r5_a.WAV",
-	"AUDIO\\r6_a.WAV",
-	"AUDIO\\r6_a1.WAV",
-	"AUDIO\\r6_b.WAV",
-	"AUDIO\\lo2_a.WAV",
-	"AUDIO\\lo6_a.WAV",
-	"AUDIO\\yd2_a.WAV",
-	"AUDIO\\yd2_b.WAV",
-	"AUDIO\\yd2_c.WAV",
-	"AUDIO\\yd2_c1.WAV",
-	"AUDIO\\yd2_d.WAV",
-	"AUDIO\\yd2_e.WAV",
-	"AUDIO\\yd2_f.WAV",
-	"AUDIO\\yd2_g.WAV",
-	"AUDIO\\yd2_h.WAV",
-	"AUDIO\\yd2_ass.WAV",
-	"AUDIO\\yd2_ok.WAV",
-	"AUDIO\\h5_a.WAV",
-	"AUDIO\\h5_b.WAV",
-	"AUDIO\\h5_c.WAV",
-	"AUDIO\\ammu_a.WAV",
-	"AUDIO\\ammu_b.WAV",
-	"AUDIO\\ammu_c.WAV",
-	"AUDIO\\door_1.WAV",
-	"AUDIO\\door_2.WAV",
-	"AUDIO\\door_3.WAV",
-	"AUDIO\\door_4.WAV",
-	"AUDIO\\door_5.WAV",
-	"AUDIO\\door_6.WAV",
-	"AUDIO\\t3_a.WAV",
-	"AUDIO\\t3_b.WAV",
-	"AUDIO\\t3_c.WAV",
-	"AUDIO\\k1_b.WAV",
-	"AUDIO\\cat1.WAV"
+	"AUDIO\\WILD.ADF",
+	"AUDIO\\FLASH.ADF",
+	"AUDIO\\KCHAT.ADF",
+	"AUDIO\\FEVER.ADF",
+	"AUDIO\\VROCK.ADF",
+	"AUDIO\\VCPR.ADF",
+	"AUDIO\\ESPANT.ADF",
+	"AUDIO\\EMOTION.ADF",
+	"AUDIO\\WAVE.ADF",
+	"AUDIO\\MISCOM.MP3",
+	"AUDIO\\CITY.MP3",
+	"AUDIO\\WATER.MP3",
+	"AUDIO\\BEACHAMB.MP3",
+	"AUDIO\\HCITY.MP3",
+	"AUDIO\\HWATER.MP3",
+	"AUDIO\\HBEACH.MP3",
+	"AUDIO\\MALLAMB.MP3",
+	"AUDIO\\STRIP.MP3",
+	"AUDIO\\MALIBU.MP3",
+	"AUDIO\\HOTEL.MP3",
+	"AUDIO\\DIRTRING.MP3",
+	"AUDIO\\LAW4RIOT.MP3",
+	"AUDIO\\AMBSIL.MP3",
+	"AUDIO\\POLICE.MP3",
+	"AUDIO\\TAXI.MP3",
+	"AUDIO\\BCLOSED.MP3",
+	"AUDIO\\BOPEN.MP3",
+	"AUDIO\\ASS_1.MP3",
+	"AUDIO\\ASS_2.MP3",
+	"AUDIO\\BANK_1.MP3",
+	"AUDIO\\BANK_2A.MP3",
+	"AUDIO\\BANK_2B.MP3",
+	"AUDIO\\BANK_3A.MP3",
+	"AUDIO\\BANK_3B.MP3",
+	"AUDIO\\BANK_4.MP3",
+	"AUDIO\\BIKE_1.MP3",
+	"AUDIO\\BIKE_2.MP3",
+	"AUDIO\\BIKE_3.MP3",
+	"AUDIO\\BUD_1.MP3",
+	"AUDIO\\BUD_2.MP3",
+	"AUDIO\\BUD_3.MP3",
+	"AUDIO\\CAP_1.MP3",
+	"AUDIO\\CAR_1.MP3",
+	"AUDIO\\CNT_1A.MP3",
+	"AUDIO\\CNT_1B.MP3",
+	"AUDIO\\CNT_2.MP3",
+	"AUDIO\\COK_1.MP3",
+	"AUDIO\\COK_2A.MP3",
+	"AUDIO\\COK_2B.MP3",
+	"AUDIO\\COK_3.MP3",
+	"AUDIO\\COK_4A.MP3",
+	"AUDIO\\COK_4A2.MP3",
+	"AUDIO\\COK_4B.MP3",
+	"AUDIO\\COL_1.MP3",
+	"AUDIO\\COL_2.MP3",
+	"AUDIO\\COL_3A.MP3",
+	"AUDIO\\COL_4A.MP3",
+	"AUDIO\\COL_5A.MP3",
+	"AUDIO\\COL_5B.MP3",
+	"AUDIO\\CUB_1.MP3",
+	"AUDIO\\CUB_2.MP3",
+	"AUDIO\\CUB_3.MP3",
+	"AUDIO\\CUB_4.MP3",
+	"AUDIO\\DRUG_1.MP3",
+	"AUDIO\\FIN.MP3",
+	"AUDIO\\FIN2.MP3",
+	"AUDIO\\FINALE.MP3",
+	"AUDIO\\HAT_1.MP3",
+	"AUDIO\\HAT_2.MP3",
+	"AUDIO\\HAT_3.MP3",
+	"AUDIO\\ICE_1.MP3",
+	"AUDIO\\INT_A.MP3",
+	"AUDIO\\INT_B.MP3",
+	"AUDIO\\INT_D.MP3",
+	"AUDIO\\INT_M.MP3",
+	"AUDIO\\LAW_1A.MP3",
+	"AUDIO\\LAW_1B.MP3",
+	"AUDIO\\LAW_2A.MP3",
+	"AUDIO\\LAW_2B.MP3",
+	"AUDIO\\LAW_2C.MP3",
+	"AUDIO\\LAW_3.MP3",
+	"AUDIO\\LAW_4.MP3",
+	"AUDIO\\PHIL_1.MP3",
+	"AUDIO\\PHIL_2.MP3",
+	"AUDIO\\PORN_1.MP3",
+	"AUDIO\\PORN_2.MP3",
+	"AUDIO\\PORN_3.MP3",
+	"AUDIO\\PORN_4.MP3",
+	"AUDIO\\RESC_1A.MP3",
+	"AUDIO\\ROK_1.MP3",
+	"AUDIO\\ROK_2.MP3",
+	"AUDIO\\ROK_3A.MP3",
+	"AUDIO\\STRIPA.MP3",
+	"AUDIO\\TAX_1.MP3",
+	"AUDIO\\TEX_1.MP3",
+	"AUDIO\\TEX_2.MP3",
+	"AUDIO\\TEX_3.MP3",
+	"AUDIO\\GLIGHT.MP3",
+	"AUDIO\\FIST.MP3",
+	"AUDIO\\MISCOM.MP3",
+	"AUDIO\\MISCOM.MP3",
+	"AUDIO\\MISCOM.MP3",
+	"AUDIO\\MISCOM.MP3",
+	"AUDIO\\MOBR1.WAV",
+	"AUDIO\\PAGER.WAV",
+	"AUDIO\\CARREV.WAV",
+	"AUDIO\\BIKEREV.WAV",
+	"AUDIO\\LIFTOP.WAV",
+	"AUDIO\\LIFTCL.WAV",
+	"AUDIO\\LIFTRUN.WAV",
+	"AUDIO\\LIFTBEL.WAV",
+	"AUDIO\\INLIFT.WAV",
+	"AUDIO\\SFX_01.WAV",
+	"AUDIO\\SFX_02.WAV",
+	"AUDIO\\CAMERAL.WAV",
+	"AUDIO\\CAMERAR.WAV",
+	"AUDIO\\CHEER1.WAV",
+	"AUDIO\\CHEER2.WAV",
+	"AUDIO\\CHEER3.WAV",
+	"AUDIO\\CHEER4.WAV",
+	"AUDIO\\OOH1.WAV",
+	"AUDIO\\OOH2.WAV",
+	"AUDIO\\RACE1.WAV",
+	"AUDIO\\RACE2.WAV",
+	"AUDIO\\RACE3.WAV",
+	"AUDIO\\RACE4.WAV",
+	"AUDIO\\RACE5.WAV",
+	"AUDIO\\RACE6.WAV",
+	"AUDIO\\RACE7.WAV",
+	"AUDIO\\RACE8.WAV",
+	"AUDIO\\RACE9.WAV",
+	"AUDIO\\RACE10.WAV",
+	"AUDIO\\RACE11.WAV",
+	"AUDIO\\RACE12.WAV",
+	"AUDIO\\RACE13.WAV",
+	"AUDIO\\RACE14.WAV",
+	"AUDIO\\RACE15.WAV",
+	"AUDIO\\HOT1.WAV",
+	"AUDIO\\HOT2.WAV",
+	"AUDIO\\HOT3.WAV",
+	"AUDIO\\HOT4.WAV",
+	"AUDIO\\HOT5.WAV",
+	"AUDIO\\HOT6.WAV",
+	"AUDIO\\HOT7.WAV",
+	"AUDIO\\HOT8.WAV",
+	"AUDIO\\HOT9.WAV",
+	"AUDIO\\HOT10.WAV",
+	"AUDIO\\HOT11.WAV",
+	"AUDIO\\HOT12.WAV",
+	"AUDIO\\HOT13.WAV",
+	"AUDIO\\HOT14.WAV",
+	"AUDIO\\HOT15.WAV",
+	"AUDIO\\LANSTP1.WAV",
+	"AUDIO\\LANSTP2.WAV",
+	"AUDIO\\LANAMU1.WAV",
+	"AUDIO\\LANAMU2.WAV",
+	"AUDIO\\AIRHORNL.WAV",
+	"AUDIO\\AIRHORNR.WAV",
+	"AUDIO\\SNIPSCRL.WAV",
+	"AUDIO\\SNIPSHORT.WAV",
+	"AUDIO\\BLOWROOF.WAV",
+	"AUDIO\\ASS_1.WAV",
+	"AUDIO\\ASS_2.WAV",
+	"AUDIO\\ASS_3.WAV",
+	"AUDIO\\ASS_4.WAV",
+	"AUDIO\\ASS_5.WAV",
+	"AUDIO\\ASS_6.WAV",
+	"AUDIO\\ASS_7.WAV",
+	"AUDIO\\ASS_8.WAV",
+	"AUDIO\\ASS_9.WAV",
+	"AUDIO\\ASS_10.WAV",
+	"AUDIO\\ASS_11.WAV",
+	"AUDIO\\ASS_12.WAV",
+	"AUDIO\\ASS_13.WAV",
+	"AUDIO\\ASS_14.WAV",
+	"AUDIO\\BIKE1_1.WAV",
+	"AUDIO\\BIKE1_2.WAV",
+	"AUDIO\\BIKE1_3.WAV",
+	"AUDIO\\BNK1_1.WAV",
+	"AUDIO\\BNK1_2.WAV",
+	"AUDIO\\BNK1_3.WAV",
+	"AUDIO\\BNK1_4.WAV",
+	"AUDIO\\BNK1_5.WAV",
+	"AUDIO\\BNK1_6.WAV",
+	"AUDIO\\BNK1_7.WAV",
+	"AUDIO\\BNK1_8.WAV",
+	"AUDIO\\BNK1_10.WAV",
+	"AUDIO\\BNK1_11.WAV",
+	"AUDIO\\BNK1_12.WAV",
+	"AUDIO\\BNK1_13.WAV",
+	"AUDIO\\BNK1_14.WAV",
+	"AUDIO\\BNK2_1.WAV",
+	"AUDIO\\BNK2_2.WAV",
+	"AUDIO\\BNK2_3.WAV",
+	"AUDIO\\BNK2_4.WAV",
+	"AUDIO\\BNK2_5.WAV",
+	"AUDIO\\BNK2_6.WAV",
+	"AUDIO\\BNK2_7.WAV",
+	"AUDIO\\BNK2_8.WAV",
+	"AUDIO\\BNK2_9.WAV",
+	"AUDIO\\BNK3_1.WAV",
+	"AUDIO\\BNK3_2.WAV",
+	"AUDIO\\BNK3_3A.WAV",
+	"AUDIO\\BNK3_3B.WAV",
+	"AUDIO\\BNK3_3C.WAV",
+	"AUDIO\\BNK3_4A.WAV",
+	"AUDIO\\BNK3_4B.WAV",
+	"AUDIO\\BNK3_4C.WAV",
+	"AUDIO\\BNK4_1.WAV",
+	"AUDIO\\BNK4_2.WAV",
+	"AUDIO\\BNK4_3A.WAV",
+	"AUDIO\\BNK4_3B.WAV",
+	"AUDIO\\BNK4_3C.WAV",
+	"AUDIO\\BNK4_3D.WAV",
+	"AUDIO\\BNK4_3E.WAV",
+	"AUDIO\\BNK4_3F.WAV",
+	"AUDIO\\BNK4_3G.WAV",
+	"AUDIO\\BNK4_3H.WAV",
+	"AUDIO\\BNK4_3I.WAV",
+	"AUDIO\\BNK4_3J.WAV",
+	"AUDIO\\BNK4_3K.WAV",
+	"AUDIO\\BNK4_3M.WAV",
+	"AUDIO\\BNK4_3O.WAV",
+	"AUDIO\\BNK4_3P.WAV",
+	"AUDIO\\BNK4_3Q.WAV",
+	"AUDIO\\BNK4_3R.WAV",
+	"AUDIO\\BNK4_3S.WAV",
+	"AUDIO\\BNK4_3T.WAV",
+	"AUDIO\\BNK4_3U.WAV",
+	"AUDIO\\BNK4_3V.WAV",
+	"AUDIO\\BNK4_4A.WAV",
+	"AUDIO\\BNK4_4B.WAV",
+	"AUDIO\\BNK4_5.WAV",
+	"AUDIO\\BNK4_6.WAV",
+	"AUDIO\\BNK4_7.WAV",
+	"AUDIO\\BNK4_8.WAV",
+	"AUDIO\\BNK4_9.WAV",
+	"AUDIO\\BNK4_10.WAV",
+	"AUDIO\\BNK4_11.WAV",
+	"AUDIO\\BK4_12A.WAV",
+	"AUDIO\\BK4_12B.WAV",
+	"AUDIO\\BK4_12C.WAV",
+	"AUDIO\\BNK4_13.WAV",
+	"AUDIO\\BK4_14A.WAV",
+	"AUDIO\\BK4_14B.WAV",
+	"AUDIO\\BNK4_15.WAV",
+	"AUDIO\\BNK4_16.WAV",
+	"AUDIO\\BNK4_17.WAV",
+	"AUDIO\\BNK4_18.WAV",
+	"AUDIO\\BK4_19A.WAV",
+	"AUDIO\\BK4_19B.WAV",
+	"AUDIO\\BK4_20A.WAV",
+	"AUDIO\\BK4_20B.WAV",
+	"AUDIO\\BNK4_21.WAV",
+	"AUDIO\\BNK422A.WAV",
+	"AUDIO\\BNK422B.WAV",
+	"AUDIO\\BK4_23A.WAV",
+	"AUDIO\\BK4_23B.WAV",
+	"AUDIO\\BK4_23C.WAV",
+	"AUDIO\\BK4_23D.WAV",
+	"AUDIO\\BK4_24A.WAV",
+	"AUDIO\\BK4_24B.WAV",
+	"AUDIO\\BNK4_25.WAV",
+	"AUDIO\\BNK4_26.WAV",
+	"AUDIO\\BNK4_27.WAV",
+	"AUDIO\\BNK4_28.WAV",
+	"AUDIO\\BNK4_29.WAV",
+	"AUDIO\\BNK4_30.WAV",
+	"AUDIO\\BK4_31A.WAV",
+	"AUDIO\\BK4_31B.WAV",
+	"AUDIO\\BNK4_32.WAV",
+	"AUDIO\\BK4_34A.WAV",
+	"AUDIO\\BK4_34B.WAV",
+	"AUDIO\\BK4_35A.WAV",
+	"AUDIO\\BK4_35B.WAV",
+	"AUDIO\\BNK4_36.WAV",
+	"AUDIO\\BNK4_37.WAV",
+	"AUDIO\\BNK4_38.WAV",
+	"AUDIO\\BNK4_39.WAV",
+	"AUDIO\\BK4_40A.WAV",
+	"AUDIO\\BK4_40B.WAV",
+	"AUDIO\\BNK4_41.WAV",
+	"AUDIO\\BNK4_42.WAV",
+	"AUDIO\\BNK4_43.WAV",
+	"AUDIO\\BNK4_44.WAV",
+	"AUDIO\\BNK4_45.WAV",
+	"AUDIO\\BNK4_46.WAV",
+	"AUDIO\\BNK4_47.WAV",
+	"AUDIO\\BNK4_48.WAV",
+	"AUDIO\\BNK4_49.WAV",
+	"AUDIO\\BNK450A.WAV",
+	"AUDIO\\BNK450B.WAV",
+	"AUDIO\\BNK4_51.WAV",
+	"AUDIO\\BNK4_94.WAV",
+	"AUDIO\\BNK4_95.WAV",
+	"AUDIO\\BNK4_96.WAV",
+	"AUDIO\\BNK4_97.WAV",
+	"AUDIO\\BNK4_98.WAV",
+	"AUDIO\\BNK4_99.WAV",
+	"AUDIO\\BUD1_1.WAV",
+	"AUDIO\\BUD1_2.WAV",
+	"AUDIO\\BUD1_3.WAV",
+	"AUDIO\\BUD1_4.WAV",
+	"AUDIO\\BUD1_5.WAV",
+	"AUDIO\\BUD1_9.WAV",
+	"AUDIO\\BUD1_10.WAV",
+	"AUDIO\\BUD2_1.WAV",
+	"AUDIO\\BUD2_2.WAV",
+	"AUDIO\\BUD2_3.WAV",
+	"AUDIO\\BUD2_4.WAV",
+	"AUDIO\\BUD2_5.WAV",
+	"AUDIO\\BUD2_6.WAV",
+	"AUDIO\\BUD2_7.WAV",
+	"AUDIO\\BUD3_1.WAV",
+	"AUDIO\\BUD3_1A.WAV",
+	"AUDIO\\BUD3_1B.WAV",
+	"AUDIO\\BUD3_1C.WAV",
+	"AUDIO\\BUD3_2.WAV",
+	"AUDIO\\BUD3_3.WAV",
+	"AUDIO\\BUD3_4.WAV",
+	"AUDIO\\BUD3_5.WAV",
+	"AUDIO\\BUD3_6.WAV",
+	"AUDIO\\BUD3_7.WAV",
+	"AUDIO\\BUD3_8A.WAV",
+	"AUDIO\\BUD3_8B.WAV",
+	"AUDIO\\BUD3_8C.WAV",
+	"AUDIO\\BUD3_9A.WAV",
+	"AUDIO\\BUD3_9B.WAV",
+	"AUDIO\\BUD3_9C.WAV",
+	"AUDIO\\CAP1_2.WAV",
+	"AUDIO\\CAP1_3.WAV",
+	"AUDIO\\CAP1_4.WAV",
+	"AUDIO\\CAP1_5.WAV",
+	"AUDIO\\CAP1_6.WAV",
+	"AUDIO\\CAP1_7.WAV",
+	"AUDIO\\CAP1_8.WAV",
+	"AUDIO\\CAP1_9.WAV",
+	"AUDIO\\CAP1_10.WAV",
+	"AUDIO\\CAP1_11.WAV",
+	"AUDIO\\CAP1_12.WAV",
+	"AUDIO\\CNT1_1.WAV",
+	"AUDIO\\CNT1_2.WAV",
+	"AUDIO\\CNT1_3.WAV",
+	"AUDIO\\CNT1_4.WAV",
+	"AUDIO\\CNT1_5.WAV",
+	"AUDIO\\CNT2_1.WAV",
+	"AUDIO\\CNT2_2.WAV",
+	"AUDIO\\CNT2_3.WAV",
+	"AUDIO\\CNT2_4.WAV",
+	"AUDIO\\COK1_1.WAV",
+	"AUDIO\\COK1_2.WAV",
+	"AUDIO\\COK1_3.WAV",
+	"AUDIO\\COK1_4.WAV",
+	"AUDIO\\COK1_5.WAV",
+	"AUDIO\\COK1_6.WAV",
+	"AUDIO\\COK2_1.WAV",
+	"AUDIO\\COK2_2.WAV",
+	"AUDIO\\COK2_3.WAV",
+	"AUDIO\\COK2_4.WAV",
+	"AUDIO\\COK2_5.WAV",
+	"AUDIO\\COK2_6.WAV",
+	"AUDIO\\COK2_7A.WAV",
+	"AUDIO\\COK2_7B.WAV",
+	"AUDIO\\COK2_7C.WAV",
+	"AUDIO\\COK2_8A.WAV",
+	"AUDIO\\COK2_8B.WAV",
+	"AUDIO\\COK2_8C.WAV",
+	"AUDIO\\COK2_8D.WAV",
+	"AUDIO\\COK2_9.WAV",
+	"AUDIO\\COK210A.WAV",
+	"AUDIO\\COK210B.WAV",
+	"AUDIO\\COK210C.WAV",
+	"AUDIO\\COK212A.WAV",
+	"AUDIO\\COK212B.WAV",
+	"AUDIO\\COK2_13.WAV",
+	"AUDIO\\COK2_14.WAV",
+	"AUDIO\\COK2_15.WAV",
+	"AUDIO\\COK2_16.WAV",
+	"AUDIO\\COK2_20.WAV",
+	"AUDIO\\COK2_21.WAV",
+	"AUDIO\\COK2_2.WAV", // this is probably a typo of COK2_22
+	"AUDIO\\COK3_1.WAV",
+	"AUDIO\\COK3_2.WAV",
+	"AUDIO\\COK3_3.WAV",
+	"AUDIO\\COK3_4.WAV",
+	"AUDIO\\COK4_1.WAV",
+	"AUDIO\\COK4_2.WAV",
+	"AUDIO\\COK4_3.WAV",
+	"AUDIO\\COK4_4.WAV",
+	"AUDIO\\COK4_5.WAV",
+	"AUDIO\\COK4_6.WAV",
+	"AUDIO\\COK4_7.WAV",
+	"AUDIO\\COK4_8.WAV",
+	"AUDIO\\COK4_9.WAV",
+	"AUDIO\\COK4_9A.WAV",
+	"AUDIO\\COK4_10.WAV",
+	"AUDIO\\COK4_11.WAV",
+	"AUDIO\\COK4_12.WAV",
+	"AUDIO\\COK4_13.WAV",
+	"AUDIO\\COK4_14.WAV",
+	"AUDIO\\COK4_15.WAV",
+	"AUDIO\\COK4_16.WAV",
+	"AUDIO\\COK4_17.WAV",
+	"AUDIO\\COK4_18.WAV",
+	"AUDIO\\COK4_19.WAV",
+	"AUDIO\\COK4_20.WAV",
+	"AUDIO\\COK4_21.WAV",
+	"AUDIO\\COK4_22.WAV",
+	"AUDIO\\COK4_23.WAV",
+	"AUDIO\\COK4_24.WAV",
+	"AUDIO\\COK4_25.WAV",
+	"AUDIO\\COK4_26.WAV",
+	"AUDIO\\COK4_27.WAV",
+	"AUDIO\\COL1_1.WAV",
+	"AUDIO\\COL1_2.WAV",
+	"AUDIO\\COL1_3.WAV",
+	"AUDIO\\COL1_4.WAV",
+	"AUDIO\\COL1_5.WAV",
+	"AUDIO\\COL1_6.WAV",
+	"AUDIO\\COL1_7.WAV",
+	"AUDIO\\COL1_8.WAV",
+	"AUDIO\\COL2_1.WAV",
+	"AUDIO\\COL2_2.WAV",
+	"AUDIO\\COL2_3.WAV",
+	"AUDIO\\COL2_4.WAV",
+	"AUDIO\\COL2_5.WAV",
+	"AUDIO\\COL2_6A.WAV",
+	"AUDIO\\COL2_7.WAV",
+	"AUDIO\\COL2_8.WAV",
+	"AUDIO\\COL2_9.WAV",
+	"AUDIO\\COL2_10.WAV",
+	"AUDIO\\COL2_11.WAV",
+	"AUDIO\\COL2_12.WAV",
+	"AUDIO\\COL2_13.WAV",
+	"AUDIO\\COL2_14.WAV",
+	"AUDIO\\COL2_15.WAV",
+	"AUDIO\\COL2_16.WAV",
+	"AUDIO\\COL3_1.WAV",
+	"AUDIO\\COL3_2.WAV",
+	"AUDIO\\COL3_2A.WAV",
+	"AUDIO\\COL3_2B.WAV",
+	"AUDIO\\COL3_3.WAV",
+	"AUDIO\\COL3_4.WAV",
+	"AUDIO\\COL3_5.WAV",
+	"AUDIO\\COL3_6.WAV",
+	"AUDIO\\COL3_7.WAV",
+	"AUDIO\\COL3_8.WAV",
+	"AUDIO\\COL3_9.WAV",
+	"AUDIO\\COL3_10.WAV",
+	"AUDIO\\COL3_11.WAV",
+	"AUDIO\\COL3_12.WAV",
+	"AUDIO\\COL3_13.WAV",
+	"AUDIO\\COL3_14.WAV",
+	"AUDIO\\COL3_15.WAV",
+	"AUDIO\\COL3_16.WAV",
+	"AUDIO\\COL3_17.WAV",
+	"AUDIO\\COL3_18.WAV",
+	"AUDIO\\COL3_19.WAV",
+	"AUDIO\\COL3_20.WAV",
+	"AUDIO\\COL3_21.WAV",
+	"AUDIO\\COL3_23.WAV",
+	"AUDIO\\COL3_24.WAV",
+	"AUDIO\\COL3_25.WAV",
+	"AUDIO\\COL4_1.WAV",
+	"AUDIO\\COL4_2.WAV",
+	"AUDIO\\COL4_3.WAV",
+	"AUDIO\\COL4_4.WAV",
+	"AUDIO\\COL4_5.WAV",
+	"AUDIO\\COL4_6.WAV",
+	"AUDIO\\COL4_7.WAV",
+	"AUDIO\\COL4_8.WAV",
+	"AUDIO\\COL4_9.WAV",
+	"AUDIO\\COL4_10.WAV",
+	"AUDIO\\COL4_11.WAV",
+	"AUDIO\\COL4_12.WAV",
+	"AUDIO\\COL4_13.WAV",
+	"AUDIO\\COL4_14.WAV",
+	"AUDIO\\COL4_15.WAV",
+	"AUDIO\\COL4_16.WAV",
+	"AUDIO\\COL4_17.WAV",
+	"AUDIO\\COL4_18.WAV",
+	"AUDIO\\COL4_19.WAV",
+	"AUDIO\\COL4_20.WAV",
+	"AUDIO\\COL4_21.WAV",
+	"AUDIO\\COL4_22.WAV",
+	"AUDIO\\COL4_23.WAV",
+	"AUDIO\\COL4_24.WAV",
+	"AUDIO\\COL4_25.WAV",
+	"AUDIO\\COL4_26.WAV",
+	"AUDIO\\COL5_1.WAV",
+	"AUDIO\\COL5_2.WAV",
+	"AUDIO\\COL5_3.WAV",
+	"AUDIO\\COL5_4.WAV",
+	"AUDIO\\COL5_5.WAV",
+	"AUDIO\\COL5_6.WAV",
+	"AUDIO\\COL5_7.WAV",
+	"AUDIO\\COL5_8.WAV",
+	"AUDIO\\COL5_9.WAV",
+	"AUDIO\\COL5_10.WAV",
+	"AUDIO\\COL5_11.WAV",
+	"AUDIO\\COL5_12.WAV",
+	"AUDIO\\COL5_13.WAV",
+	"AUDIO\\COL5_14.WAV",
+	"AUDIO\\COL5_15.WAV",
+	"AUDIO\\COL5_16.WAV",
+	"AUDIO\\COL5_17.WAV",
+	"AUDIO\\COL5_18.WAV",
+	"AUDIO\\COL5_19.WAV",
+	"AUDIO\\COL5_20.WAV",
+	"AUDIO\\COL5_21.WAV",
+	"AUDIO\\COL5_22.WAV",
+	"AUDIO\\CUB1_1.WAV",
+	"AUDIO\\CUB1_2.WAV",
+	"AUDIO\\CUB1_3.WAV",
+	"AUDIO\\CUB1_4.WAV",
+	"AUDIO\\CUB1_5.WAV",
+	"AUDIO\\CUB1_6.WAV",
+	"AUDIO\\CUB1_7.WAV",
+	"AUDIO\\CUB1_8.WAV",
+	"AUDIO\\CUB1_9.WAV",
+	"AUDIO\\CUB1_10.WAV",
+	"AUDIO\\CUB2_1.WAV",
+	"AUDIO\\CUB2_2.WAV",
+	"AUDIO\\CUB2_3A.WAV",
+	"AUDIO\\CUB2_3B.WAV",
+	"AUDIO\\CUB2_3C.WAV",
+	"AUDIO\\CUB2_4A.WAV",
+	"AUDIO\\CUB2_5.WAV",
+	"AUDIO\\CUB2_6.WAV",
+	"AUDIO\\CUB2_7.WAV",
+	"AUDIO\\CUB2_8.WAV",
+	"AUDIO\\CUB2_9.WAV",
+	"AUDIO\\CUB2_10.WAV",
+	"AUDIO\\CUB2_11.WAV",
+	"AUDIO\\CUB3_1.WAV",
+	"AUDIO\\CUB3_2.WAV",
+	"AUDIO\\CUB3_3.WAV",
+	"AUDIO\\CUB3_4.WAV",
+	"AUDIO\\CUB4_1.WAV",
+	"AUDIO\\CUB4_2.WAV",
+	"AUDIO\\CUB4_3.WAV",
+	"AUDIO\\CUB4_4.WAV",
+	"AUDIO\\CUB4_5.WAV",
+	"AUDIO\\CUB4_5A.WAV",
+	"AUDIO\\CUB4_6.WAV",
+	"AUDIO\\CUB4_7.WAV",
+	"AUDIO\\CUB4_8.WAV",
+	"AUDIO\\CUB4_9.WAV",
+	"AUDIO\\CUB4_10.WAV",
+	"AUDIO\\CUB4_11.WAV",
+	"AUDIO\\CUB4_12.WAV",
+	"AUDIO\\CUB4_13.WAV",
+	"AUDIO\\CUB4_14.WAV",
+	"AUDIO\\CUB4_15.WAV",
+	"AUDIO\\CUB4_16.WAV",
+	"AUDIO\\GOLF_1.WAV",
+	"AUDIO\\GOLF_2.WAV",
+	"AUDIO\\GOLF_3.WAV",
+	"AUDIO\\BAR_1.WAV",
+	"AUDIO\\BAR_2.WAV",
+	"AUDIO\\BAR_3.WAV",
+	"AUDIO\\BAR_4.WAV",
+	"AUDIO\\BAR_5.WAV",
+	"AUDIO\\BAR_6.WAV",
+	"AUDIO\\BAR_7.WAV",
+	"AUDIO\\BAR_8.WAV",
+	"AUDIO\\STRIP_1.WAV",
+	"AUDIO\\STRIP_2.WAV",
+	"AUDIO\\STRIP_3.WAV",
+	"AUDIO\\STRIP_4.WAV",
+	"AUDIO\\STRIP_5.WAV",
+	"AUDIO\\STRIP_6.WAV",
+	"AUDIO\\STRIP_7.WAV",
+	"AUDIO\\STRIP_8.WAV",
+	"AUDIO\\STRIP_9.WAV",
+	"AUDIO\\STAR_1.WAV",
+	"AUDIO\\STAR_2.WAV",
+	"AUDIO\\STAR_3.WAV",
+	"AUDIO\\STAR_4.WAV",
+	"AUDIO\\FIN_1A.WAV",
+	"AUDIO\\FIN_1B.WAV",
+	"AUDIO\\FIN_1C.WAV",
+	"AUDIO\\FIN_2B.WAV",
+	"AUDIO\\FIN_2C.WAV",
+	"AUDIO\\FIN_3.WAV",
+	"AUDIO\\FIN_4.WAV",
+	"AUDIO\\FIN_5.WAV",
+	"AUDIO\\FIN_6.WAV",
+	"AUDIO\\FIN_10.WAV",
+	"AUDIO\\FIN_11A.WAV",
+	"AUDIO\\FIN_11B.WAV",
+	"AUDIO\\FIN_12A.WAV",
+	"AUDIO\\FIN_12B.WAV",
+	"AUDIO\\FIN_12C.WAV",
+	"AUDIO\\FIN_13.WAV",
+	"AUDIO\\FINKILL.WAV",
+	"AUDIO\\LAW1_1.WAV",
+	"AUDIO\\LAW1_2.WAV",
+	"AUDIO\\LAW1_3.WAV",
+	"AUDIO\\LAW1_4.WAV",
+	"AUDIO\\LAW1_5.WAV",
+	"AUDIO\\LAW1_6.WAV",
+	"AUDIO\\LAW1_7.WAV",
+	"AUDIO\\LAW1_8.WAV",
+	"AUDIO\\LAW1_9.WAV",
+	"AUDIO\\LAW1_10.WAV",
+	"AUDIO\\LAW2_1.WAV",
+	"AUDIO\\LAW2_2.WAV",
+	"AUDIO\\LAW2_3.WAV",
+	"AUDIO\\LAW2_4.WAV",
+	"AUDIO\\LAW2_5.WAV",
+	"AUDIO\\LAW2_6.WAV",
+	"AUDIO\\LAW2_7.WAV",
+	"AUDIO\\LAW2_8.WAV",
+	"AUDIO\\LAW2_9.WAV",
+	"AUDIO\\LAW2_10.WAV",
+	"AUDIO\\LAW3_1.WAV",
+	"AUDIO\\LAW3_2.WAV",
+	"AUDIO\\LAW3_3.WAV",
+	"AUDIO\\LAW3_4.WAV",
+	"AUDIO\\LAW3_5.WAV",
+	"AUDIO\\LAW3_6.WAV",
+	"AUDIO\\LAW3_10.WAV",
+	"AUDIO\\LAW3_11.WAV",
+	"AUDIO\\LAW3_12.WAV",
+	"AUDIO\\LAW3_13.WAV",
+	"AUDIO\\LAW3_14.WAV",
+	"AUDIO\\LAW3_16.WAV",
+	"AUDIO\\LAW3_17.WAV",
+	"AUDIO\\LAW3_18.WAV",
+	"AUDIO\\LAW3_19.WAV",
+	"AUDIO\\LAW3_20.WAV",
+	"AUDIO\\LAW3_21.WAV",
+	"AUDIO\\LAW3_22.WAV",
+	"AUDIO\\LAW3_23.WAV",
+	"AUDIO\\LAW3_24.WAV",
+	"AUDIO\\LAW3_25.WAV",
+	"AUDIO\\LAW4_1A.WAV",
+	"AUDIO\\LAW4_1B.WAV",
+	"AUDIO\\LAW4_1C.WAV",
+	"AUDIO\\LAW4_1D.WAV",
+	"AUDIO\\LAW4_10.WAV",
+	"AUDIO\\LAW4_3.WAV",
+	"AUDIO\\LAW4_4.WAV",
+	"AUDIO\\LAW4_5.WAV",
+	"AUDIO\\LAW4_6.WAV",
+	"AUDIO\\LAW4_7.WAV",
+	"AUDIO\\LAW4_8.WAV",
+	"AUDIO\\LAW4_9.WAV",
+	"AUDIO\\PHIL1_2.WAV",
+	"AUDIO\\PHIL1_3.WAV",
+	"AUDIO\\PHIL2_1.WAV",
+	"AUDIO\\PHIL2_2.WAV",
+	"AUDIO\\PHIL2_3.WAV",
+	"AUDIO\\PHIL2_4.WAV",
+	"AUDIO\\PHIL2_5.WAV",
+	"AUDIO\\PHIL2_6.WAV",
+	"AUDIO\\PHIL2_7.WAV",
+	"AUDIO\\PHIL2_8.WAV",
+	"AUDIO\\PHIL2_9.WAV",
+	"AUDIO\\PHIL210.WAV",
+	"AUDIO\\PHIL211.WAV",
+	"AUDIO\\PORN1_1.WAV",
+	"AUDIO\\PORN1_2.WAV",
+	"AUDIO\\PORN1_3.WAV",
+	"AUDIO\\PRN1_3A.WAV",
+	"AUDIO\\PORN1_4.WAV",
+	"AUDIO\\PORN1_5.WAV",
+	"AUDIO\\PORN1_6.WAV",
+	"AUDIO\\PORN1_7.WAV",
+	"AUDIO\\PORN1_8.WAV",
+	"AUDIO\\PORN1_9.WAV",
+	"AUDIO\\PRN1_10.WAV",
+	"AUDIO\\PRN1_11.WAV",
+	"AUDIO\\PRN1_12.WAV",
+	"AUDIO\\PRN1_13.WAV",
+	"AUDIO\\PRN1_14.WAV",
+	"AUDIO\\PRN1_15.WAV",
+	"AUDIO\\PRN1_16.WAV",
+	"AUDIO\\PRN1_17.WAV",
+	"AUDIO\\PRN1_18.WAV",
+	"AUDIO\\PRN1_19.WAV",
+	"AUDIO\\PRN1_20.WAV",
+	"AUDIO\\PRN1_21.WAV",
+	"AUDIO\\PORN3_1.WAV",
+	"AUDIO\\PORN3_2.WAV",
+	"AUDIO\\PORN3_3.WAV",
+	"AUDIO\\PORN3_4.WAV",
+	"AUDIO\\PSYCH_1.WAV",
+	"AUDIO\\PSYCH_2.WAV",
+	"AUDIO\\ROK2_01.WAV",
+	"AUDIO\\ROK3_1.WAV",
+	"AUDIO\\ROK3_2.WAV",
+	"AUDIO\\ROK3_3.WAV",
+	"AUDIO\\ROK3_4.WAV",
+	"AUDIO\\ROK3_5.WAV",
+	"AUDIO\\ROK3_6.WAV",
+	"AUDIO\\ROK3_7.WAV",
+	"AUDIO\\ROK3_8.WAV",
+	"AUDIO\\ROK3_9.WAV",
+	"AUDIO\\ROK3_10.WAV",
+	"AUDIO\\ROK3_11.WAV",
+	"AUDIO\\ROK3_12.WAV",
+	"AUDIO\\ROK3_13.WAV",
+	"AUDIO\\ROK3_14.WAV",
+	"AUDIO\\ROK3_15.WAV",
+	"AUDIO\\ROK3_16.WAV",
+	"AUDIO\\ROK3_17.WAV",
+	"AUDIO\\ROK3_18.WAV",
+	"AUDIO\\ROK3_19.WAV",
+	"AUDIO\\ROK3_20.WAV",
+	"AUDIO\\ROK3_21.WAV",
+	"AUDIO\\ROK3_22.WAV",
+	"AUDIO\\ROK3_23.WAV",
+	"AUDIO\\ROK3_24.WAV",
+	"AUDIO\\ROK3_25.WAV",
+	"AUDIO\\ROK3_26.WAV",
+	"AUDIO\\ROK3_27.WAV",
+	"AUDIO\\ROK3_62.WAV",
+	"AUDIO\\ROK3_63.WAV",
+	"AUDIO\\ROK3_64.WAV",
+	"AUDIO\\ROK3_65.WAV",
+	"AUDIO\\ROK3_66.WAV",
+	"AUDIO\\ROK3_67.WAV",
+	"AUDIO\\ROK3_68.WAV",
+	"AUDIO\\ROK3_69.WAV",
+	"AUDIO\\ROK3_70.WAV",
+	"AUDIO\\ROK3_71.WAV",
+	"AUDIO\\ROK3_73.WAV",
+	"AUDIO\\RESC_1.WAV",
+	"AUDIO\\RESC_2.WAV",
+	"AUDIO\\RESC_3.WAV",
+	"AUDIO\\RESC_4.WAV",
+	"AUDIO\\RESC_5.WAV",
+	"AUDIO\\RESC_6.WAV",
+	"AUDIO\\RESC_7.WAV",
+	"AUDIO\\RESC_8.WAV",
+	"AUDIO\\RESC_9.WAV",
+	"AUDIO\\RESC_10.WAV",
+	"AUDIO\\ROK1_1A.WAV",
+	"AUDIO\\ROK1_1B.WAV",
+	"AUDIO\\ROK1_5.WAV",
+	"AUDIO\\ROK1_6.WAV",
+	"AUDIO\\ROK1_7.WAV",
+	"AUDIO\\ROK1_8.WAV",
+	"AUDIO\\ROK1_9.WAV",
+	"AUDIO\\TAX1_1.WAV",
+	"AUDIO\\TAX1_2.WAV",
+	"AUDIO\\TAX1_3.WAV",
+	"AUDIO\\TAX1_4.WAV",
+	"AUDIO\\TAX1_5.WAV",
+	"AUDIO\\TAX2_1.WAV",
+	"AUDIO\\TAX2_2.WAV",
+	"AUDIO\\TAX2_3.WAV",
+	"AUDIO\\TAX2_4.WAV",
+	"AUDIO\\TAX2_5.WAV",
+	"AUDIO\\TAX2_6.WAV",
+	"AUDIO\\TAX2_7.WAV",
+	"AUDIO\\TAX3_1.WAV",
+	"AUDIO\\TAX3_2.WAV",
+	"AUDIO\\TAX3_3.WAV",
+	"AUDIO\\TAX3_4.WAV",
+	"AUDIO\\TAX3_5.WAV",
+	"AUDIO\\TEX1_1.WAV",
+	"AUDIO\\TEX1_2.WAV",
+	"AUDIO\\TEX1_3.WAV",
+	"AUDIO\\TEX1_4.WAV",
+	"AUDIO\\TEX1_5.WAV",
+	"AUDIO\\TEX1_6.WAV",
+	"AUDIO\\TEX2_1.WAV",
+	"AUDIO\\TEX3_1.WAV",
+	"AUDIO\\TEX3_2.WAV",
+	"AUDIO\\TEX3_3.WAV",
+	"AUDIO\\TEX3_4.WAV",
+	"AUDIO\\TEX3_5.WAV",
+	"AUDIO\\TEX3_6.WAV",
+	"AUDIO\\TEX3_7.WAV",
+	"AUDIO\\TEX3_8.WAV",
+	"AUDIO\\HAT_1A.WAV",
+	"AUDIO\\INTRO1.WAV",
+	"AUDIO\\INTRO2.WAV",
+	"AUDIO\\INTRO3.WAV",
+	"AUDIO\\INTRO4.WAV",
+	"AUDIO\\MOB_01A.WAV",
+	"AUDIO\\MOB_01B.WAV",
+	"AUDIO\\MOB_01C.WAV",
+	"AUDIO\\MOB_02A.WAV",
+	"AUDIO\\MOB_02B.WAV",
+	"AUDIO\\MOB_02C.WAV",
+	"AUDIO\\MOB_03A.WAV",
+	"AUDIO\\MOB_03B.WAV",
+	"AUDIO\\MOB_03C.WAV",
+	"AUDIO\\MOB_03D.WAV",
+	"AUDIO\\MOB_03E.WAV",
+	"AUDIO\\SHARK_1.WAV",
+	"AUDIO\\SHARK_2.WAV",
+	"AUDIO\\SHARK_3.WAV",
+	"AUDIO\\SHARK_4.WAV",
+	"AUDIO\\SHARK_5.WAV",
+	"AUDIO\\MOB_04A.WAV",
+	"AUDIO\\MOB_04B.WAV",
+	"AUDIO\\MOB_04C.WAV",
+	"AUDIO\\MOB_04D.WAV",
+	"AUDIO\\MOB_05A.WAV",
+	"AUDIO\\MOB_05B.WAV",
+	"AUDIO\\MOB_05C.WAV",
+	"AUDIO\\MOB_05D.WAV",
+	"AUDIO\\MOB_06A.WAV",
+	"AUDIO\\MOB_06B.WAV",
+	"AUDIO\\MOB_06C.WAV",
+	"AUDIO\\MOB_07A.WAV",
+	"AUDIO\\MOB_07B.WAV",
+	"AUDIO\\MOB_08A.WAV",
+	"AUDIO\\MOB_08B.WAV",
+	"AUDIO\\MOB_08C.WAV",
+	"AUDIO\\MOB_08D.WAV",
+	"AUDIO\\MOB_08E.WAV",
+	"AUDIO\\MOB_08F.WAV",
+	"AUDIO\\MOB_08G.WAV",
+	"AUDIO\\MOB_09A.WAV",
+	"AUDIO\\MOB_09B.WAV",
+	"AUDIO\\MOB_09C.WAV",
+	"AUDIO\\MOB_09D.WAV",
+	"AUDIO\\MOB_09E.WAV",
+	"AUDIO\\MOB_09F.WAV",
+	"AUDIO\\MOB_10A.WAV",
+	"AUDIO\\MOB_10B.WAV",
+	"AUDIO\\MOB_10C.WAV",
+	"AUDIO\\MOB_10D.WAV",
+	"AUDIO\\MOB_10E.WAV",
+	"AUDIO\\MOB_11A.WAV",
+	"AUDIO\\MOB_11B.WAV",
+	"AUDIO\\MOB_11C.WAV",
+	"AUDIO\\MOB_11D.WAV",
+	"AUDIO\\MOB_11E.WAV",
+	"AUDIO\\MOB_11F.WAV",
+	"AUDIO\\MOB_14A.WAV",
+	"AUDIO\\MOB_14B.WAV",
+	"AUDIO\\MOB_14C.WAV",
+	"AUDIO\\MOB_14D.WAV",
+	"AUDIO\\MOB_14E.WAV",
+	"AUDIO\\MOB_14F.WAV",
+	"AUDIO\\MOB_14G.WAV",
+	"AUDIO\\MOB_14H.WAV",
+	"AUDIO\\MOB_16A.WAV",
+	"AUDIO\\MOB_16B.WAV",
+	"AUDIO\\MOB_16C.WAV",
+	"AUDIO\\MOB_16D.WAV",
+	"AUDIO\\MOB_16E.WAV",
+	"AUDIO\\MOB_16F.WAV",
+	"AUDIO\\MOB_16G.WAV",
+	"AUDIO\\MOB_17A.WAV",
+	"AUDIO\\MOB_17B.WAV",
+	"AUDIO\\MOB_17C.WAV",
+	"AUDIO\\MOB_17D.WAV",
+	"AUDIO\\MOB_17E.WAV",
+	"AUDIO\\MOB_17G.WAV",
+	"AUDIO\\MOB_17H.WAV",
+	"AUDIO\\MOB_17I.WAV",
+	"AUDIO\\MOB_17J.WAV",
+	"AUDIO\\MOB_17K.WAV",
+	"AUDIO\\MOB_17L.WAV",
+	"AUDIO\\MOB_18A.WAV",
+	"AUDIO\\MOB_18B.WAV",
+	"AUDIO\\MOB_18C.WAV",
+	"AUDIO\\MOB_18D.WAV",
+	"AUDIO\\MOB_18E.WAV",
+	"AUDIO\\MOB_18F.WAV",
+	"AUDIO\\MOB_18G.WAV",
+	"AUDIO\\MOB_20A.WAV",
+	"AUDIO\\MOB_20B.WAV",
+	"AUDIO\\MOB_20C.WAV",
+	"AUDIO\\MOB_20D.WAV",
+	"AUDIO\\MOB_20E.WAV",
+	"AUDIO\\MOB_24A.WAV",
+	"AUDIO\\MOB_24B.WAV",
+	"AUDIO\\MOB_24C.WAV",
+	"AUDIO\\MOB_24D.WAV",
+	"AUDIO\\MOB_24E.WAV",
+	"AUDIO\\MOB_24F.WAV",
+	"AUDIO\\MOB_24G.WAV",
+	"AUDIO\\MOB_24H.WAV",
+	"AUDIO\\MOB_25A.WAV",
+	"AUDIO\\MOB_25B.WAV",
+	"AUDIO\\MOB_25C.WAV",
+	"AUDIO\\MOB_25D.WAV",
+	"AUDIO\\MOB_26A.WAV",
+	"AUDIO\\MOB_26B.WAV",
+	"AUDIO\\MOB_26C.WAV",
+	"AUDIO\\MOB_26D.WAV",
+	"AUDIO\\MOB_26E.WAV",
+	"AUDIO\\MOB_29A.WAV",
+	"AUDIO\\MOB_29B.WAV",
+	"AUDIO\\MOB_29C.WAV",
+	"AUDIO\\MOB_29D.WAV",
+	"AUDIO\\MOB_29E.WAV",
+	"AUDIO\\MOB_29F.WAV",
+	"AUDIO\\MOB_29G.WAV",
+	"AUDIO\\MOB_30A.WAV",
+	"AUDIO\\MOB_30B.WAV",
+	"AUDIO\\MOB_30C.WAV",
+	"AUDIO\\MOB_30D.WAV",
+	"AUDIO\\MOB_30E.WAV",
+	"AUDIO\\MOB_30F.WAV",
+	"AUDIO\\MOB_33A.WAV",
+	"AUDIO\\MOB_33B.WAV",
+	"AUDIO\\MOB_33C.WAV",
+	"AUDIO\\MOB_33D.WAV",
+	"AUDIO\\MOB_34A.WAV",
+	"AUDIO\\MOB_34B.WAV",
+	"AUDIO\\MOB_34C.WAV",
+	"AUDIO\\MOB_34D.WAV",
+	"AUDIO\\MOB_35A.WAV",
+	"AUDIO\\MOB_35B.WAV",
+	"AUDIO\\MOB_35C.WAV",
+	"AUDIO\\MOB_35D.WAV",
+	"AUDIO\\MOB_36A.WAV",
+	"AUDIO\\MOB_36B.WAV",
+	"AUDIO\\MOB_36C.WAV",
+	"AUDIO\\MOB_40A.WAV",
+	"AUDIO\\MOB_40B.WAV",
+	"AUDIO\\MOB_40C.WAV",
+	"AUDIO\\MOB_40D.WAV",
+	"AUDIO\\MOB_40E.WAV",
+	"AUDIO\\MOB_40F.WAV",
+	"AUDIO\\MOB_40G.WAV",
+	"AUDIO\\MOB_40H.WAV",
+	"AUDIO\\MOB_40I.WAV",
+	"AUDIO\\MOB_41A.WAV",
+	"AUDIO\\MOB_41B.WAV",
+	"AUDIO\\MOB_41C.WAV",
+	"AUDIO\\MOB_41D.WAV",
+	"AUDIO\\MOB_41E.WAV",
+	"AUDIO\\MOB_41F.WAV",
+	"AUDIO\\MOB_41G.WAV",
+	"AUDIO\\MOB_41H.WAV",
+	"AUDIO\\MOB_42A.WAV",
+	"AUDIO\\MOB_42B.WAV",
+	"AUDIO\\MOB_42C.WAV",
+	"AUDIO\\MOB_42D.WAV",
+	"AUDIO\\MOB_42E.WAV",
+	"AUDIO\\MOB_43A.WAV",
+	"AUDIO\\MOB_43B.WAV",
+	"AUDIO\\MOB_43C.WAV",
+	"AUDIO\\MOB_43D.WAV",
+	"AUDIO\\MOB_43E.WAV",
+	"AUDIO\\MOB_43F.WAV",
+	"AUDIO\\MOB_43G.WAV",
+	"AUDIO\\MOB_43H.WAV",
+	"AUDIO\\MOB_45A.WAV",
+	"AUDIO\\MOB_45B.WAV",
+	"AUDIO\\MOB_45C.WAV",
+	"AUDIO\\MOB_45D.WAV",
+	"AUDIO\\MOB_45E.WAV",
+	"AUDIO\\MOB_45F.WAV",
+	"AUDIO\\MOB_45G.WAV",
+	"AUDIO\\MOB_45H.WAV",
+	"AUDIO\\MOB_45I.WAV",
+	"AUDIO\\MOB_45J.WAV",
+	"AUDIO\\MOB_45K.WAV",
+	"AUDIO\\MOB_45L.WAV",
+	"AUDIO\\MOB_45M.WAV",
+	"AUDIO\\MOB_45N.WAV",
+	"AUDIO\\MOB_46A.WAV",
+	"AUDIO\\MOB_46B.WAV",
+	"AUDIO\\MOB_46C.WAV",
+	"AUDIO\\MOB_46D.WAV",
+	"AUDIO\\MOB_46E.WAV",
+	"AUDIO\\MOB_46F.WAV",
+	"AUDIO\\MOB_46G.WAV",
+	"AUDIO\\MOB_46H.WAV",
+	"AUDIO\\MOB_47A.WAV",
+	"AUDIO\\MOB_52A.WAV",
+	"AUDIO\\MOB_52B.WAV",
+	"AUDIO\\MOB_52C.WAV",
+	"AUDIO\\MOB_52D.WAV",
+	"AUDIO\\MOB_52E.WAV",
+	"AUDIO\\MOB_52F.WAV",
+	"AUDIO\\MOB_52G.WAV",
+	"AUDIO\\MOB_52H.WAV",
+	"AUDIO\\MOB_54A.WAV",
+	"AUDIO\\MOB_54B.WAV",
+	"AUDIO\\MOB_54C.WAV",
+	"AUDIO\\MOB_54D.WAV",
+	"AUDIO\\MOB_54E.WAV",
+	"AUDIO\\MOB_55A.WAV",
+	"AUDIO\\MOB_55B.WAV",
+	"AUDIO\\MOB_55C.WAV",
+	"AUDIO\\MOB_55D.WAV",
+	"AUDIO\\MOB_55E.WAV",
+	"AUDIO\\MOB_55F.WAV",
+	"AUDIO\\MOB_56A.WAV",
+	"AUDIO\\MOB_56B.WAV",
+	"AUDIO\\MOB_56C.WAV",
+	"AUDIO\\MOB_56D.WAV",
+	"AUDIO\\MOB_56E.WAV",
+	"AUDIO\\MOB_56F.WAV",
+	"AUDIO\\MOB_57A.WAV",
+	"AUDIO\\MOB_57B.WAV",
+	"AUDIO\\MOB_57C.WAV",
+	"AUDIO\\MOB_57D.WAV",
+	"AUDIO\\MOB_57E.WAV",
+	"AUDIO\\MOB_58A.WAV",
+	"AUDIO\\MOB_58B.WAV",
+	"AUDIO\\MOB_58C.WAV",
+	"AUDIO\\MOB_58D.WAV",
+	"AUDIO\\MOB_58E.WAV",
+	"AUDIO\\MOB_58F.WAV",
+	"AUDIO\\MOB_58G.WAV",
+	"AUDIO\\MOB_61A.WAV",
+	"AUDIO\\MOB_61B.WAV",
+	"AUDIO\\MOB_62A.WAV",
+	"AUDIO\\MOB_62B.WAV",
+	"AUDIO\\MOB_62C.WAV",
+	"AUDIO\\MOB_62D.WAV",
+	"AUDIO\\MOB_63A.WAV",
+	"AUDIO\\MOB_63B.WAV",
+	"AUDIO\\MOB_63C.WAV",
+	"AUDIO\\MOB_63D.WAV",
+	"AUDIO\\MOB_63E.WAV",
+	"AUDIO\\MOB_63F.WAV",
+	"AUDIO\\MOB_63G.WAV",
+	"AUDIO\\MOB_63H.WAV",
+	"AUDIO\\MOB_63I.WAV",
+	"AUDIO\\MOB_63J.WAV",
+	"AUDIO\\MOB_66A.WAV",
+	"AUDIO\\MOB_66B.WAV",
+	"AUDIO\\MOB_68A.WAV",
+	"AUDIO\\MOB_68B.WAV",
+	"AUDIO\\MOB_68C.WAV",
+	"AUDIO\\MOB_68D.WAV",
+	"AUDIO\\MOB_70A.WAV",
+	"AUDIO\\MOB_70B.WAV",
+	"AUDIO\\MOB_71A.WAV",
+	"AUDIO\\MOB_71B.WAV",
+	"AUDIO\\MOB_71C.WAV",
+	"AUDIO\\MOB_71D.WAV",
+	"AUDIO\\MOB_71E.WAV",
+	"AUDIO\\MOB_71F.WAV",
+	"AUDIO\\MOB_71G.WAV",
+	"AUDIO\\MOB_71H.WAV",
+	"AUDIO\\MOB_71I.WAV",
+	"AUDIO\\MOB_71J.WAV",
+	"AUDIO\\MOB_71K.WAV",
+	"AUDIO\\MOB_71L.WAV",
+	"AUDIO\\MOB_71M.WAV",
+	"AUDIO\\MOB_71N.WAV",
+	"AUDIO\\MOB_72A.WAV",
+	"AUDIO\\MOB_72B.WAV",
+	"AUDIO\\MOB_72C.WAV",
+	"AUDIO\\MOB_72D.WAV",
+	"AUDIO\\MOB_72E.WAV",
+	"AUDIO\\MOB_72F.WAV",
+	"AUDIO\\MOB_72G.WAV",
+	"AUDIO\\MOB_73A.WAV",
+	"AUDIO\\MOB_73C.WAV",
+	"AUDIO\\MOB_73D.WAV",
+	"AUDIO\\MOB_73F.WAV",
+	"AUDIO\\MOB_73G.WAV",
+	"AUDIO\\MOB_73I.WAV",
+	"AUDIO\\MOB_95A.WAV",
+	"AUDIO\\MOB_96A.WAV",
+	"AUDIO\\MOB_98A.WAV",
+	"AUDIO\\MOB_99A.WAV",
+	"AUDIO\\JOB1_1B.WAV",
+	"AUDIO\\JOB1_1C.WAV",
+	"AUDIO\\JOB1_1D.WAV",
+	"AUDIO\\JOB2_1B.WAV",
+	"AUDIO\\JOB2_2.WAV",
+	"AUDIO\\JOB2_3.WAV",
+	"AUDIO\\JOB2_4.WAV",
+	"AUDIO\\JOB2_5.WAV",
+	"AUDIO\\JOB2_6.WAV",
+	"AUDIO\\JOB2_7.WAV",
+	"AUDIO\\JOB2_8.WAV",
+	"AUDIO\\JOB2_9.WAV",
+	"AUDIO\\JOB3_1.WAV",
+	"AUDIO\\JOB3_2.WAV",
+	"AUDIO\\JOB3_3.WAV",
+	"AUDIO\\JOB4_1.WAV",
+	"AUDIO\\JOB4_2.WAV",
+	"AUDIO\\JOB4_3.WAV",
+	"AUDIO\\JOB5_1.WAV",
+	"AUDIO\\JOB5_2.WAV",
+	"AUDIO\\JOB5_3.WAV",
+	"AUDIO\\BJM1_20.WAV",
+	"AUDIO\\BJM1_4.WAV",
+	"AUDIO\\BJM1_5.WAV",
+	"AUDIO\\MERC_39.WAV",
+	"AUDIO\\MONO_1.WAV",
+	"AUDIO\\MONO_2.WAV",
+	"AUDIO\\MONO_3.WAV",
+	"AUDIO\\MONO_4.WAV",
+	"AUDIO\\MONO_5.WAV",
+	"AUDIO\\MONO_6.WAV",
+	"AUDIO\\MONO_7.WAV",
+	"AUDIO\\MONO_8.WAV",
+	"AUDIO\\MONO_9.WAV",
+	"AUDIO\\MONO10.WAV",
+	"AUDIO\\MONO11.WAV",
+	"AUDIO\\MONO12.WAV",
+	"AUDIO\\MONO13.WAV",
+	"AUDIO\\MONO14.WAV",
+	"AUDIO\\MONO15.WAV",
+	"AUDIO\\MONO16.WAV",
+	"AUDIO\\FUD_01.WAV",
+	"AUDIO\\FUD_02.WAV",
+	"AUDIO\\FUD_03.WAV",
+	"AUDIO\\FUD_04.WAV",
+	"AUDIO\\FUD_05.WAV",
+	"AUDIO\\FUD_06.WAV",
+	"AUDIO\\FUD_07.WAV",
+	"AUDIO\\FUD_08.WAV",
+	"AUDIO\\FUD_09.WAV",
+	"AUDIO\\FUD_10.WAV",
+	"AUDIO\\FUD_11.WAV",
+	"AUDIO\\FUD_12.WAV",
+	"AUDIO\\FUD_13.WAV",
+	"AUDIO\\FUD_14.WAV",
+	"AUDIO\\FUD_15.WAV",
+	"AUDIO\\FUD_16.WAV",
+	"AUDIO\\FUD_17.WAV",
+	"AUDIO\\FUD_18.WAV",
+	"AUDIO\\FUD_19.WAV",
+	"AUDIO\\FUD_20.WAV",
+	"AUDIO\\BURG_01.WAV",
+	"AUDIO\\BURG_02.WAV",
+	"AUDIO\\BURG_03.WAV",
+	"AUDIO\\BURG_04.WAV",
+	"AUDIO\\BURG_05.WAV",
+	"AUDIO\\BURG_06.WAV",
+	"AUDIO\\BURG_07.WAV",
+	"AUDIO\\BURG_08.WAV",
+	"AUDIO\\BURG_09.WAV",
+	"AUDIO\\BURG_10.WAV",
+	"AUDIO\\BURG_11.WAV",
+	"AUDIO\\BURG_12.WAV",
+	"AUDIO\\CRUST01.WAV",
+	"AUDIO\\CRUST02.WAV",
+	"AUDIO\\CRUST03.WAV",
+	"AUDIO\\CRUST04.WAV",
+	"AUDIO\\CRUST05.WAV",
+	"AUDIO\\CRUST06.WAV",
+	"AUDIO\\CRUST07.WAV",
+	"AUDIO\\CRUST08.WAV",
+	"AUDIO\\CRUST09.WAV",
+	"AUDIO\\BAND_01.WAV",
+	"AUDIO\\BAND_02.WAV",
+	"AUDIO\\BAND_03.WAV",
+	"AUDIO\\BAND_04.WAV",
+	"AUDIO\\BAND_05.WAV",
+	"AUDIO\\BAND_06.WAV",
+	"AUDIO\\BAND_07.WAV",
+	"AUDIO\\BAND_08.WAV",
+	"AUDIO\\SHAFT01.WAV",
+	"AUDIO\\SHAFT02.WAV",
+	"AUDIO\\SHAFT03.WAV",
+	"AUDIO\\SHAFT04.WAV",
+	"AUDIO\\SHAFT05.WAV",
+	"AUDIO\\SHAFT06.WAV",
+	"AUDIO\\SHAFT07.WAV",
+	"AUDIO\\SHAFT08.WAV",
+	"AUDIO\\PISS_01.WAV",
+	"AUDIO\\PISS_02.WAV",
+	"AUDIO\\PISS_03.WAV",
+	"AUDIO\\PISS_04.WAV",
+	"AUDIO\\PISS_05.WAV",
+	"AUDIO\\PISS_06.WAV",
+	"AUDIO\\PISS_07.WAV",
+	"AUDIO\\PISS_08.WAV",
+	"AUDIO\\PISS_09.WAV",
+	"AUDIO\\PISS_10.WAV",
+	"AUDIO\\PISS_11.WAV",
+	"AUDIO\\PISS_12.WAV",
+	"AUDIO\\PISS_13.WAV",
+	"AUDIO\\PISS_14.WAV",
+	"AUDIO\\PISS_15.WAV",
+	"AUDIO\\PISS_16.WAV",
+	"AUDIO\\PISS_17.WAV",
+	"AUDIO\\PISS_18.WAV",
+	"AUDIO\\PISS_19.WAV",
+	"AUDIO\\GIMME01.WAV",
+	"AUDIO\\GIMME02.WAV",
+	"AUDIO\\GIMME03.WAV",
+	"AUDIO\\GIMME04.WAV",
+	"AUDIO\\GIMME05.WAV",
+	"AUDIO\\GIMME06.WAV",
+	"AUDIO\\GIMME07.WAV",
+	"AUDIO\\GIMME08.WAV",
+	"AUDIO\\GIMME09.WAV",
+	"AUDIO\\GIMME10.WAV",
+	"AUDIO\\GIMME11.WAV",
+	"AUDIO\\GIMME12.WAV",
+	"AUDIO\\GIMME13.WAV",
+	"AUDIO\\GIMME14.WAV",
+	"AUDIO\\GIMME15.WAV",
+	"AUDIO\\BUST_01.WAV",
+	"AUDIO\\BUST_02.WAV",
+	"AUDIO\\BUST_03.WAV",
+	"AUDIO\\BUST_04.WAV",
+	"AUDIO\\BUST_05.WAV",
+	"AUDIO\\BUST_06.WAV",
+	"AUDIO\\BUST_07.WAV",
+	"AUDIO\\BUST_08.WAV",
+	"AUDIO\\BUST_09.WAV",
+	"AUDIO\\BUST_10.WAV",
+	"AUDIO\\BUST_11.WAV",
+	"AUDIO\\BUST_12.WAV",
+	"AUDIO\\BUST_13.WAV",
+	"AUDIO\\BUST_14.WAV",
+	"AUDIO\\BUST_15.WAV",
+	"AUDIO\\BUST_16.WAV",
+	"AUDIO\\BUST_17.WAV",
+	"AUDIO\\BUST_18.WAV",
+	"AUDIO\\BUST_19.WAV",
+	"AUDIO\\BUST_20.WAV",
+	"AUDIO\\BUST_21.WAV",
+	"AUDIO\\BUST_22.WAV",
+	"AUDIO\\BUST_23.WAV",
+	"AUDIO\\BUST_24.WAV",
+	"AUDIO\\BUST_25.WAV",
+	"AUDIO\\BUST_26.WAV",
+	"AUDIO\\BUST_27.WAV",
+	"AUDIO\\BUST_28.WAV",
 };
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index d625ac35..5893ea64 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -264,10 +264,63 @@ set_new_provider(S32 index)
 	return false;
 }
 
+U32 RadioHandlers[9];
+
+U32 WINAPI vfs_open_callback(char const* Filename, U32* FileHandle)
+{
+	*FileHandle = (U32)fopen(Filename, "rb");
+
+	// couldn't they just use stricmp once? and strlen? this is very inefficient
+	if ((strcmp(Filename + strlen(Filename) - 4, ".adf") == 0) || (strcmp(Filename + strlen(Filename) - 4, ".ADF") == 0)) {
+		for (int i = 0; i < ARRAY_SIZE(RadioHandlers); i++) {
+			if (RadioHandlers[i] == NULL) {
+				RadioHandlers[i] = *FileHandle;
+				break;
+			}
+		}
+		strcpy((char*)Filename + strlen(Filename) - 4, ".mp3");
+	}
+	return *FileHandle;
+}
+
+void WINAPI vfs_close_callback(U32 FileHandle)
+{
+	for (int i = 0; i < ARRAY_SIZE(RadioHandlers); i++) {
+		if (RadioHandlers[i] == FileHandle) {
+			RadioHandlers[i] = NULL;
+			break;
+		}
+	}
+	fclose((FILE*)FileHandle);
+}
+
+S32 WINAPI vfs_seek_callback(U32 FileHandle, S32 Offset, U32 Type)
+{
+	fseek((FILE*)FileHandle, Offset, Type);
+	return ftell((FILE*)FileHandle);
+}
+
+U32 WINAPI vfs_read_callback(U32 FileHandle, void* Buffer, U32 Bytes)
+{
+	fread(Buffer, Bytes, 1, (FILE*)FileHandle);
+	uint8* _Buffer = (uint8*)Buffer;
+
+	for (int i = 0; i < ARRAY_SIZE(RadioHandlers); i++) {
+		if (FileHandle == RadioHandlers[i]) {
+			for (U32 k = 0; k < Bytes; k++)
+				_Buffer[k] ^= 0x22;
+			break;
+		}
+	}
+	return Bytes;
+}
+
 cSampleManager::cSampleManager(void) : 
 	m_nNumberOfProviders(0)
 {
 	;
+
+	AIL_set_file_callbacks(vfs_open_callback, vfs_close_callback, vfs_seek_callback, vfs_read_callback);
 }
 
 cSampleManager::~cSampleManager(void)
@@ -1500,7 +1553,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 			
 			case MUSICMODE_FRONTEND:
 			{
-				if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_GAME_COMPLETED )
+				if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_CUTSCENE_FINALE )
 					return false;
 
 				break;
@@ -1739,8 +1792,7 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
 	
 	// increase the volume for JB.MP3 and S4_BDBD.MP3
 	if (   MusicManager.GetMusicMode()    == MUSICMODE_CUTSCENE
-		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
-		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
+		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE )
 	{
 		nChannelVolume[nChannel] >>= 2;
 	}
@@ -1778,8 +1830,7 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
 			
 			// increase the volume for JB.MP3 and S4_BDBD.MP3
 			if (   MusicManager.GetMusicMode()    == MUSICMODE_CUTSCENE
-				&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
-				&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
+				&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE )
 			{
 				nChannelVolume[nChannel] >>= 2;
 			}
@@ -1979,7 +2030,7 @@ cSampleManager::StopChannel(uint32 nChannel)
 }
 
 void
-cSampleManager::PreloadStreamedFile(uint8 nFile, uint8 nStream)
+cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 {
 	if ( m_bInitialised  )
 	{
@@ -2030,7 +2081,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 }
 
 bool
-cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
+cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {
 	uint32 position = nPos;
 	char filename[MAX_PATH];
@@ -2236,7 +2287,12 @@ cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffect
 		if ( mp3Stream[nStream] )
 		{
 			if ( nEffectFlag )
-				AIL_set_stream_volume(mp3Stream[nStream], m_nEffectsFadeVolume*vol*m_nEffectsVolume >> 14);
+			{
+				if ( nStream == 1 ) // TODO(MIAMI): || nStream == 2 when we have second mission channel?
+					AIL_set_stream_volume(mp3Stream[nStream], 128*vol*m_nEffectsVolume >> 14);
+				else
+					AIL_set_stream_volume(mp3Stream[nStream], m_nEffectsFadeVolume*vol*m_nEffectsVolume >> 14);
+			}
 			else
 				AIL_set_stream_volume(mp3Stream[nStream], m_nMusicFadeVolume*vol*m_nMusicVolume >> 14);
 			
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index 6ec8a521..3638e6fb 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -297,7 +297,7 @@ cSampleManager::StopChannel(uint32 nChannel)
 }
 
 void
-cSampleManager::PreloadStreamedFile(uint8 nFile, uint8 nStream)
+cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 {
 	ASSERT( nStream < MAX_STREAMS );
 }
@@ -315,7 +315,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 }
 
 bool
-cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
+cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {	
 	ASSERT( nStream < MAX_STREAMS );
 	
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 1952f370..de55c2ed 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -833,7 +833,7 @@ cSampleManager::LoadPedComment(uint32 nComment)
 			
 			case MUSICMODE_FRONTEND:
 			{
-				if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_GAME_COMPLETED )
+				if ( MusicManager.GetCurrentTrack() == STREAMED_SOUND_CUTSCENE_FINALE)
 					return false;
 
 				break;
@@ -1057,10 +1057,8 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
 	
 	nChannelVolume[nChannel] = vol;
 	
-	// reduce channel volume when JB.MP3 or S4_BDBD.MP3 playing
 	if (   MusicManager.GetMusicMode()    == MUSICMODE_CUTSCENE
-		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
-		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
+		&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE )
 	{
 		nChannelVolume[nChannel] = vol / 4;
 	}
@@ -1099,10 +1097,8 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
 		
 		nChannelVolume[nChannel] = vol;
 		
-		// reduce the volume for JB.MP3 and S4_BDBD.MP3
 		if (   MusicManager.GetMusicMode()    == MUSICMODE_CUTSCENE
-			&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
-			&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
+			&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_FINALE )
 		{
 			nChannelVolume[nChannel] = vol / 4;
 		}
@@ -1172,7 +1168,7 @@ cSampleManager::StopChannel(uint32 nChannel)
 }
 
 void
-cSampleManager::PreloadStreamedFile(uint8 nFile, uint8 nStream)
+cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream)
 {
 	char filename[256];
 	
@@ -1230,7 +1226,7 @@ cSampleManager::StartPreloadedStreamedFile(uint8 nStream)
 }
 
 bool
-cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
+cSampleManager::StartStreamedFile(uint32 nFile, uint32 nPos, uint8 nStream)
 {
 	char filename[256];
 	
@@ -1321,8 +1317,12 @@ cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffect
 	
 	if ( stream )
 	{
-		if ( nEffectFlag )
-			stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14);
+		if ( nEffectFlag ) {
+			if ( nStream == 1 ) // TODO(MIAMI): || nStream == 2 when we have second mission channel?
+				stream->SetVolume(128*nVolume*m_nEffectsVolume >> 14);
+			else
+				stream->SetVolume(m_nEffectsFadeVolume*nVolume*m_nEffectsVolume >> 14);
+		}
 		else
 			stream->SetVolume(m_nMusicFadeVolume*nVolume*m_nMusicVolume >> 14);
 		
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index c88229a2..2485aa65 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -16,8 +16,10 @@ enum eSound : uint16
 	SOUND_CAR_DOOR_OPEN_BACK_RIGHT,
 	SOUND_CAR_WINDSHIELD_CRACK,
 	SOUND_CAR_JUMP,
-	SOUND_E,
-	SOUND_F,
+	SOUND_CAR_JUMP_2,
+	SOUND_CAR_TYRE_POP,
+	SOUND_16,
+	SOUND_17,
 	SOUND_CAR_ENGINE_START,
 	SOUND_CAR_LIGHT_BREAK,
 	SOUND_CAR_HYDRAULIC_1,
@@ -31,6 +33,8 @@ enum eSound : uint16
 	SOUND_CAR_TANK_TURRET_ROTATE,
 	SOUND_CAR_BOMB_TICK,
 	SOUND_PLANE_ON_GROUND,
+	SOUND_31,
+	SOUND_32,
 	SOUND_STEP_START,
 	SOUND_STEP_END,
 	SOUND_FALL_LAND,
@@ -47,13 +51,15 @@ enum eSound : uint16
 	SOUND_FIGHT_PUNCH_FROM_BEHIND_42,
 	SOUND_FIGHT_KNEE_OR_KICK_43,
 	SOUND_FIGHT_KICK_44,
-	SOUND_2D,
+	SOUND_49,
 	SOUND_WEAPON_BAT_ATTACK,
+	SOUND_WEAPON_UNK_MELEE_ATTACK,
+	SOUND_WEAPON_CHAINSAW_ATTACK,
+	SOUND_WEAPON_CHAINSAW_IDLE,
+	SOUND_WEAPON_CHAINSAW_MADECONTACT,
 	SOUND_WEAPON_SHOT_FIRED,
 	SOUND_WEAPON_RELOAD,
 	SOUND_WEAPON_AK47_BULLET_ECHO,
-	SOUND_WEAPON_UZI_BULLET_ECHO,
-	SOUND_WEAPON_M16_BULLET_ECHO,
 	SOUND_WEAPON_FLAMETHROWER_FIRE,
 	SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM,
 	SOUND_WEAPON_ROCKET_SHOT_NO_ZOOM,
@@ -66,8 +72,8 @@ enum eSound : uint16
 	SOUND_GARAGE_BOMB1_SET,
 	SOUND_GARAGE_BOMB2_SET,
 	SOUND_GARAGE_BOMB3_SET,
-	SOUND_40,
-	SOUND_41,
+	SOUND_70,
+	SOUND_71,
 	SOUND_GARAGE_VEHICLE_DECLINED,
 	SOUND_GARAGE_VEHICLE_ACCEPTED,
 	SOUND_GARAGE_DOOR_CLOSED,
@@ -76,8 +82,8 @@ enum eSound : uint16
 	SOUND_PICKUP_WEAPON_BOUGHT,
 	SOUND_PICKUP_WEAPON,
 	SOUND_PICKUP_HEALTH,
-	SOUND_PICKUP_ERROR,
-	SOUND_4B,
+	SOUND_80,
+	SOUND_81,
 	SOUND_PICKUP_ADRENALINE,
 	SOUND_PICKUP_ARMOUR,
 	SOUND_PICKUP_BONUS,
@@ -87,7 +93,7 @@ enum eSound : uint16
 	SOUND_PICKUP_PACMAN_PACKAGE,
 	SOUND_PICKUP_FLOAT_PACKAGE,
 	SOUND_BOMB_TIMED_ACTIVATED,
-	SOUND_55,
+	SOUND_91,
 	SOUND_BOMB_ONIGNITION_ACTIVATED,
 	SOUND_BOMB_TICK,
 	SOUND_RAMPAGE_START,
@@ -104,12 +110,16 @@ enum eSound : uint16
 	SOUND_PED_HIT,
 	SOUND_PED_LAND,
 	SOUND_PED_BULLET_HIT,
-	SOUND_PED_BOMBER,
 	SOUND_PED_BURNING,
-	SOUND_PED_ARREST_FBI,
-	SOUND_PED_ARREST_SWAT,
+	SOUND_PED_PLAYER_REACTTOCOP,
 	SOUND_PED_ARREST_COP,
+	SOUND_111,
+	SOUND_PED_COP_HELIPILOTPHRASE,
+	SOUND_PED_PULLOUTWEAPON,
 	SOUND_PED_HELI_PLAYER_FOUND,
+	SOUND_115,
+	SOUND_PED_ON_FIRE,
+	SOUND_PED_AIMING,
 	SOUND_PED_HANDS_UP,
 	SOUND_PED_HANDS_COWER,
 	SOUND_PED_FLEE_SPRINT,
@@ -117,30 +127,40 @@ enum eSound : uint16
 	SOUND_PED_MUGGING,
 	SOUND_PED_CAR_JACKED,
 	SOUND_PED_ROBBED,
+	SOUND_PED_ACCIDENTREACTION1,
+	SOUND_PED_UNK_126,
+	SOUND_PED_PLAYER_AFTERSEX,
+	SOUND_PED_PLAYER_BEFORESEX,
+	SOUND_PED_COP_UNK_129, // also used for medics
+	SOUND_PED_COP_MANYCOPSAROUND, // also used for medics
+	SOUND_PED_GUNAIMEDAT2,
+	SOUND_PED_COP_ALONE, // also used for medics
+	SOUND_PED_GUNAIMEDAT3,
+	SOUND_PED_COP_REACTION,
+	SOUND_PED_COP_LITTLECOPSAROUND, // also used for medics
+	SOUND_PED_PLAYER_FARFROMCOPS, // also used for medics
 	SOUND_PED_TAXI_WAIT,
 	SOUND_PED_ATTACK,
 	SOUND_PED_DEFEND,
-	SOUND_PED_PURSUIT_ARMY,
-	SOUND_PED_PURSUIT_FBI,
-	SOUND_PED_PURSUIT_SWAT,
-	SOUND_PED_PURSUIT_COP,
-	SOUND_PED_HEALING,
-	SOUND_PED_7B,
+	SOUND_140,
 	SOUND_PED_LEAVE_VEHICLE,
 	SOUND_PED_EVADE,
 	SOUND_PED_FLEE_RUN,
 	SOUND_PED_CAR_COLLISION,
+	SOUND_PED_BOAT_COLLISION,
+	SOUND_PED_HORN_ACTIVE,
+	SOUND_PED_147,
 	SOUND_PED_SOLICIT,
+	SOUND_PED_149,
+	SOUND_PED_150,
 	SOUND_PED_EXTINGUISHING_FIRE,
 	SOUND_PED_WAIT_DOUBLEBACK,
+	SOUND_153,
 	SOUND_PED_CHAT_SEXY,
 	SOUND_PED_CHAT_EVENT,
+	SOUND_PED_PED_COLLISION,
 	SOUND_PED_CHAT,
-	SOUND_PED_BODYCAST_HIT,
 	SOUND_PED_TAXI_CALL,
-	SOUND_INJURED_PED_MALE_OUCH,
-	SOUND_INJURED_PED_FEMALE,
-	SOUND_INJURED_PED_MALE_PRISON,
 	SOUND_RACE_START_3,
 	SOUND_RACE_START_2,
 	SOUND_RACE_START_1,
@@ -151,25 +171,43 @@ enum eSound : uint16
 	SOUND_CAR_PED_COLLISION,
 	SOUND_CLOCK_TICK,
 	SOUND_PART_MISSION_COMPLETE,
-	SOUND_FRONTEND_MENU_STARTING,
+	SOUND_FRONTEND_MENU_STARTING, // same with SOUND_HUD_SOUND
+
+	// TODO(Miami): What are 170-175??
+	
+	SOUND_FRONTEND_NO_RADIO = 176, // those 3 are all same sound
+	SOUND_FRONTEND_RADIO_CHANGE,
+	SOUND_FRONTEND_RADIO_CHANGE_2,
+	SOUND_HUD_SOUND,
+	SOUND_180,
+	SOUND_181,
+	SOUND_182,
+	SOUND_LIGHTNING,
+	SOUND_BULLETTRACE_1,
+	SOUND_BULLETTRACE_2,
+	SOUND_186, // makes same sound with 40
+	SOUND_187, // makes same sound with 46
+	SOUND_MELEE_ATTACK_START,
+	SOUND_189,
+	SOUND_WEAPON_MINIGUN_ATTACK,
+	SOUND_WEAPON_MINIGUN_2,
+	SOUND_WEAPON_MINIGUN_3,
+	SOUND_AMMUNATION_IMRAN_ARM_BOMB,
+	SOUND_194,
+
+	// TODO(Miami): They're frontend sounds but names are copy-paste and incorrect
 	SOUND_FRONTEND_MENU_NEW_PAGE,
-	SOUND_FRONTEND_MENU_NAVIGATION,
+	SOUND_FRONTEND_FAIL,
 	SOUND_FRONTEND_MENU_SETTING_CHANGE,
 	SOUND_FRONTEND_MENU_BACK,
-	SOUND_9A,
-	SOUND_9B,
 	SOUND_FRONTEND_AUDIO_TEST,
-	SOUND_FRONTEND_FAIL,
-	SOUND_FRONTEND_NO_RADIO,
-	SOUND_FRONTEND_RADIO_CHANGE,
-	SOUND_HUD,
-	SOUND_AMMUNATION_WELCOME_1,
-	SOUND_AMMUNATION_WELCOME_2,
-	SOUND_AMMUNATION_WELCOME_3,
-	SOUND_LIGHTNING,
-	SOUND_A5,
-	SOUND_TOTAL_SOUNDS,
-	SOUND_NO_SOUND,
+
+	SOUND_INJURED_PED_MALE_OUCH,
+	SOUND_INJURED_PED_FEMALE,
+	SOUND_SET_202,
+	SOUND_SET_203,
+	SOUND_TOTAL_SOUNDS = 204,
+	SOUND_NO_SOUND = 205,
 };
 
 
diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index b1fce95f..da661b8c 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -6,6 +6,7 @@
 #include "Curves.h"
 #include "PathFind.h"
 
+//--MIAMI: done
 void CAutoPilot::ModifySpeed(float speed)
 {
 	m_fMaxTrafficSpeed = Max(0.01f, speed);
@@ -39,6 +40,7 @@ void CAutoPilot::ModifySpeed(float speed)
 #endif
 }
 
+//--MIAMI: done
 void CAutoPilot::RemoveOnePathNode()
 {
 	--m_nPathFindNodesCount;
@@ -47,6 +49,7 @@ void CAutoPilot::RemoveOnePathNode()
 }
 
 #ifdef COMPATIBLE_SAVES
+//--MIAMI: TODO
 void CAutoPilot::Save(uint8*& buf)
 {
 	WriteSaveBuf<int32>(buf, m_nCurrentRouteNode);
@@ -86,6 +89,7 @@ void CAutoPilot::Save(uint8*& buf)
 	SkipSaveBuf(buf, 6);
 }
 
+//--MIAMI: TODO
 void CAutoPilot::Load(uint8*& buf)
 {
 	m_nCurrentRouteNode = ReadSaveBuf<int32>(buf);
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h
index 337a93c1..25feb72d 100644
--- a/src/control/AutoPilot.h
+++ b/src/control/AutoPilot.h
@@ -26,6 +26,13 @@ enum eCarMission : uint8
 	MISSION_BLOCKCAR_FARAWAY,
 	MISSION_BLOCKCAR_CLOSE,
 	MISSION_BLOCKCAR_HANDBRAKESTOP,
+	MISSION_HELI_FLYTOCOORS,
+	MISSION_ATTACKPLAYER,
+	MISSION_PLANE_FLYTOCOORS,
+	MISSION_HELI_LAND,
+	MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1,
+	MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2,
+	MISSION_BLOCKPLAYER_FORWARDANDBACK
 };
 
 enum eCarTempAction : uint8
@@ -75,11 +82,14 @@ public:
 	uint32 m_nTimeTempAction;
 	float m_fMaxTrafficSpeed;
 	uint8 m_nCruiseSpeed;
+	uint8 m_nCruiseSpeedMultiplierType;
+	float m_fCruiseSpeedMultiplier;
 	uint8 m_bSlowedDownBecauseOfCars : 1;
 	uint8 m_bSlowedDownBecauseOfPeds : 1;
 	uint8 m_bStayInCurrentLevel : 1;
 	uint8 m_bStayInFastLane : 1;
 	uint8 m_bIgnorePathfinding : 1;
+	uint8 m_nSwitchDistance;
 	CVector m_vecDestinationCoors;
 	CPathNode *m_aPathFindNodesInfo[NUM_PATH_NODES_IN_AUTOPILOT];
 	int16 m_nPathFindNodesCount;
@@ -109,6 +119,8 @@ public:
 		m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
 		m_nAntiReverseTimer = m_nTimeToStartMission;
 		m_bStayInFastLane = false;
+		m_nCruiseSpeedMultiplierType = 0;
+		m_fCruiseSpeedMultiplier = 1.0f;
 	}
 
 	void ModifySpeed(float);
@@ -118,6 +130,8 @@ public:
 	void Load(uint8*& buf);
 #endif
 
+	float GetCruiseSpeed(void) { return m_nCruiseSpeed * m_fCruiseSpeedMultiplier; }
+
 };
 
 VALIDATE_SIZE(CAutoPilot, 0x70);
diff --git a/src/control/Bridge.cpp b/src/control/Bridge.cpp
index e873062b..1e63cf30 100644
--- a/src/control/Bridge.cpp
+++ b/src/control/Bridge.cpp
@@ -23,6 +23,7 @@ uint32 CBridge::TimeOfBridgeBecomingOperational;
 
 void CBridge::Init()
 {
+#ifdef GTA_BRIDGE
 	FindBridgeEntities();
 	OldLift = -1.0f;
 	if (pLiftPart && pWeight)
@@ -35,10 +36,12 @@ void CBridge::Init()
 
 		ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, true);
 	}
+#endif
 }
 
 void CBridge::Update()
 {
+#ifdef GTA_BRIDGE
 	if (!pLiftPart || !pWeight)
 		return;
 
@@ -113,15 +116,21 @@ void CBridge::Update()
 		ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, true);
 	else if (State == STATE_LIFT_PART_IS_DOWN && OldState == STATE_LIFT_PART_MOVING_DOWN)
 		ThePaths.SetLinksBridgeLights(-330.0, -230.0, -700.0, -588.0, false);
+#endif
 }
 
 bool CBridge::ShouldLightsBeFlashing()
 {
+#ifdef GTA_BRIDGE
 	return State != STATE_LIFT_PART_IS_DOWN;
+#else
+	return false;
+#endif
 }
 
 void CBridge::FindBridgeEntities()
 {
+#ifdef GTA_BRIDGE
 	pWeight   = nil;
 	pLiftRoad = nil;
 	pLiftPart = nil;
@@ -138,12 +147,17 @@ void CBridge::FindBridgeEntities()
 				pWeight = entry;
 		}
 	}
+#endif
 }
 
 bool CBridge::ThisIsABridgeObjectMovingUp(int index)
 {
+#ifdef GTA_BRIDGE
 	if (index != MI_BRIDGEROADSEGMENT && index != MI_BRIDGELIFT)
 		return false;
 
 	return State == STATE_LIFT_PART_ABOUT_TO_MOVE_UP || State == STATE_LIFT_PART_MOVING_UP;
+#else
+	return false;
+#endif
 }
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index b3fc85ae..121518f4 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -13,6 +13,7 @@
 #include "DMAudio.h"
 #include "Fire.h"
 #include "Pools.h"
+#include "Population.h"
 #include "Timer.h"
 #include "TrafficLights.h"
 #include "Vehicle.h"
@@ -21,9 +22,11 @@
 
 #define DISTANCE_TO_SWITCH_DISTANCE_GOTO 20.0f
 
+//--MIAMI: file done
+
 float CCarAI::FindSwitchDistanceClose(CVehicle* pVehicle)
 {
-	return 30.0f;
+	return pVehicle->AutoPilot.m_nSwitchDistance;
 }
 
 float CCarAI::FindSwitchDistanceFarNormalVehicle(CVehicle* pVehicle)
@@ -38,6 +41,19 @@ float CCarAI::FindSwitchDistanceFar(CVehicle* pVehicle)
 	return FindSwitchDistanceFarNormalVehicle(pVehicle);
 }
 
+void CCarAI::BackToCruisingIfNoWantedLevel(CVehicle* pVehicle)
+{
+	if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
+		(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
+		CCarCtrl::JoinCarWithRoadSystem(pVehicle);
+		pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
+		pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
+		pVehicle->m_bSirenOrAlarm = false;
+		if (CCullZones::NoPolice())
+			pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
+	}
+}
+
 void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 {
 	if (pVehicle->bIsLawEnforcer){
@@ -67,15 +83,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				if (pVehicle->UsesSiren(pVehicle->GetModelIndex()))
 					pVehicle->m_bSirenOrAlarm = true;
 			}
-			if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
-				(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
-				CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-				pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-				pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-				pVehicle->m_bSirenOrAlarm = false;
-				if (CCullZones::NoPolice())
-					pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-			}
+			BackToCruisingIfNoWantedLevel(pVehicle);
 			break;
 		case MISSION_RAMPLAYER_CLOSE:
 			if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
@@ -120,18 +128,9 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				pVehicle->m_bSirenOrAlarm = false;
 				pVehicle->m_nCarHornTimer = 0;
 			}
-			if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
-				(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())){
-				CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-				pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-				pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-				pVehicle->m_bSirenOrAlarm = false;
-				if (CCullZones::NoPolice())
-					pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-			}
-
-			else if (pVehicle->bIsLawEnforcer)
+			if (pVehicle->bIsLawEnforcer)
 				MellowOutChaseSpeed(pVehicle);
+			BackToCruisingIfNoWantedLevel(pVehicle);
 			break;
 		case MISSION_BLOCKPLAYER_FARAWAY:
 			if (FindSwitchDistanceClose(pVehicle) > (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
@@ -140,20 +139,12 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				if (pVehicle->UsesSiren(pVehicle->GetModelIndex()))
 					pVehicle->m_bSirenOrAlarm = true;
 			}
-			if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
-				(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
-				CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-				pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-				pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-				pVehicle->m_bSirenOrAlarm = false;
-				if (CCullZones::NoPolice())
-					pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-			}
+			BackToCruisingIfNoWantedLevel(pVehicle);
 			break;
 		case MISSION_BLOCKPLAYER_CLOSE:
 			if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() ||
 				pVehicle->AutoPilot.m_bIgnorePathfinding) {
-				if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f)
+				if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f)
 #ifdef FIX_BUGS
 					pVehicle->m_nTimeBlocked += CTimer::GetTimeStepInMilliseconds();
 #else
@@ -162,7 +153,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				else
 					pVehicle->m_nTimeBlocked = 0;
 				if (!FindPlayerVehicle() || FindPlayerVehicle()->IsUpsideDown() ||
-					FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) {
+					FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) {
 					if (pVehicle->bIsLawEnforcer &&
 						(pVehicle->GetModelIndex() != MI_RHINO || pVehicle->m_randomSeed > 10000) &&
 						(FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() < 10.0f) {
@@ -178,20 +169,12 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				pVehicle->m_bSirenOrAlarm = false;
 				pVehicle->m_nCarHornTimer = 0;
 			}
-			if (FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
-				(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
-				CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-				pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-				pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-				pVehicle->m_bSirenOrAlarm = false;
-				if (CCullZones::NoPolice())
-					pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-			}
 			if (pVehicle->bIsLawEnforcer)
 				MellowOutChaseSpeed(pVehicle);
+			BackToCruisingIfNoWantedLevel(pVehicle);
 			break;
 		case MISSION_GOTOCOORDS:
-			if ((pVehicle->AutoPilot.m_vecDestinationCoors - pVehicle->GetPosition()).Magnitude2D() < DISTANCE_TO_SWITCH_DISTANCE_GOTO ||
+			if ((pVehicle->AutoPilot.m_vecDestinationCoors - pVehicle->GetPosition()).Magnitude2D() < FindSwitchDistanceClose(pVehicle) ||
 			  pVehicle->AutoPilot.m_bIgnorePathfinding)
 				pVehicle->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_STRAIGHT;
 			break;
@@ -203,6 +186,10 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 			if (distance < 5.0f){
 				pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+				if (pVehicle->bParking) {
+					TellOccupantsToLeaveCar(pVehicle);
+					pVehicle->bParking = false;
+				}
 			}
 			else if (distance > FindSwitchDistanceFarNormalVehicle(pVehicle) && !pVehicle->AutoPilot.m_bIgnorePathfinding && (CTimer::GetFrameCounter() & 7) == 0){
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
@@ -259,6 +246,10 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 			if (distance < 1.0f) {
 				pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+				if (pVehicle->bParking) {
+					TellOccupantsToLeaveCar(pVehicle);
+					pVehicle->bParking = false;
+				}
 			}
 			else if (distance > FindSwitchDistanceFarNormalVehicle(pVehicle) && !pVehicle->AutoPilot.m_bIgnorePathfinding && (CTimer::GetFrameCounter() & 7) == 0) {
 				pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
@@ -278,23 +269,10 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 			break;
 		case MISSION_RAMCAR_CLOSE:
 			if (pVehicle->AutoPilot.m_pTargetCar){
-				if
-#ifdef FIX_BUGS
-				    (FindPlayerVehicle() == pVehicle->AutoPilot.m_pTargetCar &&
-#endif
-					(FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone || pVehicle->bIsLawEnforcer &&
-				  (FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice()))
-#ifdef FIX_BUGS
-					)
+#ifdef FIX_BUGS // btw fixed in SA
+				if (FindPlayerVehicle() == pVehicle->AutoPilot.m_pTargetCar)
 #endif
-				{
-					CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-					pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-					pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-					pVehicle->m_bSirenOrAlarm = false;
-					if (CCullZones::NoPolice())
-						pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-				}
+					BackToCruisingIfNoWantedLevel(pVehicle);
 				if ((pVehicle->AutoPilot.m_pTargetCar->GetPosition() - pVehicle->GetPosition()).Magnitude2D() <= FindSwitchDistanceFar(pVehicle) ||
 				  pVehicle->AutoPilot.m_bIgnorePathfinding){
 					if (pVehicle->GetHasCollidedWith(pVehicle->AutoPilot.m_pTargetCar)){
@@ -336,6 +314,41 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 				pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
 			}
 			break;
+		case MISSION_ATTACKPLAYER:
+			if (pVehicle->bIsLawEnforcer)
+				MellowOutChaseSpeedBoat(pVehicle);
+			BackToCruisingIfNoWantedLevel(pVehicle);
+			break;
+		case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1:
+			if (((CVector2D)(pVehicle->AutoPilot.m_vecDestinationCoors) - pVehicle->GetPosition()).Magnitude() < 1.5f)
+				pVehicle->AutoPilot.m_nCarMission = MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2;
+			BackToCruisingIfNoWantedLevel(pVehicle);
+			break;
+		case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2:
+		{
+			float distance = ((CVector2D)FindPlayerCoors() - pVehicle->GetPosition()).Magnitude();
+			if (distance < 13.0f) {
+				TellOccupantsToLeaveCar(pVehicle);
+				pVehicle->AutoPilot.m_nCruiseSpeed = 0;
+				pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
+			}
+			if (distance > 70.0f || FindPlayerPed()->m_pWanted->m_bIgnoredByEveryone ||
+				(FindPlayerPed()->m_pWanted->m_nWantedLevel == 0 || FindPlayerPed()->m_pWanted->m_bIgnoredByCops || CCullZones::NoPolice())) {
+				TellOccupantsToLeaveCar(pVehicle);
+				pVehicle->AutoPilot.m_nCruiseSpeed = 0;
+				pVehicle->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
+			}
+			break;
+		}
+		case MISSION_BLOCKPLAYER_FORWARDANDBACK:
+		{
+			CVector2D diff = (CVector2D)FindPlayerCoors() - pVehicle->GetPosition();
+			float distance = Max(0.001f, diff.Magnitude());
+			if (!FindPlayerVehicle() || DotProduct2D(CVector2D(diff.x / distance, diff.y / distance), FindPlayerSpeed()) > 0.05f)
+				pVehicle->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_CLOSE;
+			BackToCruisingIfNoWantedLevel(pVehicle);
+			break;
+		}
 		default:
 			if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0 && !CCullZones::NoPolice()){
 				if (ABS(FindPlayerCoors().x - pVehicle->GetPosition().x) > 10.0f ||
@@ -343,7 +356,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 					pVehicle->AutoPilot.m_nCruiseSpeed = FindPoliceCarSpeedForWantedLevel(pVehicle);
 					pVehicle->SetStatus(STATUS_PHYSICS);
 					pVehicle->AutoPilot.m_nCarMission = 
-						FindPoliceCarMissionForWantedLevel();
+						pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT ? FindPoliceBoatMissionForWantedLevel() : FindPoliceCarMissionForWantedLevel();
 					pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
 					pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
 				}else if (pVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE){
@@ -364,6 +377,11 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 		pVehicle->AutoPilot.m_nCruiseSpeed = 0;
 		break;
 	}
+	if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel >= 1 && CCullZones::PoliceAbandonCars()) {
+		TellOccupantsToLeaveCar(pVehicle);
+		pVehicle->AutoPilot.m_nCruiseSpeed = 0;
+		pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
+	}
 	float flatSpeed = pVehicle->GetMoveSpeed().MagnitudeSqr2D();
 	if (flatSpeed > SQR(0.018f)){
 		pVehicle->AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
@@ -372,9 +390,12 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 	if (pVehicle->GetStatus() == STATUS_PHYSICS && pVehicle->AutoPilot.m_nTempAction == TEMPACT_NONE){
 		if (pVehicle->AutoPilot.m_nCarMission != MISSION_NONE){
 			if (pVehicle->AutoPilot.m_nCarMission != MISSION_STOP_FOREVER &&
+				pVehicle->AutoPilot.m_nCarMission != MISSION_BLOCKPLAYER_HANDBRAKESTOP &&
 			  pVehicle->AutoPilot.m_nCruiseSpeed != 0 &&
 			  (pVehicle->VehicleCreatedBy != RANDOM_VEHICLE || pVehicle->AutoPilot.m_nCarMission != MISSION_CRUISE)){
 				if (pVehicle->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_STOP_FOR_CARS
+					&& pVehicle->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS ||
+					pVehicle->VehicleCreatedBy == MISSION_VEHICLE
 					) {
 					if (CTimer::GetTimeInMilliseconds() - pVehicle->m_nLastTimeCollided > 500)
 						pVehicle->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
@@ -406,6 +427,13 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 			pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 400;
 		}
 	}
+	if (pVehicle->bIsLawEnforcer) {
+		if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_FARAWAY ||
+			pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE) {
+			if (FindPlayerVehicle() && FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE)
+				pVehicle->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FARAWAY;
+		}
+	}
 	if (pVehicle->GetUp().z < 0.7f){
 		pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
 		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
@@ -446,6 +474,34 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
 		if ((uint8)(pVehicle->m_randomSeed ^ CGeneral::GetRandomNumber()) == 0xAD)
 			pVehicle->m_nCarHornTimer = 45;
 	}
+	float target = 1.0f;
+	if (pVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE)
+		target = CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(pVehicle->AutoPilot.m_nCruiseSpeedMultiplierType);
+	float change = CTimer::GetTimeStep() * 0.01f;
+	if (Abs(pVehicle->AutoPilot.m_fCruiseSpeedMultiplier - target) < change)
+		pVehicle->AutoPilot.m_fCruiseSpeedMultiplier = target;
+	else if (pVehicle->AutoPilot.m_fCruiseSpeedMultiplier > target)
+		pVehicle->AutoPilot.m_fCruiseSpeedMultiplier -= change;
+	else
+		pVehicle->AutoPilot.m_fCruiseSpeedMultiplier += change;
+
+	if (pVehicle->bIsLawEnforcer && FindPlayerPed()->m_pWanted->m_nWantedLevel > 0) {
+		if (!FindPlayerVehicle() ||
+			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR ||
+			FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE) {
+			if (pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT) {
+				pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
+				pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
+			}
+		}
+		else if (FindPlayerVehicle()->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT) {
+			if (pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR ||
+				pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE) {
+				pVehicle->AutoPilot.m_nTempAction = TEMPACT_WAIT;
+				pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 1000;
+			}
+		}
+	}
 }
 
 void CCarAI::CarHasReasonToStop(CVehicle* pVehicle)
@@ -470,6 +526,14 @@ float CCarAI::GetCarToGoToCoors(CVehicle* pVehicle, CVector* pTarget)
 	return (pVehicle->GetPosition() - *pTarget).Magnitude2D();
 }
 
+float CCarAI::GetCarToParkAtCoors(CVehicle* pVehicle, CVector* pTarget)
+{
+	GetCarToGoToCoors(pVehicle, pTarget);
+	pVehicle->bParking = true;
+	pVehicle->AutoPilot.m_nCruiseSpeed = 10;
+	return (pVehicle->GetPosition() - *pTarget).Magnitude2D();
+}
+
 void CCarAI::AddPoliceCarOccupants(CVehicle* pVehicle)
 {
 	if (pVehicle->bOccupantsHaveBeenGenerated)
@@ -489,6 +553,18 @@ void CCarAI::AddPoliceCarOccupants(CVehicle* pVehicle)
 		if (FindPlayerPed()->m_pWanted->m_nWantedLevel > 1)
 			pVehicle->SetupPassenger(0);
 		return;
+	case MI_PREDATOR:
+		pVehicle->SetUpDriver();
+		return;
+	case MI_VICECHEE:
+	{
+		pVehicle->SetUpDriver()->bMiamiViceCop = true;
+		pVehicle->SetupPassenger(0)->bMiamiViceCop = true;
+		CPopulation::NumMiamiViceCops += 2;
+		CCarCtrl::MiamiViceCycle = (CCarCtrl::MiamiViceCycle + 1) % 4;
+		CCarCtrl::LastTimeMiamiViceGenerated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
 	default:
 		return;
 	}
@@ -516,7 +592,26 @@ void CCarAI::TellOccupantsToLeaveCar(CVehicle* pVehicle)
 	int timer = 100;
 	for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++){
 		if (pVehicle->pPassengers[i]) {
+			pVehicle->pPassengers[i]->m_leaveCarTimer = timer;
 			pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
+			timer += CGeneral::GetRandomNumberInRange(200, 400);
+		}
+	}
+}
+
+void CCarAI::TellOccupantsToFleeCar(CVehicle* pVehicle)
+{
+	if (pVehicle->pDriver && !pVehicle->pDriver->IsPlayer()) {
+		pVehicle->pDriver->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
+		if (pVehicle->GetModelIndex() != MI_FIRETRUCK && pVehicle->GetModelIndex() == MI_AMBULAN)
+			pVehicle->pDriver->Say(SOUND_PED_LEAVE_VEHICLE);
+	}
+	int timer = 100;
+	for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++) {
+		if (pVehicle->pPassengers[i]) {
+			pVehicle->pPassengers[i]->m_leaveCarTimer = timer;
+			pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
+			timer += CGeneral::GetRandomNumberInRange(200, 400);
 		}
 	}
 }
@@ -553,6 +648,20 @@ eCarMission CCarAI::FindPoliceCarMissionForWantedLevel()
 	}
 }
 
+eCarMission CCarAI::FindPoliceBoatMissionForWantedLevel()
+{
+	switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
+	case 0:
+	case 1: return MISSION_BLOCKPLAYER_FARAWAY;
+	case 2:
+	case 3:
+	case 4:
+	case 5:
+	case 6: return MISSION_ATTACKPLAYER;
+	default: return MISSION_BLOCKPLAYER_FARAWAY;
+	}
+}
+
 int32 CCarAI::FindPoliceCarSpeedForWantedLevel(CVehicle* pVehicle)
 {
 	switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
@@ -605,6 +714,23 @@ void CCarAI::MellowOutChaseSpeed(CVehicle* pVehicle)
 				pVehicle->AutoPilot.m_nCruiseSpeed = 34;
 		}
 	}
+	if (!FindPlayerVehicle() && FindPlayerPed()->GetMoveSpeed().Magnitude() < 0.07f) {
+		if ((FindPlayerCoors() - pVehicle->GetPosition()).Magnitude() < 30.0f)
+			pVehicle->AutoPilot.m_nCruiseSpeed = Min(10, pVehicle->AutoPilot.m_nCruiseSpeed);
+	}
+}
+
+void CCarAI::MellowOutChaseSpeedBoat(CVehicle* pVehicle)
+{
+	switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel) {
+	case 0: pVehicle->AutoPilot.m_nCruiseSpeed = 8; break;
+	case 1: pVehicle->AutoPilot.m_nCruiseSpeed = 10; break;
+	case 2: pVehicle->AutoPilot.m_nCruiseSpeed = 15; break;
+	case 3: pVehicle->AutoPilot.m_nCruiseSpeed = 20; break;
+	case 4: pVehicle->AutoPilot.m_nCruiseSpeed = 25; break;
+	case 5: pVehicle->AutoPilot.m_nCruiseSpeed = 30; break;
+	case 6: pVehicle->AutoPilot.m_nCruiseSpeed = 40; break;
+	}
 }
 
 void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
@@ -629,6 +755,8 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
 			continue;
 		if (vehicle == pVehicle)
 			continue;
+		if (vehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_AVOID_CARS)
+			return;
 		if (Abs(pVehicle->GetPosition().z - vehicle->GetPosition().z) >= 5.0f)
 			continue;
 		CVector2D distance = vehicle->GetPosition() - pVehicle->GetPosition();
diff --git a/src/control/CarAI.h b/src/control/CarAI.h
index e88807c8..d4af1806 100644
--- a/src/control/CarAI.h
+++ b/src/control/CarAI.h
@@ -10,17 +10,22 @@ public:
 	static float FindSwitchDistanceClose(CVehicle*);
 	static float FindSwitchDistanceFarNormalVehicle(CVehicle*);
 	static float FindSwitchDistanceFar(CVehicle*);
+	static void BackToCruisingIfNoWantedLevel(CVehicle*);
 	static void UpdateCarAI(CVehicle*);
 	static void CarHasReasonToStop(CVehicle*);
 	static float GetCarToGoToCoors(CVehicle*, CVector*);
+	static float GetCarToParkAtCoors(CVehicle*, CVector*);
 	static void AddPoliceCarOccupants(CVehicle*);
 	static void AddAmbulanceOccupants(CVehicle*);
 	static void AddFiretruckOccupants(CVehicle*);
 	static void TellOccupantsToLeaveCar(CVehicle*);
+	static void TellOccupantsToFleeCar(CVehicle*);
 	static void TellCarToRamOtherCar(CVehicle*, CVehicle*);
 	static void TellCarToBlockOtherCar(CVehicle*, CVehicle*);
 	static eCarMission FindPoliceCarMissionForWantedLevel();
+	static eCarMission FindPoliceBoatMissionForWantedLevel();
 	static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*);
 	static void MellowOutChaseSpeed(CVehicle*);
+	static void MellowOutChaseSpeedBoat(CVehicle*);
 	static void MakeWayForCarWithSiren(CVehicle *veh);
 };
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index e8b3bfd9..ae57e030 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -4,6 +4,7 @@
 
 #include "Accident.h"
 #include "Automobile.h"
+#include "Bike.h"
 #include "Camera.h"
 #include "CarAI.h"
 #include "CarGen.h"
@@ -11,6 +12,7 @@
 #include "Curves.h"
 #include "CutsceneMgr.h"
 #include "Gangs.h"
+#include "Game.h"
 #include "Garages.h"
 #include "General.h"
 #include "IniFile.h"
@@ -19,6 +21,7 @@
 #include "Ped.h"
 #include "PlayerInfo.h"
 #include "PlayerPed.h"
+#include "Population.h"
 #include "Wanted.h"
 #include "Pools.h"
 #include "Renderer.h"
@@ -29,43 +32,54 @@
 #include "VisibilityPlugins.h"
 #include "Vehicle.h"
 #include "Fire.h"
+#include "WaterLevel.h"
 #include "World.h"
 #include "Zones.h"
 
-#define DISTANCE_TO_SPAWN_ROADBLOCK_PEDS 51.0f
-#define DISTANCE_TO_SCAN_FOR_DANGER 11.0f
-#define SAFE_DISTANCE_TO_PED 3.0f
-#define INFINITE_Z 1000000000.0f
-
-#define VEHICLE_HEIGHT_DIFF_TO_CONSIDER_WEAVING 4.0f
-#define PED_HEIGHT_DIFF_TO_CONSIDER_WEAVING 4.0f
-#define OBJECT_HEIGHT_DIFF_TO_CONSIDER_WEAVING 8.0f
-#define WIDTH_COEF_TO_WEAVE_SAFELY 1.2f
-#define OBJECT_WIDTH_TO_WEAVE 0.3f
-#define PED_WIDTH_TO_WEAVE 0.8f
-
-#define PATH_DIRECTION_NONE 0
-#define PATH_DIRECTION_STRAIGHT 1
-#define PATH_DIRECTION_RIGHT 2
-#define PATH_DIRECTION_LEFT 4
-
-#define ATTEMPTS_TO_FIND_NEXT_NODE 15
-
-#define DISTANCE_TO_SWITCH_FROM_BLOCK_TO_STOP 5.0f
-#define DISTANCE_TO_SWITCH_FROM_STOP_TO_BLOCK 10.0f
-#define MAX_SPEED_TO_ACCOUNT_IN_INTERCEPTING 0.13f
-#define DISTANCE_TO_NEXT_NODE_TO_CONSIDER_SLOWING_DOWN 40.0f
-#define MAX_ANGLE_TO_STEER_AT_HIGH_SPEED 0.2f
-#define MIN_SPEED_TO_START_LIMITING_STEER 0.45f
-#define DISTANCE_TO_NEXT_NODE_TO_SELECT_NEW 5.0f
-#define DISTANCE_TO_FACING_NEXT_NODE_TO_SELECT_NEW 8.0f
-#define DEFAULT_MAX_STEER_ANGLE 0.5f
-#define MIN_LOWERING_SPEED_COEFFICIENT 0.4f
-#define MAX_ANGLE_FOR_SPEED_LIMITING 1.2f
-#define MIN_ANGLE_FOR_SPEED_LIMITING 0.4f
-#define MIN_ANGLE_FOR_SPEED_LIMITING_BETWEEN_NODES 0.1f
-#define MIN_ANGLE_TO_APPLY_HANDBRAKE 0.7f
-#define MIN_SPEED_TO_APPLY_HANDBRAKE 0.3f
+#define DISTANCE_TO_SPAWN_ROADBLOCK_PEDS (51.0f)
+#define DISTANCE_TO_SCAN_FOR_DANGER (14.0f)
+#define SAFE_DISTANCE_TO_PED (3.0f)
+#define INFINITE_Z (1000000000.0f)
+
+#define VEHICLE_HEIGHT_DIFF_TO_CONSIDER_WEAVING (4.0f)
+#define PED_HEIGHT_DIFF_TO_CONSIDER_WEAVING (4.0f)
+#define OBJECT_HEIGHT_DIFF_TO_CONSIDER_WEAVING (8.0f)
+#define WIDTH_COEF_TO_WEAVE_SAFELY (1.2f)
+#define OBJECT_WIDTH_TO_WEAVE (0.3f)
+#define PED_WIDTH_TO_WEAVE (0.8f)
+
+#define PATH_DIRECTION_NONE (0)
+#define PATH_DIRECTION_STRAIGHT (1)
+#define PATH_DIRECTION_RIGHT (2)
+#define PATH_DIRECTION_LEFT (4)
+
+#define ATTEMPTS_TO_FIND_NEXT_NODE (15)
+
+#define DISTANCE_TO_SWITCH_FROM_BLOCK_TO_STOP (5.0f)
+#define DISTANCE_TO_SWITCH_FROM_STOP_TO_BLOCK (10.0f)
+#define MAX_SPEED_TO_ACCOUNT_IN_INTERCEPTING (0.13f)
+#define DISTANCE_TO_NEXT_NODE_TO_CONSIDER_SLOWING_DOWN (40.0f)
+#define MAX_ANGLE_TO_STEER_AT_HIGH_SPEED (0.2f)
+#define MIN_SPEED_TO_START_LIMITING_STEER (0.45f)
+#define DISTANCE_TO_NEXT_NODE_TO_SELECT_NEW (5.0f)
+#define DISTANCE_TO_FACING_NEXT_NODE_TO_SELECT_NEW (8.0f)
+#define DEFAULT_MAX_STEER_ANGLE (0.5f)
+#define MIN_LOWERING_SPEED_COEFFICIENT (0.4f)
+#define MAX_ANGLE_FOR_SPEED_LIMITING (1.2f)
+#define MIN_ANGLE_FOR_SPEED_LIMITING (0.4f)
+#define MIN_ANGLE_FOR_SPEED_LIMITING_BETWEEN_NODES (0.1f)
+#define MIN_ANGLE_TO_APPLY_HANDBRAKE (0.7f)
+#define MIN_SPEED_TO_APPLY_HANDBRAKE (0.3f)
+
+#define PROBABILITY_OF_DEAD_PED_ACCIDENT (0.005f)
+#define DISTANCE_BETWEEN_CAR_AND_DEAD_PED (6.0f)
+#define PROBABILITY_OF_PASSENGER_IN_VEHICLE (0.125f)
+
+#define ONSCREEN_DESPAWN_RANGE (120.0f)
+#define MINIMAL_DISTANCE_TO_SPAWN_ONSCREEN (100.0f)
+#define REQUEST_ONSCREEN_DISTANCE ((ONSCREEN_DESPAWN_RANGE + MINIMAL_DISTANCE_TO_SPAWN_ONSCREEN) / 2)
+#define OFFSCREEN_DESPAWN_RANGE (40.0f)
+#define EXTENDED_RANGE_DESPAWN_MULTIPLIER (1.5f)
 
 int CCarCtrl::NumLawEnforcerCars;
 int CCarCtrl::NumAmbulancesOnDuty;
@@ -81,23 +95,31 @@ int32 CCarCtrl::MaxNumberOfCarsInUse = 12;
 uint32 CCarCtrl::LastTimeLawEnforcerCreated;
 uint32 CCarCtrl::LastTimeFireTruckCreated;
 uint32 CCarCtrl::LastTimeAmbulanceCreated;
+int32 CCarCtrl::MiamiViceCycle;
+uint32 CCarCtrl::LastTimeMiamiViceGenerated;
 int32 CCarCtrl::TotalNumOfCarsOfRating[TOTAL_CUSTOM_CLASSES];
-int32 CCarCtrl::NextCarOfRating[TOTAL_CUSTOM_CLASSES];
 int32 CCarCtrl::CarArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
+int32 CCarCtrl::NumRequestsOfCarRating[TOTAL_CUSTOM_CLASSES];
+int32 CCarCtrl::NumOfLoadedCarsOfRating[TOTAL_CUSTOM_CLASSES];
+int32 CCarCtrl::CarFreqArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
+int32 CCarCtrl::LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
 CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
 uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP];
 
+//--MIAMI: done except heli/plane functions
+
 void
 CCarCtrl::GenerateRandomCars()
 {
-	if (CCutsceneMgr::IsRunning())
+	if (CCutsceneMgr::IsRunning()) {
+		CountDownToCarsAtStart = 2;
 		return;
+	}
 	if (NumRandomCars < 30){
-		if (CountDownToCarsAtStart == 0){
+		if (CountDownToCarsAtStart == 0)
 			GenerateOneRandomCar();
-		}
 		else if (--CountDownToCarsAtStart == 0) {
-			for (int i = 0; i < 50; i++)
+			for (int i = 0; i < 100; i++)
 				GenerateOneRandomCar();
 			CTheCarGenerators::GenerateEvenIfPlayerIsCloseCounter = 20;
 		}
@@ -111,6 +133,7 @@ void
 CCarCtrl::GenerateOneRandomCar()
 {
 	static int32 unk = 0;
+	bool bTopDownCamera = false;
 	CPlayerInfo* pPlayer = &CWorld::Players[CWorld::PlayerInFocus];
 	CVector vecTargetPos = FindPlayerCentreOfWorld(CWorld::PlayerInFocus);
 	CVector2D vecPlayerSpeed = FindPlayerSpeed();
@@ -125,7 +148,7 @@ CCarCtrl::GenerateOneRandomCar()
 	int carClass;
 	int carModel;
 	if (pWanted->m_nWantedLevel > 1 && NumLawEnforcerCars < pWanted->m_MaximumLawEnforcerVehicles &&
-		pWanted->m_CurrentCops < pWanted->m_MaxCops && (
+		pWanted->m_CurrentCops < pWanted->m_MaxCops && !CGame::IsInInterior() && (
 			pWanted->m_nWantedLevel > 3 ||
 			pWanted->m_nWantedLevel > 2 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 5000 ||
 			pWanted->m_nWantedLevel > 1 && CTimer::GetTimeInMilliseconds() > LastTimeLawEnforcerCreated + 8000)) {
@@ -135,7 +158,7 @@ CCarCtrl::GenerateOneRandomCar()
 		carModel = ChoosePoliceCarModel();
 	}else{
 		carModel = ChooseModel(&zone, &vecTargetPos, &carClass);
-		if (carClass == COPS && pWanted->m_nWantedLevel >= 1)
+		if (carClass == COPS && pWanted->m_nWantedLevel >= 1 || carModel < 0)
 			/* All cop spawns with wanted level are handled by condition above. */
 			/* In particular it means that cop cars never spawn if player has wanted level of 1. */
 			return;
@@ -159,8 +182,9 @@ CCarCtrl::GenerateOneRandomCar()
 		/* Spawn essentially anywhere. */
 		frontX = frontY = 0.707f; /* 45 degrees */
 		angleLimit = -1.0f;
+		bTopDownCamera = true;
 		invertAngleLimitTest = true;
-		preferredDistance = 40.0f;
+		preferredDistance = OFFSCREEN_DESPAWN_RANGE + 15.0f;
 		/* BUG: testForCollision not initialized in original game. */
 		testForCollision = false;
 	}else if (!pPlayerVehicle){
@@ -174,14 +198,14 @@ CCarCtrl::GenerateOneRandomCar()
 			/* Forward to his current direction (camera direction). */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 1:
 			/* Spawn a vehicle close to player to his side. */
 			/* Kinda not within camera angle. */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = false;
-			preferredDistance = 40.0f;
+			preferredDistance = OFFSCREEN_DESPAWN_RANGE;
 			break;
 		}
 	}else if (fPlayerVehicleSpeed > 0.4f){ /* 72 km/h */
@@ -196,21 +220,21 @@ CCarCtrl::GenerateOneRandomCar()
 			/* Spawn a vehicle in a very narrow gap in front of a player */
 			angleLimit = 0.85f; /* approx 30 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 2:
 			/* Spawn a vehicle relatively far away from player. */
 			/* Forward to his current direction (camera direction). */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 3:
 			/* Spawn a vehicle close to player to his side. */
 			/* Kinda not within camera angle. */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = false;
-			preferredDistance = 40.0f;
+			preferredDistance = OFFSCREEN_DESPAWN_RANGE;
 			break;
 		}
 	}else if (fPlayerVehicleSpeed > 0.1f){ /* 18 km/h */
@@ -224,14 +248,14 @@ CCarCtrl::GenerateOneRandomCar()
 			/* Spawn a vehicle in a very narrow gap in front of a player */
 			angleLimit = 0.85f; /* approx 30 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 1:
 			/* Spawn a vehicle relatively far away from player. */
 			/* Forward to his current direction (camera direction). */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 2:
 		case 3:
@@ -239,7 +263,7 @@ CCarCtrl::GenerateOneRandomCar()
 			/* Kinda not within camera angle. */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = false;
-			preferredDistance = 40.0f;
+			preferredDistance = OFFSCREEN_DESPAWN_RANGE;
 			break;
 		}
 	}else{
@@ -254,14 +278,14 @@ CCarCtrl::GenerateOneRandomCar()
 			/* Forward to his current direction (camera direction). */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = true;
-			preferredDistance = 120.0f * TheCamera.GenerationDistMultiplier;
+			preferredDistance = REQUEST_ONSCREEN_DISTANCE * TheCamera.GenerationDistMultiplier;
 			break;
 		case 1:
 			/* Spawn a vehicle close to player to his side. */
 			/* Kinda not within camera angle. */
 			angleLimit = 0.707f; /* 45 degrees */
 			invertAngleLimitTest = false;
-			preferredDistance = 40.0f;
+			preferredDistance = OFFSCREEN_DESPAWN_RANGE;
 			break;
 		}
 	}
@@ -269,17 +293,45 @@ CCarCtrl::GenerateOneRandomCar()
 		preferredDistance, angleLimit, invertAngleLimitTest, &spawnPosition, &curNodeId, &nextNodeId,
 		&positionBetweenNodes, carClass == COPS && pWanted->m_nWantedLevel >= 1))
 		return;
+	CPathNode* pCurNode = &ThePaths.m_pathNodes[curNodeId];
+	CPathNode* pNextNode = &ThePaths.m_pathNodes[nextNodeId];
+	bool bBoatGenerated = false;
+	if ((CGeneral::GetRandomNumber() & 0xF) > Min(pCurNode->spawnRate, pNextNode->spawnRate))
+		return;
+	if (pCurNode->bWaterPath) {
+		bBoatGenerated = true;
+		if (carClass == COPS) {
+			carModel = MI_PREDATOR;
+			carClass = COPS_BOAT;
+			if (!CStreaming::HasModelLoaded(MI_PREDATOR)) {
+				CStreaming::RequestModel(MI_PREDATOR, STREAMFLAGS_DEPENDENCY);
+				return;
+			}
+		}
+		else {
+			int i;
+			carModel = -1;
+			for (i = 10; i > 0 && (carModel == -1 || !CStreaming::HasModelLoaded(carModel)); i--) {
+				carModel = ChooseBoatModel(ChooseBoatRating(&zone));
+			}
+			if (i == 0)
+				return;
+		}
+		if (pCurNode->bOnlySmallBoats || pNextNode->bOnlySmallBoats) {
+			if (BoatWithTallMast(carModel))
+				return;
+		}
+	}
 	int16 colliding;
-	CWorld::FindObjectsKindaColliding(spawnPosition, 10.0f, true, &colliding, 2, nil, false, true, true, false, false);
+	CWorld::FindObjectsKindaColliding(spawnPosition, bBoatGenerated ? 40.0f : 10.0f, true, &colliding, 2, nil, false, true, true, false, false);
 	if (colliding)
 		/* If something is already present in spawn position, do not create vehicle*/
 		return;
-	if (!ThePaths.TestCoorsCloseness(vecTargetPos, false, spawnPosition))
+	if (!bBoatGenerated && !ThePaths.TestCoorsCloseness(vecTargetPos, false, spawnPosition))
 		/* Testing if spawn position can reach target position via valid path. */
 		return;
 	int16 idInNode = 0;
-	CPathNode* pCurNode = &ThePaths.m_pathNodes[curNodeId];
-	CPathNode* pNextNode = &ThePaths.m_pathNodes[nextNodeId];
+
 	while (idInNode < pCurNode->numLinks &&
 		ThePaths.ConnectedNode(idInNode + pCurNode->firstLink) != nextNodeId)
 		idInNode++;
@@ -287,48 +339,20 @@ CCarCtrl::GenerateOneRandomCar()
 	CCarPathLink* pPathLink = &ThePaths.m_carPathLinks[connectionId];
 	int16 lanesOnCurrentRoad = pPathLink->pathNodeIndex == nextNodeId ? pPathLink->numLeftLanes : pPathLink->numRightLanes;
 	CVehicleModelInfo* pModelInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(carModel);
-	if (lanesOnCurrentRoad == 0 || pModelInfo->m_vehicleType == VEHICLE_TYPE_BIKE)
+	if (lanesOnCurrentRoad == 0)
 		/* Not spawning vehicle if road is one way and intended direction is opposide to that way. */
-		/* Also not spawning bikes but they don't exist in final game. */
 		return;
-	CAutomobile* pVehicle = new CAutomobile(carModel, RANDOM_VEHICLE);
+	CVehicle* pVehicle;
+	if (CModelInfo::IsBoatModel(carModel))
+		pVehicle = new CBoat(carModel, RANDOM_VEHICLE);
+	else if (CModelInfo::IsBikeModel(carModel))
+		pVehicle = new CBike(carModel, RANDOM_VEHICLE);
+	else
+		pVehicle = new CAutomobile(carModel, RANDOM_VEHICLE);
 	pVehicle->AutoPilot.m_nPrevRouteNode = 0;
 	pVehicle->AutoPilot.m_nCurrentRouteNode = curNodeId;
 	pVehicle->AutoPilot.m_nNextRouteNode = nextNodeId;
 	switch (carClass) {
-	case POOR:
-	case RICH:
-	case EXEC:
-	case WORKER:
-	case SPECIAL:
-	case BIG:
-	case TAXI:
-	case MAFIA:
-	case TRIAD:
-	case DIABLO:
-	case YAKUZA:
-	case YARDIE:
-	case COLOMB:
-	case NINES:
-	case GANG8:
-	case GANG9:
-	{
-		pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(9, 14);
-		if (carClass == EXEC)
-			pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(12, 18);
-		else if (carClass == POOR || carClass == SPECIAL)
-			pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(7, 10);
-		CVehicleModelInfo* pVehicleInfo = pVehicle->GetModelInfo();
-		if (pVehicleInfo->GetColModel()->boundingBox.max.y - pVehicle->GetModelInfo()->GetColModel()->boundingBox.min.y > 10.0f || carClass == BIG) {
-			pVehicle->AutoPilot.m_nCruiseSpeed *= 3;
-			pVehicle->AutoPilot.m_nCruiseSpeed /= 4;
-		}
-		pVehicle->AutoPilot.m_fMaxTrafficSpeed = pVehicle->AutoPilot.m_nCruiseSpeed;
-		pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
-		pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
-		pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
-		break;
-	}
 	case COPS:
 		pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
 		if (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel != 0){
@@ -345,16 +369,37 @@ CCarCtrl::GenerateOneRandomCar()
 		if (carModel == MI_FBICAR){
 			pVehicle->m_currentColour1 = 0;
 			pVehicle->m_currentColour2 = 0;
-			/* FBI cars are gray in carcols, but we want them black if they going after player. */
 		}
+		pVehicle->bCreatedAsPoliceVehicle = true;
+		break;
+	case COPS_BOAT:
+		pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+		pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(4.0f, 16.0f);
+		pVehicle->AutoPilot.m_fMaxTrafficSpeed = pVehicle->AutoPilot.m_nCruiseSpeed;
+		pVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceBoatMissionForWantedLevel();
+		pVehicle->bCreatedAsPoliceVehicle = true;
+		break;
 	default:
+		pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(9, 14);
+		if (carClass == EXEC)
+			pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(12, 18);
+		else if (carClass == POOR)
+			pVehicle->AutoPilot.m_nCruiseSpeed = CGeneral::GetRandomNumberInRange(7, 10);
+		if (pVehicle->GetColModel()->boundingBox.max.y - pVehicle->GetColModel()->boundingBox.min.y > 10.0f || carClass == BIG) {
+			pVehicle->AutoPilot.m_nCruiseSpeed *= 3;
+			pVehicle->AutoPilot.m_nCruiseSpeed /= 4;
+		}
+		pVehicle->AutoPilot.m_fMaxTrafficSpeed = pVehicle->AutoPilot.m_nCruiseSpeed;
+		pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
+		pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+		pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
 		break;
 	}
 	if (pVehicle && pVehicle->GetModelIndex() == MI_MRWHOOP)
 		pVehicle->m_bSirenOrAlarm = true;
 	pVehicle->AutoPilot.m_nNextPathNodeInfo = connectionId;
 	pVehicle->AutoPilot.m_nNextLane = pVehicle->AutoPilot.m_nCurrentLane = CGeneral::GetRandomNumber() % lanesOnCurrentRoad;
-	CColBox* boundingBox = &CModelInfo::GetModelInfo(pVehicle->GetModelIndex())->GetColModel()->boundingBox;
+	CBox* boundingBox = &CModelInfo::GetModelInfo(pVehicle->GetModelIndex())->GetColModel()->boundingBox;
 	float carLength = 1.0f + (boundingBox->max.y - boundingBox->min.y) / 2;
 	float distanceBetweenNodes = (pCurNode->GetPosition() - pNextNode->GetPosition()).Magnitude2D();
 	/* If car is so long that it doesn't fit between two car nodes, place it directly in the middle. */
@@ -393,11 +438,6 @@ CCarCtrl::GenerateOneRandomCar()
 	pVehicle->GetRight() = CVector(forwardY, -forwardX, 0.0f);
 	pVehicle->GetUp() = CVector(0.0f, 0.0f, 1.0f);
 
-	float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirX();
-	float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirY();
-	float nextPathLinkForwardX = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirX();
-	float nextPathLinkForwardY = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirY();
-
 #ifdef FIX_BUGS
 	CCarPathLink* pCurrentLink;
 	CCarPathLink* pNextLink;
@@ -488,6 +528,7 @@ CCarCtrl::GenerateOneRandomCar()
 	pVehicle->AutoPilot.m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() -
 		(0.5f + positionBetweenNodes) * pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve;
 #endif
+
 	CVector directionCurrentLink(directionCurrentLinkX, directionCurrentLinkY, 0.0f);
 	CVector directionNextLink(directionNextLinkX, directionNextLinkY, 0.0f);
 	CVector positionIncludingCurve;
@@ -509,62 +550,69 @@ CCarCtrl::GenerateOneRandomCar()
 	float groundZ = INFINITE_Z;
 	CColPoint colPoint;
 	CEntity* pEntity;
-	if (CWorld::ProcessVerticalLine(finalPosition, 1000.0f, colPoint, pEntity, true, false, false, false, true, false, nil))
-		groundZ = colPoint.point.z;
-	if (CWorld::ProcessVerticalLine(finalPosition, -1000.0f, colPoint, pEntity, true, false, false, false, true, false, nil)){
-		if (ABS(colPoint.point.z - finalPosition.z) < ABS(groundZ - finalPosition.z))
+	if (bBoatGenerated) {
+		if (!CWaterLevel::GetWaterLevel(finalPosition, &groundZ, true)) {
+			delete pVehicle;
+			return;
+		}
+	}
+	else {
+		if (CWorld::ProcessVerticalLine(finalPosition, 1000.0f, colPoint, pEntity, true, false, false, false, true, false, nil))
 			groundZ = colPoint.point.z;
+		if (CWorld::ProcessVerticalLine(finalPosition, -1000.0f, colPoint, pEntity, true, false, false, false, true, false, nil)) {
+			if (ABS(colPoint.point.z - finalPosition.z) < ABS(groundZ - finalPosition.z))
+				groundZ = colPoint.point.z;
+		}
 	}
 	if (groundZ == INFINITE_Z || ABS(groundZ - finalPosition.z) > 7.0f) {
 		/* Failed to find ground or too far from expected position. */
 		delete pVehicle;
 		return;
 	}
-	finalPosition.z = groundZ + pVehicle->GetHeightAboveRoad();
+	if (CModelInfo::IsBoatModel(carModel)) {
+		finalPosition.z = groundZ;
+		pVehicle->bExtendedRange = true;
+	}
+	else
+		finalPosition.z = groundZ + pVehicle->GetHeightAboveRoad();
 	pVehicle->SetPosition(finalPosition);
 	pVehicle->SetMoveSpeed(directionIncludingCurve / GAME_SPEED_TO_CARAI_SPEED);
 	CVector2D speedDifferenceWithTarget = (CVector2D)pVehicle->GetMoveSpeed() - vecPlayerSpeed;
 	CVector2D distanceToTarget = positionIncludingCurve - vecTargetPos;
 	switch (carClass) {
-	case POOR:
-	case RICH:
-	case EXEC:
-	case WORKER:
-	case SPECIAL:
-	case BIG:
-	case TAXI:
-	case MAFIA:
-	case TRIAD:
-	case DIABLO:
-	case YAKUZA:
-	case YARDIE:
-	case COLOMB:
-	case NINES:
-	case GANG8:
-	case GANG9:
-		pVehicle->SetStatus(STATUS_SIMPLE);
-		break;
 	case COPS:
 		pVehicle->SetStatus((pVehicle->AutoPilot.m_nCarMission == MISSION_CRUISE) ? STATUS_SIMPLE : STATUS_PHYSICS);
 		pVehicle->ChangeLawEnforcerState(1);
 		break;
+	case COPS_BOAT:
+		pVehicle->ChangeLawEnforcerState(1);
+		pVehicle->SetStatus(STATUS_PHYSICS);
+		break;
 	default:
+		bBoatGenerated ? pVehicle->SetStatus(STATUS_PHYSICS) : pVehicle->SetStatus(STATUS_SIMPLE);
 		break;
 	}
 	CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
 	if (!pVehicle->GetIsOnScreen()){
-		if ((vecTargetPos - pVehicle->GetPosition()).Magnitude2D() > 50.0f) {
+		if ((vecTargetPos - pVehicle->GetPosition()).Magnitude2D() > OFFSCREEN_DESPAWN_RANGE * (pVehicle->bExtendedRange ? EXTENDED_RANGE_DESPAWN_MULTIPLIER : 1.0f)) {
 			/* Too far away cars that are not visible aren't needed. */
 			delete pVehicle;
 			return;
 		}
-	}else if((vecTargetPos - pVehicle->GetPosition()).Magnitude2D() > TheCamera.GenerationDistMultiplier * 130.0f ||
-		(vecTargetPos - pVehicle->GetPosition()).Magnitude2D() < TheCamera.GenerationDistMultiplier * 110.0f){
-		delete pVehicle;
-		return;
-	}else if((TheCamera.GetPosition() - pVehicle->GetPosition()).Magnitude2D() < 90.0f * TheCamera.GenerationDistMultiplier){
-		delete pVehicle;
-		return;
+	}else{
+		if ((vecTargetPos - pVehicle->GetPosition()).Magnitude2D() > TheCamera.GenerationDistMultiplier * (pVehicle->bExtendedRange ? EXTENDED_RANGE_DESPAWN_MULTIPLIER : 1.0f) * ONSCREEN_DESPAWN_RANGE ||
+			(vecTargetPos - pVehicle->GetPosition()).Magnitude2D() < TheCamera.GenerationDistMultiplier * MINIMAL_DISTANCE_TO_SPAWN_ONSCREEN) {
+			delete pVehicle;
+			return;
+		}
+		if ((TheCamera.GetPosition() - pVehicle->GetPosition()).Magnitude2D() < 82.5f * TheCamera.GenerationDistMultiplier || bTopDownCamera) {
+			delete pVehicle;
+			return;
+		}
+		if (pVehicle->GetModelIndex() == MI_MARQUIS) { // so marquis can only spawn if player doesn't see it?
+			delete pVehicle;
+			return;
+		}
 	}
 	CVehicleModelInfo* pVehicleModel = pVehicle->GetModelInfo();
 	float radiusToTest = pVehicleModel->GetColModel()->boundingSphere.radius;
@@ -587,58 +635,152 @@ CCarCtrl::GenerateOneRandomCar()
 	}
 	pVehicleModel->AvoidSameVehicleColour(&pVehicle->m_currentColour1, &pVehicle->m_currentColour2);
 	CWorld::Add(pVehicle);
-	if (carClass == COPS)
+	if (carClass == COPS || carClass == COPS_BOAT)
 		CCarAI::AddPoliceCarOccupants(pVehicle);
-	else
+	else {
 		pVehicle->SetUpDriver();
-	if ((CGeneral::GetRandomNumber() & 0x3F) == 0){ /* 1/64 probability */
+		int32 passengers = 0;
+		for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++)
+			passengers += (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < PROBABILITY_OF_PASSENGER_IN_VEHICLE) ? 1 : 0;
+		if (CModelInfo::IsCarModel(carModel) && (CModelInfo::GetModelInfo(carModel)->GetAnimFileIndex() == CAnimManager::GetAnimationBlockIndex("van") && passengers >= 1))
+			passengers = 1;
+		for (int i = 0; i < passengers; i++) {
+			CPed* pPassenger = pVehicle->SetupPassenger(i);
+			if (pPassenger) {
+				++CPopulation::ms_nTotalCarPassengerPeds;
+				pPassenger->bCarPassenger = true;
+			}
+		}
+	}
+	int nMadDrivers;
+	switch (pVehicle->GetVehicleAppearance()) {
+	case VEHICLE_APPEARANCE_BIKE:
+		nMadDrivers = 30;
+		break;
+	case VEHICLE_APPEARANCE_BOAT:
+		nMadDrivers = 40;
+		break;
+	default:
+		nMadDrivers = 6;
+		break;
+	}
+	if ((CGeneral::GetRandomNumber() & 0x7F) < nMadDrivers /* TODO(MIAMI): || mad drivers cheat */) {
 		pVehicle->SetStatus(STATUS_PHYSICS);
 		pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
 		pVehicle->AutoPilot.m_nCruiseSpeed += 10;
 	}
 	if (carClass == COPS)
 		LastTimeLawEnforcerCreated = CTimer::GetTimeInMilliseconds();
+	if (pVehicle->GetModelIndex() == MI_CADDY) {
+		pVehicle->SetStatus(STATUS_PHYSICS);
+		pVehicle->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
+	}
+	if (carClass == COPS && pVehicle->GetModelIndex() == MI_VICECHEE) {
+		CVehicleModelInfo* pVehicleModel = (CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_VICECHEE);
+		switch (MiamiViceCycle) {
+		case 0:
+			pVehicleModel->SetVehicleColour(53, 77);
+			break;
+		case 1:
+			pVehicleModel->SetVehicleColour(15, 77);
+			break;
+		case 2:
+			pVehicleModel->SetVehicleColour(41, 77);
+			break;
+		case 3:
+			pVehicleModel->SetVehicleColour(61, 77);
+			break;
+		default:
+			break;
+		}
+	}
+	if (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) >= (1 - PROBABILITY_OF_DEAD_PED_ACCIDENT)) {
+		if (CModelInfo::IsCarModel(pVehicle->GetModelIndex()) && !pVehicle->bIsLawEnforcer) {
+			if (CPopulation::AddDeadPedInFrontOfCar(pVehicle->GetPosition() + pVehicle->GetForward() * DISTANCE_BETWEEN_CAR_AND_DEAD_PED, pVehicle)) {
+				pVehicle->AutoPilot.m_nCruiseSpeed = 0;
+				pVehicle->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				for (int i = 0; i < pVehicle->m_nNumPassengers; i++) {
+					if (pVehicle->pPassengers[i]) {
+						pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
+						pVehicle->pPassengers[i]->m_nLastPedState = PED_WANDER_PATH;
+						pVehicle->pPassengers[i]->m_vehicleInAccident = pVehicle;
+						pVehicle->pPassengers[i]->bDeadPedInFrontOfCar = true;
+						pVehicle->RegisterReference((CEntity**)&pVehicle->pPassengers[i]->m_vehicleInAccident);
+					}
+				}
+				if (pVehicle->pDriver) {
+					pVehicle->pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
+					pVehicle->pDriver->m_nLastPedState = PED_WANDER_PATH;
+					pVehicle->pDriver->m_vehicleInAccident = pVehicle;
+					pVehicle->pDriver->bDeadPedInFrontOfCar = true;
+					pVehicle->RegisterReference((CEntity**)&pVehicle->pDriver->m_vehicleInAccident);
+				}
+			}
+		}
+	}
+}
+
+bool
+CCarCtrl::BoatWithTallMast(int32 mi)
+{
+	return mi == MI_RIO || mi == MI_TROPIC || mi == MI_MARQUIS;
+}
+
+int32
+CCarCtrl::ChooseBoatModel(int32 rating)
+{
+	++NumRequestsOfCarRating[rating];
+	return ChooseCarModel(rating);
+}
+
+int32
+CCarCtrl::ChooseBoatRating(CZoneInfo* pZoneInfo)
+{
+	int rnd = CGeneral::GetRandomNumberInRange(0, 1000);
+	for (int i = 0; i < NUM_BOAT_CLASSES - 1; i++) {
+		if (rnd < pZoneInfo->boatThreshold[i])
+			return FIRST_BOAT_RATING + i;
+	}
+	return FIRST_BOAT_RATING + NUM_BOAT_CLASSES - 1;
+}
+
+int32
+CCarCtrl::ChooseCarRating(CZoneInfo* pZoneInfo)
+{
+	int rnd = CGeneral::GetRandomNumberInRange(0, 1000);
+	for (int i = 0; i < NUM_CAR_CLASSES - 1; i++) {
+		if (rnd < pZoneInfo->carThreshold[i])
+			return i;
+	}
+	return FIRST_CAR_RATING + NUM_CAR_CLASSES - 1;
 }
 
 int32
 CCarCtrl::ChooseModel(CZoneInfo* pZone, CVector* pPos, int* pClass) {
 	int32 model = -1;
-	while (model == -1 || !CStreaming::HasModelLoaded(model)){
+	for (int i = 0; i < 10 && (model == -1 || !CStreaming::HasModelLoaded(model)); i++) {
 		int rnd = CGeneral::GetRandomNumberInRange(0, 1000);
-		if (rnd < pZone->carThreshold[0])
-			model = CCarCtrl::ChooseCarModel((*pClass = POOR));
-		else if (rnd < pZone->carThreshold[1])
-			model = CCarCtrl::ChooseCarModel((*pClass = RICH));
-		else if (rnd < pZone->carThreshold[2])
-			model = CCarCtrl::ChooseCarModel((*pClass = EXEC));
-		else if (rnd < pZone->carThreshold[3])
-			model = CCarCtrl::ChooseCarModel((*pClass = WORKER));
-		else if (rnd < pZone->carThreshold[4])
-			model = CCarCtrl::ChooseCarModel((*pClass = SPECIAL));
-		else if (rnd < pZone->carThreshold[5])
-			model = CCarCtrl::ChooseCarModel((*pClass = BIG));
-		else if (rnd < pZone->copThreshold)
-			*pClass = COPS, model = CCarCtrl::ChoosePoliceCarModel();
-		else if (rnd < pZone->gangThreshold[0])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = MAFIA) - MAFIA);
-		else if (rnd < pZone->gangThreshold[1])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = TRIAD) - MAFIA);
-		else if (rnd < pZone->gangThreshold[2])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = DIABLO) - MAFIA);
-		else if (rnd < pZone->gangThreshold[3])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = YAKUZA) - MAFIA);
-		else if (rnd < pZone->gangThreshold[4])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = YARDIE) - MAFIA);
-		else if (rnd < pZone->gangThreshold[5])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = COLOMB) - MAFIA);
-		else if (rnd < pZone->gangThreshold[6])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = NINES) - MAFIA);
-		else if (rnd < pZone->gangThreshold[7])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = GANG8) - MAFIA);
-		else if (rnd < pZone->gangThreshold[8])
-			model = CCarCtrl::ChooseGangCarModel((*pClass = GANG9) - MAFIA);
-		else
-			model = CCarCtrl::ChooseCarModel((*pClass = TAXI));
+
+		if (rnd < pZone->copThreshold) {
+			*pClass = COPS; 
+			model = ChoosePoliceCarModel();
+			continue;
+		}
+
+		int j;
+		for (j = 0; j < NUM_GANG_CAR_CLASSES; j++) {
+			if (rnd < pZone->gangThreshold[i]) {
+				*pClass = j + FIRST_GANG_CAR_RATING;
+				model = ChooseGangCarModel(j);
+				break;
+			}
+		}
+
+		if (j != NUM_GANG_CAR_CLASSES)
+			continue;
+
+		*pClass = ChooseCarRating(pZone);
+		model = ChooseCarModel(*pClass);
 	}
 	return model;
 }
@@ -647,34 +789,86 @@ int32
 CCarCtrl::ChooseCarModel(int32 vehclass)
 {
 	int32 model = -1;
-	switch (vehclass) {
-	case POOR:
-	case RICH:
-	case EXEC:
-	case WORKER:
-	case SPECIAL:
-	case BIG:
-	case TAXI:
-	{
-		if (TotalNumOfCarsOfRating[vehclass] == 0)
-			debug("ChooseCarModel : No cars of type %d have been declared\n", vehclass);
-		model = CarArrays[vehclass][NextCarOfRating[vehclass]];
-		int32 total = TotalNumOfCarsOfRating[vehclass];
-		NextCarOfRating[vehclass] += CGeneral::GetRandomNumberInRange(1, total);
-		while (NextCarOfRating[vehclass] >= total)
-			NextCarOfRating[vehclass] -= total;
-		//NextCarOfRating[vehclass] %= total;
-		TotalNumOfCarsOfRating[vehclass] = total; /* why... */
-	}
-	default:
-		break;
-	}
-	return model;
+	++NumRequestsOfCarRating[vehclass];
+	if (NumOfLoadedCarsOfRating[vehclass] == 0)
+		return -1;
+	int32 rnd = CGeneral::GetRandomNumberInRange(0, CarFreqArrays[vehclass][NumOfLoadedCarsOfRating[vehclass] - 1]);
+	int32 index = 0;
+	while (rnd > CarFreqArrays[vehclass][index])
+		index++;
+	assert(LoadedCarsArray[vehclass][index]);
+	return LoadedCarsArray[vehclass][index];
+}
+
+void
+CCarCtrl::AddToLoadedVehicleArray(int32 mi, int32 rating, int32 freq)
+{
+	LoadedCarsArray[rating][NumOfLoadedCarsOfRating[rating]] = mi;
+	assert(mi >= 130);
+	CarFreqArrays[rating][NumOfLoadedCarsOfRating[rating]] = freq;
+	if (NumOfLoadedCarsOfRating[rating])
+		CarFreqArrays[rating][NumOfLoadedCarsOfRating[rating]] += CarFreqArrays[rating][NumOfLoadedCarsOfRating[rating] - 1];
+	NumOfLoadedCarsOfRating[rating]++;
+}
+
+void
+CCarCtrl::RemoveFromLoadedVehicleArray(int mi, int32 rating)
+{
+	int index = 0;
+	while (LoadedCarsArray[rating][index] != -1) {
+		if (LoadedCarsArray[rating][index] == mi)
+			break;
+		index++;
+	}
+	assert(LoadedCarsArray[rating][index] == mi);
+	int32 freq = CarFreqArrays[rating][index];
+	if (index > 0)
+		freq -= CarFreqArrays[rating][index - 1];
+	while (LoadedCarsArray[rating][index + 1] != -1) {
+		LoadedCarsArray[rating][index] = LoadedCarsArray[rating][index + 1];
+		CarFreqArrays[rating][index] = CarFreqArrays[rating][index + 1] - freq;
+		index++;
+	}
+	--NumOfLoadedCarsOfRating[rating];
+}
+
+int32
+CCarCtrl::ChooseCarModelToLoad(int rating)
+{
+	return CarArrays[rating][CGeneral::GetRandomNumberInRange(0, TotalNumOfCarsOfRating[rating])];
 }
 
 int32
 CCarCtrl::ChoosePoliceCarModel(void)
 {
+	if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired() &&
+#ifdef FIX_BUGS
+		(CTimer::GetTimeInMilliseconds() > LastTimeMiamiViceGenerated + 120000 || LastTimeMiamiViceGenerated == 0) &&
+#else
+		CTimer::GetTimeInMilliseconds() > LastTimeMiamiViceGenerated + 120000 &&
+#endif
+		CStreaming::HasModelLoaded(MI_VICECHEE)) {
+		switch (MiamiViceCycle) {
+		case 0:
+			if (CStreaming::HasModelLoaded(MI_VICE1) && CStreaming::HasModelLoaded(MI_VICE2))
+				return MI_VICECHEE;
+			break;
+		case 1:
+			if (CStreaming::HasModelLoaded(MI_VICE3) && CStreaming::HasModelLoaded(MI_VICE4))
+				return MI_VICECHEE;
+			break;
+		case 2:
+			if (CStreaming::HasModelLoaded(MI_VICE5) && CStreaming::HasModelLoaded(MI_VICE6))
+				return MI_VICECHEE;
+			break;
+		case 3:
+			if (CStreaming::HasModelLoaded(MI_VICE7) && CStreaming::HasModelLoaded(MI_VICE8))
+				return MI_VICECHEE;
+			break;
+		default:
+			break;
+		}
+	}
 	if (FindPlayerPed()->m_pWanted->AreSwatRequired() &&
 		CStreaming::HasModelLoaded(MI_ENFORCER) &&
 		CStreaming::HasModelLoaded(MI_POLICE))
@@ -694,8 +888,7 @@ CCarCtrl::ChoosePoliceCarModel(void)
 int32
 CCarCtrl::ChooseGangCarModel(int32 gang)
 {
-	if (CStreaming::HasModelLoaded(MI_GANG01 + 2 * gang) &&
-		CStreaming::HasModelLoaded(MI_GANG02 + 2 * gang))
+	if (CGangs::HaveGangModelsLoaded(gang))
 		return CGangs::GetGangVehicleModel(gang);
 	return -1;
 }
@@ -703,6 +896,7 @@ CCarCtrl::ChooseGangCarModel(int32 gang)
 void
 CCarCtrl::AddToCarArray(int32 id, int32 vehclass)
 {
+	assert(TotalNumOfCarsOfRating[vehclass] < MAX_CAR_MODELS_IN_ARRAY);
 	CarArrays[vehclass][TotalNumOfCarsOfRating[vehclass]++] = id;
 }
 
@@ -716,7 +910,7 @@ CCarCtrl::RemoveDistantCars()
 		PossiblyRemoveVehicle(pVehicle);
 		if (pVehicle->bCreateRoadBlockPeds){
 			if ((pVehicle->GetPosition() - FindPlayerCentreOfWorld(CWorld::PlayerInFocus)).Magnitude2D() < DISTANCE_TO_SPAWN_ROADBLOCK_PEDS) {
-				CRoadBlocks::GenerateRoadBlockCopsForCar(pVehicle, pVehicle->m_nRoadblockType, pVehicle->m_nRoadblockNode);
+				CRoadBlocks::GenerateRoadBlockCopsForCar(pVehicle, pVehicle->m_nRoadblockType);
 				pVehicle->bCreateRoadBlockPeds = false;
 			}
 		}
@@ -724,6 +918,36 @@ CCarCtrl::RemoveDistantCars()
 }
 
 void
+CCarCtrl::RemoveCarsIfThePoolGetsFull(void)
+{
+	if ((CTimer::GetFrameCounter() & 7) != 3)
+		return;
+	if (CPools::GetVehiclePool()->GetNoOfFreeSpaces() >= 8)
+		return;
+	int i = CPools::GetVehiclePool()->GetSize();
+	float md = 999999.9f;
+	CVehicle* pClosestVehicle = nil;
+	while (i--) {
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+		if (!pVehicle)
+			continue;
+		if (IsThisVehicleInteresting(pVehicle) || pVehicle->bIsLocked)
+			continue;
+		if (!pVehicle->CanBeDeleted() || CCranes::IsThisCarBeingTargettedByAnyCrane(pVehicle))
+			continue;
+		float distance = (TheCamera.GetPosition() - pVehicle->GetPosition()).Magnitude();
+		if (distance < md) {
+			md = distance;
+			pClosestVehicle = pVehicle;
+		}
+	}
+	if (pClosestVehicle) {
+		CWorld::Remove(pClosestVehicle);
+		delete pClosestVehicle;
+	}
+}
+
+void
 CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
 {
 	CVector vecPlayerPos = FindPlayerCentreOfWorld(CWorld::PlayerInFocus);
@@ -736,7 +960,7 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
 			return;
 		}
 		float distanceToPlayer = (pVehicle->GetPosition() - vecPlayerPos).Magnitude2D();
-		float threshold = 50.0f;
+		float threshold = OFFSCREEN_DESPAWN_RANGE;
 		if (pVehicle->GetIsOnScreen() ||
 			TheCamera.Cams[TheCamera.ActiveCam].LookingLeft ||
 			TheCamera.Cams[TheCamera.ActiveCam].LookingRight ||
@@ -746,14 +970,17 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
 			pVehicle->GetModelIndex() == MI_AMBULAN ||
 			pVehicle->GetModelIndex() == MI_FIRETRUCK ||
 			pVehicle->bIsLawEnforcer ||
-			pVehicle->bIsCarParkVehicle
+			pVehicle->bIsCarParkVehicle ||
+			CTimer::GetTimeInMilliseconds() < pVehicle->m_nSetPieceExtendedRangeTime
 			){
-			threshold = 130.0f * TheCamera.GenerationDistMultiplier;
+			threshold = ONSCREEN_DESPAWN_RANGE * TheCamera.GenerationDistMultiplier;
 		}
+		if (TheCamera.GetForward().z < -0.9f)
+			threshold = 70.0f;
 		if (pVehicle->bExtendedRange)
-			threshold *= 1.5f;
+			threshold *= EXTENDED_RANGE_DESPAWN_MULTIPLIER;
 		if (distanceToPlayer > threshold && !CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
-			if (pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) {
+			if (pVehicle->GetIsOnScreen()){
 				pVehicle->bFadeOut = true;
 			}else{
 				CWorld::Remove(pVehicle);
@@ -762,7 +989,8 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
 			return;
 		}
 	}
-	if ((pVehicle->GetStatus() == STATUS_SIMPLE || pVehicle->GetStatus() == STATUS_PHYSICS && pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_STOP_FOR_CARS) &&
+	if ((pVehicle->GetStatus() == STATUS_SIMPLE || pVehicle->GetStatus() == STATUS_PHYSICS &&
+		(pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_STOP_FOR_CARS || pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS)) &&
 		CTimer::GetTimeInMilliseconds() - pVehicle->AutoPilot.m_nTimeToStartMission > 5000 &&
 		!pVehicle->GetIsOnScreen() &&
 		(pVehicle->GetPosition() - vecPlayerPos).Magnitude2D() > 25.0f &&
@@ -779,7 +1007,7 @@ CCarCtrl::PossiblyRemoveVehicle(CVehicle* pVehicle)
 	if (pVehicle->GetStatus() != STATUS_WRECKED || pVehicle->m_nTimeOfDeath == 0)
 		return;
 	if (CTimer::GetTimeInMilliseconds() > pVehicle->m_nTimeOfDeath + 60000 &&
-		!(pVehicle->GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(pVehicle)) ){
+		!pVehicle->GetIsOnScreen()){
 		if ((pVehicle->GetPosition() - vecPlayerPos).MagnitudeSqr() > SQR(7.5f)){
 			if (!CGarages::IsPointWithinHideOutGarage(pVehicle->GetPosition())){
 				CWorld::Remove(pVehicle);
@@ -803,6 +1031,16 @@ CCarCtrl::CountCarsOfType(int32 mi)
 	return total;
 }
 
+static CVector GetRandomOffsetForVehicle(CVehicle* pVehicle, bool bNext)
+{
+	CVector offset;
+	int32 seed = ((bNext ? pVehicle->AutoPilot.m_nNextPathNodeInfo : pVehicle->AutoPilot.m_nCurrentPathNodeInfo) + pVehicle->m_randomSeed) & 7;
+	offset.x = (seed - 3) * 0.009f;
+	offset.y = ((seed >> 3) - 3) * 0.009f;
+	offset.z = 0.0f;
+	return offset;
+}
+
 void
 CCarCtrl::UpdateCarOnRails(CVehicle* pVehicle)
 {
@@ -835,8 +1073,12 @@ CCarCtrl::UpdateCarOnRails(CVehicle* pVehicle)
 		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardY,
 		pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
 		0.0f);
-	CVector directionCurrentLink(currentPathLinkForwardX, currentPathLinkForwardY, 0.0f);
-	CVector directionNextLink(nextPathLinkForwardX, nextPathLinkForwardY, 0.0f);
+	CVector directionCurrentLink = GetRandomOffsetForVehicle(pVehicle, false);
+	directionCurrentLink += CVector(currentPathLinkForwardX, currentPathLinkForwardY, 0.0f);
+	directionCurrentLink.Normalise();
+	CVector directionNextLink = GetRandomOffsetForVehicle(pVehicle, true);
+	directionNextLink += CVector(nextPathLinkForwardX, nextPathLinkForwardY, 0.0f);
+	directionNextLink.Normalise();
 	CVector positionIncludingCurve;
 	CVector directionIncludingCurve;
 	CCurves::CalcCurvePoint(
@@ -859,7 +1101,7 @@ CCarCtrl::FindMaximumSpeedForThisCarInTraffic(CVehicle* pVehicle)
 {
 	if (pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_AVOID_CARS ||
 		pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_PLOUGH_THROUGH)
-		return pVehicle->AutoPilot.m_nCruiseSpeed;
+		return pVehicle->AutoPilot.GetCruiseSpeed();
 	float left = pVehicle->GetPosition().x - DISTANCE_TO_SCAN_FOR_DANGER;
 	float right = pVehicle->GetPosition().x + DISTANCE_TO_SCAN_FOR_DANGER;
 	float top = pVehicle->GetPosition().y - DISTANCE_TO_SCAN_FOR_DANGER;
@@ -871,23 +1113,23 @@ CCarCtrl::FindMaximumSpeedForThisCarInTraffic(CVehicle* pVehicle)
 	assert(xstart <= xend);
 	assert(ystart <= yend);
 
-	float maxSpeed = pVehicle->AutoPilot.m_nCruiseSpeed;
+	float maxSpeed = pVehicle->AutoPilot.GetCruiseSpeed();
 
 	CWorld::AdvanceCurrentScanCode();
 
 	for (int y = ystart; y <= yend; y++){
 		for (int x = xstart; x <= xend; x++){
 			CSector* s = CWorld::GetSector(x, y);
-			SlowCarDownForCarsSectorList(s->m_lists[ENTITYLIST_VEHICLES], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.m_nCruiseSpeed);
-			SlowCarDownForCarsSectorList(s->m_lists[ENTITYLIST_VEHICLES_OVERLAP], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.m_nCruiseSpeed);
-			SlowCarDownForPedsSectorList(s->m_lists[ENTITYLIST_PEDS], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.m_nCruiseSpeed);
-			SlowCarDownForPedsSectorList(s->m_lists[ENTITYLIST_PEDS_OVERLAP], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.m_nCruiseSpeed);
+			SlowCarDownForCarsSectorList(s->m_lists[ENTITYLIST_VEHICLES], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.GetCruiseSpeed());
+			SlowCarDownForCarsSectorList(s->m_lists[ENTITYLIST_VEHICLES_OVERLAP], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.GetCruiseSpeed());
+			SlowCarDownForPedsSectorList(s->m_lists[ENTITYLIST_PEDS], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.GetCruiseSpeed());
+			SlowCarDownForPedsSectorList(s->m_lists[ENTITYLIST_PEDS_OVERLAP], pVehicle, left, top, right, bottom, &maxSpeed, pVehicle->AutoPilot.GetCruiseSpeed());
 		}
 	}
 	pVehicle->bWarnedPeds = true;
 	if (pVehicle->AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_STOP_FOR_CARS)
 		return maxSpeed;
-	return (maxSpeed + pVehicle->AutoPilot.m_nCruiseSpeed) / 2;
+	return (maxSpeed + pVehicle->AutoPilot.GetCruiseSpeed()) / 2;
 }
 
 void
@@ -1089,8 +1331,8 @@ void CCarCtrl::SlowCarDownForOtherCar(CEntity* pOtherEntity, CVehicle* pVehicle,
 	float proximityA = TestCollisionBetween2MovingRects(pOtherVehicle, pVehicle, projectionX, projectionY, &forwardA, &forwardB, 0);
 	float proximityB = TestCollisionBetween2MovingRects(pVehicle, pOtherVehicle, -projectionX, -projectionY, &forwardB, &forwardA, 1);
 	float minProximity = Min(proximityA, proximityB);
-	if (minProximity >= 0.0f && minProximity < 1.0f){
-		minProximity = Max(0.0f, (minProximity - 0.2f) * 1.25f);
+	if (minProximity >= 0.0f && minProximity < 1.5f){
+		minProximity = Max(0.0f, (minProximity - 0.2f) / 1.3f);
 		pVehicle->AutoPilot.m_bSlowedDownBecauseOfCars = true;
 		*pSpeed = Min(*pSpeed, minProximity * curSpeed);
 	}
@@ -1316,19 +1558,21 @@ void CCarCtrl::WeaveThroughCarsSectorList(CPtrList& lst, CVehicle* pVehicle, CPh
 
 void CCarCtrl::WeaveForOtherCar(CEntity* pOtherEntity, CVehicle* pVehicle, float* pAngleToWeaveLeft, float* pAngleToWeaveRight)
 {
+	CVehicle* pOtherCar = (CVehicle*)pOtherEntity;
+	if (pVehicle->bPartOfConvoy && pOtherCar->bPartOfConvoy)
+		return;
 	if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMPLAYER_CLOSE && pOtherEntity == FindPlayerVehicle())
 		return;
 	if (pVehicle->AutoPilot.m_nCarMission == MISSION_RAMCAR_CLOSE && pOtherEntity == pVehicle->AutoPilot.m_pTargetCar)
 		return;
-	CVehicle* pOtherCar = (CVehicle*)pOtherEntity;
 	CVector2D vecDiff = pOtherCar->GetPosition() - pVehicle->GetPosition();
 	float angleBetweenVehicles = CGeneral::GetATanOfXY(vecDiff.x, vecDiff.y);
 	float distance = vecDiff.Magnitude();
 	if (distance < 1.0f)
 		return;
 	if (DotProduct2D(pVehicle->GetMoveSpeed() - pOtherCar->GetMoveSpeed(), vecDiff) * 110.0f -
-	  pOtherCar->GetModelInfo()->GetColModel()->boundingSphere.radius -
-	  pVehicle->GetModelInfo()->GetColModel()->boundingSphere.radius < distance)
+	  pOtherCar->GetColModel()->boundingSphere.radius -
+	  pVehicle->GetColModel()->boundingSphere.radius < distance)
 		return;
 	CVector2D forward = pVehicle->GetForward();
 	forward.Normalise();
@@ -1502,23 +1746,30 @@ bool CCarCtrl::PickNextNodeAccordingStrategy(CVehicle* pVehicle)
 		return false;
 	default:
 		PickNextNodeRandomly(pVehicle);
+		if (ThePaths.GetNode(pVehicle->AutoPilot.m_nNextRouteNode)->bOnlySmallBoats && BoatWithTallMast(pVehicle->GetModelIndex()))
+			pVehicle->AutoPilot.m_nCruiseSpeed = 0;
 		return false;
 	}
 }
 
 void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 {
+	if (pVehicle->m_nRouteSeed)
+		CGeneral::SetRandomSeed(pVehicle->m_nRouteSeed);
 	int32 prevNode = pVehicle->AutoPilot.m_nCurrentRouteNode;
 	int32 curNode = pVehicle->AutoPilot.m_nNextRouteNode;
 	uint8 totalLinks = ThePaths.m_pathNodes[curNode].numLinks;
 	CCarPathLink* pCurLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo];
-#ifdef FIX_BUGS
-	uint8 lanesOnCurrentPath = pCurLink->pathNodeIndex == curNode ?
-		pCurLink->numLeftLanes : pCurLink->numRightLanes;
-#else
-	uint8 lanesOnCurrentPath = pCurLink->pathNodeIndex == curNode ?
-		pCurLink->numRightLanes : pCurLink->numLeftLanes;
-#endif
+	uint8 lanesOnCurrentPath;
+	bool isOnOneWayRoad;
+	if (pCurLink->pathNodeIndex == curNode) {
+		lanesOnCurrentPath = pCurLink->numLeftLanes;
+		isOnOneWayRoad = pCurLink->numRightLanes == 0;
+	}
+	else {
+		lanesOnCurrentPath = pCurLink->numRightLanes;
+		isOnOneWayRoad = pCurLink->numLeftLanes == 0;
+	}
 	uint8 allowedDirections = PATH_DIRECTION_NONE;
 	uint8 nextLane = pVehicle->AutoPilot.m_nNextLane;
 	if (nextLane == 0)
@@ -1540,6 +1791,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 	CCarPathLink* pNextLink;
 	CPathNode* pNextPathNode;
 	bool goingAgainstOneWayRoad;
+	bool nextNodeIsOneWayRoad;
 	uint8 direction;
 	for(attempt = 0; attempt < ATTEMPTS_TO_FIND_NEXT_NODE; attempt++){
 		if (attempt != 0){
@@ -1549,7 +1801,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 					if ((!pNextPathNode->bDeadEnd || pPrevPathNode->bDeadEnd) &&
 						(!pNextPathNode->bDisabled || pPrevPathNode->bDisabled) &&
 						(!pNextPathNode->bBetweenLevels || pPrevPathNode->bBetweenLevels || !pVehicle->AutoPilot.m_bStayInCurrentLevel) &&
-						!goingAgainstOneWayRoad)
+						!goingAgainstOneWayRoad && (!isOnOneWayRoad || !nextNodeIsOneWayRoad))
 						break;
 				}
 			}
@@ -1559,9 +1811,10 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 		direction = FindPathDirection(prevNode, curNode, pVehicle->AutoPilot.m_nNextRouteNode);
 		pNextLink = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[nextLink + pCurPathNode->firstLink]];
 		goingAgainstOneWayRoad = pNextLink->pathNodeIndex == curNode ? pNextLink->numRightLanes == 0 : pNextLink->numLeftLanes == 0;
+		nextNodeIsOneWayRoad = pNextLink->pathNodeIndex == curNode ? pNextLink->numLeftLanes == 0 : pNextLink->numRightLanes == 0;
 	}
 	if (attempt >= ATTEMPTS_TO_FIND_NEXT_NODE) {
-		/* If we failed 15 times, then remove dead end and current lane limitations */
+		/* If we failed 15 times, then remove dead end, one way road and current lane limitations */
 		for (attempt = 0; attempt < ATTEMPTS_TO_FIND_NEXT_NODE; attempt++) {
 			if (attempt != 0) {
 				if (pVehicle->AutoPilot.m_nNextRouteNode != prevNode) {
@@ -1642,6 +1895,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 	}
 	if (pVehicle->AutoPilot.m_bStayInFastLane)
 		pVehicle->AutoPilot.m_nNextLane = 0;
+#ifdef FIX_BUGS
 	CVector positionOnCurrentLinkIncludingLane(
 		pCurLink->GetX() + ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH)
 #ifdef FIX_BUGS
@@ -1656,6 +1910,16 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 #endif
 		,pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
 		0.0f);
+#else
+	CVector positionOnCurrentLinkIncludingLane(
+		pCurLink->GetX() + ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH),
+		pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX,
+		0.0f);
+	CVector positionOnNextLinkIncludingLane(
+		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardY,
+		pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
+		0.0f);
+#endif
 	float directionCurrentLinkX = pCurLink->GetDirX() * pVehicle->AutoPilot.m_nCurrentDirection;
 	float directionCurrentLinkY = pCurLink->GetDirY() * pVehicle->AutoPilot.m_nCurrentDirection;
 	float directionNextLinkX = pNextLink->GetDirX() * pVehicle->AutoPilot.m_nNextDirection;
@@ -1706,74 +1970,57 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float targetY, CVehicle* pTarget)
 #endif
 {
+	if (pVehicle->m_nRouteSeed)
+		CGeneral::SetRandomSeed(pVehicle->m_nRouteSeed);
 	int prevNode = pVehicle->AutoPilot.m_nCurrentRouteNode;
 	int curNode = pVehicle->AutoPilot.m_nNextRouteNode;
 	CPathNode* pPrevNode = &ThePaths.m_pathNodes[prevNode];
 	CPathNode* pCurNode = &ThePaths.m_pathNodes[curNode];
-	CPathNode* pTargetNode;
+	CPathNode* pTargetNode[2];
 	int16 numNodes;
 	float distanceToTargetNode;
-	if (pTarget && pTarget->m_pCurGroundEntity &&
-	  pTarget->m_pCurGroundEntity->IsBuilding() &&
-	  ((CBuilding*)pTarget->m_pCurGroundEntity)->GetIsATreadable() &&
-	  ((CTreadable*)pTarget->m_pCurGroundEntity)->m_nodeIndices[0][0] >= 0){
-		CTreadable* pCurrentMapObject = (CTreadable*)pTarget->m_pCurGroundEntity;
-		int closestNode = -1;
-		float minDist = 100000.0f;
-		for (int i = 0; i < 12; i++){
-			int node = pCurrentMapObject->m_nodeIndices[0][i];
-			if (node < 0)
-				break;
-			float dist = (ThePaths.m_pathNodes[node].GetPosition() - pTarget->GetPosition()).Magnitude();
-			if (dist < minDist){
-				minDist = dist;
-				closestNode = node;
-			}
-		}
-		ThePaths.DoPathSearch(0, pCurNode->GetPosition(), curNode,
+	ThePaths.DoPathSearch(0, pCurNode->GetPosition(), curNode,
 #ifdef FIX_PATHFIND_BUG
-			CVector(targetX, targetY, targetZ),
+		CVector(targetX, targetY, targetZ),
 #else
-			CVector(targetX, targetY, 0.0f),
+		CVector(targetX, targetY, 0.0f),
 #endif
-			&pTargetNode, &numNodes, 1, pVehicle, &distanceToTargetNode, 999999.9f, closestNode);
-	}else
-	{
-
-		ThePaths.DoPathSearch(0, pCurNode->GetPosition(), curNode,
-#ifdef FIX_PATHFIND_BUG
-			CVector(targetX, targetY, targetZ),
-#else
-			CVector(targetX, targetY, 0.0f),
-#endif
-			&pTargetNode, &numNodes, 1, pVehicle, &distanceToTargetNode, 999999.9f, -1);
-	}
+		pTargetNode, &numNodes, 2, pVehicle, &distanceToTargetNode, 999999.9f, -1);
 
 	int newNextNode;
 	int nextLink;
-	if (numNodes != 1 || pTargetNode == pCurNode){
-		float currentAngle = CGeneral::GetATanOfXY(targetX - pVehicle->GetPosition().x, targetY - pVehicle->GetPosition().y);
-		nextLink = 0;
-		float lowestAngleChange = 10.0f;
-		int numLinks = pCurNode->numLinks;
-		newNextNode = 0;
-		for (int i = 0; i < numLinks; i++){
-			int conNode = ThePaths.ConnectedNode(i + pCurNode->firstLink);
-			if (conNode == prevNode && i > 1)
-				continue;
-			CPathNode* pTestNode = &ThePaths.m_pathNodes[conNode];
-			float angle = CGeneral::GetATanOfXY(pTestNode->GetX() - pCurNode->GetX(), pTestNode->GetY() - pCurNode->GetY());
-			angle = LimitRadianAngle(angle - currentAngle);
-			angle = ABS(angle);
-			if (angle < lowestAngleChange){
-				lowestAngleChange = angle;
-				newNextNode = conNode;
-				nextLink = i;
+	if (numNodes != 1 && numNodes != 2 || pTargetNode[0] == pCurNode){
+		if (numNodes != 2 || pTargetNode[1] == pCurNode) {
+			float currentAngle = CGeneral::GetATanOfXY(targetX - pVehicle->GetPosition().x, targetY - pVehicle->GetPosition().y);
+			nextLink = 0;
+			float lowestAngleChange = 10.0f;
+			int numLinks = pCurNode->numLinks;
+			newNextNode = 0;
+			for (int i = 0; i < numLinks; i++) {
+				int conNode = ThePaths.ConnectedNode(i + pCurNode->firstLink);
+				if (conNode == prevNode && i > 1)
+					continue;
+				CPathNode* pTestNode = &ThePaths.m_pathNodes[conNode];
+				float angle = CGeneral::GetATanOfXY(pTestNode->GetX() - pCurNode->GetX(), pTestNode->GetY() - pCurNode->GetY());
+				angle = LimitRadianAngle(angle - currentAngle);
+				angle = ABS(angle);
+				if (angle < lowestAngleChange) {
+					lowestAngleChange = angle;
+					newNextNode = conNode;
+					nextLink = i;
+				}
 			}
 		}
-	}else{
+		else {
+			nextLink = 0;
+			newNextNode = pTargetNode[1] - ThePaths.m_pathNodes;
+			for (int i = pCurNode->firstLink; ThePaths.ConnectedNode(i) != newNextNode; i++, nextLink++)
+				;
+		}
+	}
+	else {
 		nextLink = 0;
-		newNextNode = pTargetNode - ThePaths.m_pathNodes;
+		newNextNode = pTargetNode[0] - ThePaths.m_pathNodes;
 		for (int i = pCurNode->firstLink; ThePaths.ConnectedNode(i) != newNextNode; i++, nextLink++)
 			;
 	}
@@ -1793,11 +2040,11 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 	int8 lanesOnNextNode;
 	if (curNode >= pVehicle->AutoPilot.m_nNextRouteNode) {
 		pVehicle->AutoPilot.m_nNextDirection = 1;
-		lanesOnNextNode = pNextLink->numLeftLanes;
+		lanesOnNextNode = pNextLink->numRightLanes;
 	}
 	else {
 		pVehicle->AutoPilot.m_nNextDirection = -1;
-		lanesOnNextNode = pNextLink->numRightLanes;
+		lanesOnNextNode = pNextLink->numLeftLanes;
 	}
 	float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * pCurLink->GetDirX();
 	float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * pCurLink->GetDirY();
@@ -1852,6 +2099,8 @@ void CCarCtrl::PickNextNodeToChaseCar(CVehicle* pVehicle, float targetX, float t
 
 bool CCarCtrl::PickNextNodeToFollowPath(CVehicle* pVehicle)
 {
+	if (pVehicle->m_nRouteSeed)
+		CGeneral::SetRandomSeed(pVehicle->m_nRouteSeed);
 	int curNode = pVehicle->AutoPilot.m_nNextRouteNode;
 	CPathNode* pCurNode = &ThePaths.m_pathNodes[curNode];
 	if (pVehicle->AutoPilot.m_nPathFindNodesCount == 0){
@@ -1944,6 +2193,7 @@ void CCarCtrl::Init(void)
 	LastTimeAmbulanceCreated = 0;
 #ifdef FIX_BUGS
 	LastTimeLawEnforcerCreated = 0;
+	LastTimeMiamiViceGenerated = 0;
 #endif
 	bCarsGeneratedAroundCamera = false;
 	CountDownToCarsAtStart = 2;
@@ -1951,9 +2201,11 @@ void CCarCtrl::Init(void)
 	for (int i = 0; i < MAX_CARS_TO_KEEP; i++)
 		apCarsToKeep[i] = nil;
 	for (int i = 0; i < TOTAL_CUSTOM_CLASSES; i++){
-		for (int j = 0; j < MAX_CAR_MODELS_IN_ARRAY; j++)
-			CarArrays[i][j] = 0;
-		NextCarOfRating[i] = 0;
+		for (int j = 0; j < MAX_CAR_MODELS_IN_ARRAY; j++) {
+			LoadedCarsArray[i][j] = -1;
+		}
+		NumOfLoadedCarsOfRating[i] = 0;
+		NumRequestsOfCarRating[i] = 0;
 		TotalNumOfCarsOfRating[i] = 0;
 	}
 }
@@ -1971,13 +2223,14 @@ void CCarCtrl::ReInit(void)
 	LastTimeFireTruckCreated = 0;
 	LastTimeAmbulanceCreated = 0;
 	LastTimeLawEnforcerCreated = 0;
+	LastTimeMiamiViceGenerated = 0;
 #endif
 	CountDownToCarsAtStart = 2;
 	CarDensityMultiplier = 1.0f;
 	for (int i = 0; i < MAX_CARS_TO_KEEP; i++)
 		apCarsToKeep[i] = nil;
 	for (int i = 0; i < TOTAL_CUSTOM_CLASSES; i++)
-		NextCarOfRating[i] = 0;
+		NumRequestsOfCarRating[i] = 0;
 }
 
 void CCarCtrl::DragCarToPoint(CVehicle* pVehicle, CVector* pPoint)
@@ -2087,7 +2340,7 @@ void CCarCtrl::SteerAICarWithPhysics(CVehicle* pVehicle)
 			pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
 		break;
 	case TEMPACT_HANDBRAKETURNLEFT:
-		swerve = -1.0f; // It seems like this should be swerve = 1.0f (fixed in VC)
+		swerve = 1.0f;
 		accel = 0.0f;
 		brake = 0.0f;
 		handbrake = true;
@@ -2095,7 +2348,7 @@ void CCarCtrl::SteerAICarWithPhysics(CVehicle* pVehicle)
 			pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
 		break;
 	case TEMPACT_HANDBRAKETURNRIGHT:
-		swerve = 1.0f; // It seems like this should be swerve = -1.0f (fixed in VC)
+		swerve = -1.0f;
 		accel = 0.0f;
 		brake = 0.0f;
 		handbrake = true;
@@ -2206,6 +2459,9 @@ void CCarCtrl::SteerAICarWithPhysics_OnlyMission(CVehicle* pVehicle, float* pSwe
 		SteerAICarWithPhysicsTryingToBlockTarget_Stop(pVehicle, FindPlayerCoors().x, FindPlayerCoors().y,
 			FindPlayerSpeed().x, FindPlayerSpeed().y, pSwerve, pAccel, pBrake, pHandbrake);
 		return;
+	case MISSION_WAITFORDELETION:
+	case MISSION_HELI_LAND:
+		return;
 	case MISSION_GOTOCOORDS_STRAIGHT:
 	case MISSION_GOTO_COORDS_STRAIGHT_ACCURATE:
 		SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil,
@@ -2219,6 +2475,12 @@ void CCarCtrl::SteerAICarWithPhysics_OnlyMission(CVehicle* pVehicle, float* pSwe
 		*pHandbrake = true;
 		*pBrake = 0.5f;
 		return;
+	case MISSION_GOTOCOORDS_ASTHECROWSWIMS:
+		SteerAIBoatWithPhysicsHeadingForTarget(pVehicle,
+			pVehicle->AutoPilot.m_vecDestinationCoors.x, pVehicle->AutoPilot.m_vecDestinationCoors.y,
+			pSwerve, pAccel, pBrake);
+		*pHandbrake = false;
+		return;
 	case MISSION_RAMCAR_CLOSE:
 		SteerAICarWithPhysicsHeadingForTarget(pVehicle, pVehicle->AutoPilot.m_pTargetCar,
 			pVehicle->AutoPilot.m_pTargetCar->GetPosition().x, pVehicle->AutoPilot.m_pTargetCar->GetPosition().y,
@@ -2240,26 +2502,132 @@ void CCarCtrl::SteerAICarWithPhysics_OnlyMission(CVehicle* pVehicle, float* pSwe
 			pVehicle->AutoPilot.m_pTargetCar->GetMoveSpeed().y,
 			pSwerve, pAccel, pBrake, pHandbrake);
 		return;
+	case MISSION_HELI_FLYTOCOORS:
+		SteerAIHeliTowardsTargetCoors((CAutomobile*)pVehicle);
+		return;
+	case MISSION_ATTACKPLAYER:
+		SteerAIBoatWithPhysicsAttackingPlayer(pVehicle, pSwerve, pAccel, pBrake, pHandbrake);
+		return;
+	case MISSION_PLANE_FLYTOCOORS:
+		//SteerAIPlaneTowardsTargetCoors((CAutomobile*)pVehicle);
+		return;
+	case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1:
+		SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil,
+			pVehicle->AutoPilot.m_vecDestinationCoors.x, pVehicle->AutoPilot.m_vecDestinationCoors.y,
+			pSwerve, pAccel, pBrake, pHandbrake);
+		return;
+	case MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_2:
+		SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil, FindPlayerCoors().x, FindPlayerCoors().y,
+			pSwerve, pAccel, pBrake, pHandbrake);
+		return;
+	case MISSION_BLOCKPLAYER_FORWARDANDBACK:
+		SteerAICarBlockingPlayerForwardAndBack(pVehicle, pSwerve, pAccel, pBrake, pHandbrake);
+		return;
 	default:
+		assert(0);
 		return;
 	}
 }
 
-void CCarCtrl::SteerAIBoatWithPhysics(CBoat* pBoat)
+void CCarCtrl::SteerAICarBlockingPlayerForwardAndBack(CVehicle* pVehicle, float* pSwerve, float* pAccel, float* pBrake, bool* pHandbrake)
 {
-	if (pBoat->AutoPilot.m_nCarMission == MISSION_GOTOCOORDS_ASTHECROWSWIMS){
-		SteerAIBoatWithPhysicsHeadingForTarget(pBoat,
-			pBoat->AutoPilot.m_vecDestinationCoors.x, pBoat->AutoPilot.m_vecDestinationCoors.y,
-			&pBoat->m_fSteeringLeftRight, &pBoat->m_fAccelerate, &pBoat->m_fBrake);
-	}else if (pBoat->AutoPilot.m_nCarMission == MISSION_NONE){
-		pBoat->m_fSteeringLeftRight = 0.0f;
-		pBoat->m_fAccelerate = 0.0f;
-		pBoat->m_fBrake = 0.0f;
+	*pSwerve = 0.0f;
+	*pHandbrake = false;
+	CVector player = FindPlayerSpeed() + 0.1f * FindPlayerEntity()->GetForward();
+	player.z = 0.0f;
+	CVector right(pVehicle->GetRight().x, pVehicle->GetRight().y, 0.0f);
+	right.Normalise();
+	CVector forward(pVehicle->GetForward().x, pVehicle->GetForward().y, 0.0f);
+	forward.Normalise();
+	float dpPlayerAndRight = DotProduct(player, right);
+	if (dpPlayerAndRight == 0.0f)
+		dpPlayerAndRight = 0.01f;
+	float dpDiffAndRight = -DotProduct((FindPlayerCoors() - pVehicle->GetPosition()), right) / dpPlayerAndRight;
+	if (dpDiffAndRight < 0.0f) {
+		*pAccel = 0.0f;
+		*pBrake = 0.0f;
+		return;
+	}
+	float dpSpeedAndForward = DotProduct(pVehicle->GetMoveSpeed(), forward);
+	float dpPlayerAndForward = DotProduct(player, forward);
+	float dpDiffAndForward = DotProduct((FindPlayerCoors() - pVehicle->GetPosition()), forward);
+	float multiplier = dpPlayerAndForward * dpDiffAndRight + dpDiffAndForward - dpSpeedAndForward * dpDiffAndRight;
+	if (multiplier > 0) {
+		*pAccel = Min(1.0f, 0.1f * multiplier);
+		*pBrake = 0.0f;
 	}
-	pBoat->m_fSteerAngle = pBoat->m_fSteeringLeftRight;
-	pBoat->m_fGasPedal = pBoat->m_fAccelerate;
-	pBoat->m_fBrakePedal = pBoat->m_fBrake;
-	pBoat->bIsHandbrakeOn = false;
+	else if (dpSpeedAndForward > 0) {
+		*pAccel = 0.0f;
+		*pBrake = Min(1.0f, -0.1f * multiplier);
+		if (*pBrake > 0.95f)
+			*pHandbrake = true;
+	}
+	else {
+		*pAccel = Max(-1.0f, 0.1f * multiplier);
+		*pBrake = 0.0f;
+	}
+}
+
+void CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget(CVehicle* pVehicle, float targetX, float targetY, float* pSwerve, float* pAccel, float* pBrake)
+{
+	CVector2D forward = pVehicle->GetForward();
+	forward.Normalise();
+	float angleToTarget = CGeneral::GetATanOfXY(targetX - pVehicle->GetPosition().x, targetY - pVehicle->GetPosition().y);
+	float angleForward = CGeneral::GetATanOfXY(forward.x, forward.y);
+	float steerAngle = LimitRadianAngle(angleToTarget - angleForward);
+	steerAngle = clamp(steerAngle, -DEFAULT_MAX_STEER_ANGLE, DEFAULT_MAX_STEER_ANGLE);
+#ifdef FIX_BUGS
+	float speedTarget = pVehicle->AutoPilot.GetCruiseSpeed();
+#else
+	float speedTarget = pVehicle->AutoPilot.m_nCruiseSpeed;
+#endif
+	float currentSpeed = pVehicle->GetMoveSpeed().Magnitude() * GAME_SPEED_TO_CARAI_SPEED;
+	float speedDiff = speedTarget - currentSpeed;
+	if (speedDiff <= 0.0f) {
+		speedDiff < -5.0f ? *pAccel = -0.2f : *pAccel = -0.1f;
+		steerAngle *= -1;
+	}
+	else if (speedDiff / currentSpeed > 0.25f) {
+		*pAccel = 1.0f;
+	}
+	else {
+		*pAccel = 1.0f - (0.25f - speedDiff / currentSpeed) * 4.0f;
+	}
+	*pBrake = 0.0f;
+	*pSwerve = steerAngle;
+}
+
+void CCarCtrl::SteerAIBoatWithPhysicsAttackingPlayer(CVehicle* pVehicle, float* pSwerve, float* pAccel, float* pBrake, bool* pHandbrake)
+{
+	float distanceToPlayer = (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude();
+	float projection = Min(distanceToPlayer * 0.05f, 2.0f);
+	CVector2D forward = pVehicle->GetForward();
+	forward.Normalise();
+	CVector2D vecToProjection = FindPlayerCoors() + FindPlayerSpeed() * projection * GAME_SPEED_TO_CARAI_SPEED;
+	float angleToTarget = CGeneral::GetATanOfXY(vecToProjection.x - pVehicle->GetPosition().x, vecToProjection.y - pVehicle->GetPosition().y);
+	float angleForward = CGeneral::GetATanOfXY(forward.x, forward.y);
+	float steerAngle = LimitRadianAngle(angleToTarget - angleForward);
+#ifdef FIX_BUGS
+	float speedTarget = pVehicle->AutoPilot.GetCruiseSpeed();
+#else
+	float speedTarget = pVehicle->AutoPilot.m_nCruiseSpeed;
+#endif
+	float currentSpeed = pVehicle->GetMoveSpeed().Magnitude() * GAME_SPEED_TO_CARAI_SPEED;
+	float speedDiff = speedTarget - currentSpeed;
+	if (speedDiff <= 0.0f) {
+		speedDiff < -5.0f ? *pAccel = -0.2f : *pAccel = -0.1f;
+	}
+	else if (speedDiff / currentSpeed > 0.25f) {
+		*pAccel = 1.0f;
+	}
+	else {
+		*pAccel = 1.0f - (0.25f - speedDiff / currentSpeed) * 4.0f;
+	}
+	*pBrake = 0.0f;
+	*pSwerve = steerAngle;
+	*pHandbrake = false;
+	if (pVehicle->GetModelIndex() == MI_PREDATOR && distanceToPlayer < 40.0f && steerAngle < 0.15f)
+		pVehicle->FireFixedMachineGuns();
 }
 
 float CCarCtrl::FindMaxSteerAngle(CVehicle* pVehicle)
@@ -2267,6 +2635,95 @@ float CCarCtrl::FindMaxSteerAngle(CVehicle* pVehicle)
 	return pVehicle->GetModelIndex() == MI_ENFORCER ? 0.7f : DEFAULT_MAX_STEER_ANGLE;
 }
 
+void CCarCtrl::SteerAIHeliTowardsTargetCoors(CAutomobile* pHeli)
+{
+	if (pHeli->m_aWheelSpeed[1] < 0.22f)
+		pHeli->m_aWheelSpeed[1] += 0.001f;
+	if (pHeli->m_aWheelSpeed[1] < 0.22f)
+		return;
+	CVector2D vecToTarget = pHeli->AutoPilot.m_vecDestinationCoors - pHeli->GetPosition();
+	float distanceToTarget = vecToTarget.Magnitude();
+#ifdef FIX_BUGS
+	float speed = pHeli->AutoPilot.GetCruiseSpeed() * 0.01f;
+#else
+	float speed = pHeli->AutoPilot.m_nCruiseSpeed * 0.01f;
+#endif
+	if (distanceToTarget >= 100.0f)
+	{
+		if (distanceToTarget > 75.0f)
+			speed *= 0.7f;
+		else if (distanceToTarget > 10.0f)
+			speed *= 0.4f;
+		else
+			speed *= 0.2f;
+	}
+	vecToTarget.Normalise();
+	CVector2D vecAdvanceThisFrame(vecToTarget * speed);
+	float resistance = Pow(0.997f, CTimer::GetTimeStep());
+	pHeli->m_vecMoveSpeed.x *= resistance;
+	pHeli->m_vecMoveSpeed.y *= resistance;
+	vecAdvanceThisFrame -= pHeli->m_vecMoveSpeed;
+	CVector2D vecSpeedChange = vecAdvanceThisFrame - pHeli->m_vecMoveSpeed;
+	float vecSpeedChangeLength = vecSpeedChange.Magnitude();
+	vecSpeedChange.Normalise();
+	float changeMultiplier = 0.002f * CTimer::GetTimeStep();
+	if (distanceToTarget < 5.0f)
+		changeMultiplier /= 5.0f;
+	if (vecSpeedChangeLength < changeMultiplier)
+		pHeli->AddToMoveSpeed(vecAdvanceThisFrame);
+	else
+		pHeli->AddToMoveSpeed(vecSpeedChange * changeMultiplier);
+	pHeli->SetPosition(pHeli->GetPosition() + CVector(CTimer::GetTimeStep() * pHeli->GetMoveSpeed().x, CTimer::GetTimeStep() * pHeli->GetMoveSpeed().y, 0.0f));
+	float ZTarget = pHeli->AutoPilot.m_vecDestinationCoors.z;
+	if (CTimer::GetTimeInMilliseconds() & 0x800) // switch every ~2 seconds
+		ZTarget += 2.0f;
+	float ZSpeedTarget = (ZTarget - pHeli->GetPosition().z) * 0.01f;
+	float ZSpeedChangeTarget = ZSpeedTarget - pHeli->GetMoveSpeed().z;
+	float ZSpeedChangeMax = 0.01f * CTimer::GetTimeStep();
+	if (!pHeli->bHeliDestroyed) {
+		if (Abs(ZSpeedChangeTarget) < ZSpeedChangeMax)
+			pHeli->SetMoveSpeed(pHeli->GetMoveSpeed().x, pHeli->GetMoveSpeed().y, ZSpeedTarget);
+		else if (ZSpeedChangeTarget < 0.0f)
+			pHeli->AddToMoveSpeed(0.0f, 0.0f, 1.5f * ZSpeedChangeMax);
+		else
+			pHeli->AddToMoveSpeed(0.0f, 0.0f, ZSpeedChangeMax);
+	}
+	pHeli->SetPosition(pHeli->GetPosition() + CVector(0.0f, 0.0f, CTimer::GetTimeStep() * pHeli->GetMoveSpeed().z));
+	pHeli->SetTurnSpeed(pHeli->GetTurnSpeed().x, pHeli->GetTurnSpeed().y, pHeli->GetTurnSpeed().z * Pow(0.99f, CTimer::GetTimeStep()));
+	float ZTurnSpeedTarget;
+	if (distanceToTarget < 8.0f && pHeli->m_fHeliOrientation < 0.0f)
+		ZTurnSpeedTarget = 0.0f;
+	else {
+		float fAngleTarget = CGeneral::GetATanOfXY(vecToTarget.x, vecToTarget.y) + PI;
+		if (pHeli->m_fHeliOrientation >= 0.0f)
+			fAngleTarget = pHeli->m_fHeliOrientation;
+		while (fAngleTarget < -PI)
+			fAngleTarget += TWOPI;
+		while (fAngleTarget > PI)
+			fAngleTarget -= TWOPI;
+		if (Abs(fAngleTarget) <= 0.4f)
+			ZTurnSpeedTarget = 0.0f;
+		else if (fAngleTarget < 0.0f)
+			ZTurnSpeedTarget = 0.03f;
+		else
+			ZTurnSpeedTarget = -0.03f;
+	}
+	float ZTurnSpeedChangeTarget = ZTurnSpeedTarget - pHeli->GetTurnSpeed().z;
+	pHeli->m_fOrientation += pHeli->GetTurnSpeed().z * CTimer::GetTimeStep();
+	CVector up;
+	if (pHeli->bHeliMinimumTilt)
+		up = CVector(0.5f * pHeli->GetMoveSpeed().x, 0.5f * pHeli->GetMoveSpeed().y, 1.0f);
+	else
+		up = CVector(3.0f * pHeli->GetMoveSpeed().x, 3.0f * pHeli->GetMoveSpeed().y, 1.0f);
+	up.Normalise();
+	CVector forward(Sin(pHeli->m_fOrientation), Cos(pHeli->m_fOrientation), 0.0f);
+	CVector right = CrossProduct(up, forward);
+	forward = CrossProduct(up, right);
+	pHeli->GetMatrix().GetRight() = right;
+	pHeli->GetMatrix().GetForward() = forward;
+	pHeli->GetMatrix().GetUp() = up;
+}
+
 void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerve, float* pAccel, float* pBrake, bool* pHandbrake)
 {
 	CVector2D forward = pVehicle->GetForward();
@@ -2294,18 +2751,12 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
 		if (PickNextNodeAccordingStrategy(pVehicle)) {
 			switch (pVehicle->AutoPilot.m_nCarMission){
 			case MISSION_GOTOCOORDS:
-				pVehicle->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_STRAIGHT;
-				*pSwerve = 0.0f;
-				*pAccel = 0.0f;
-				*pBrake = 0.0f;
-				*pHandbrake = false;
+				SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil, pVehicle->AutoPilot.m_vecDestinationCoors.x,
+					pVehicle->AutoPilot.m_vecDestinationCoors.y, pSwerve, pAccel, pBrake, pHandbrake);
 				return;
 			case MISSION_GOTOCOORDS_ACCURATE:
-				pVehicle->AutoPilot.m_nCarMission = MISSION_GOTO_COORDS_STRAIGHT_ACCURATE;
-				*pSwerve = 0.0f;
-				*pAccel = 0.0f;
-				*pBrake = 0.0f;
-				*pHandbrake = false;
+				SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil, pVehicle->AutoPilot.m_vecDestinationCoors.x,
+					pVehicle->AutoPilot.m_vecDestinationCoors.y, pSwerve, pAccel, pBrake, pHandbrake);
 				return;
 			default: break;
 			}
@@ -2342,6 +2793,7 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
 	switch (pVehicle->AutoPilot.m_nDrivingStyle) {
 	case DRIVINGSTYLE_STOP_FOR_CARS:
 	case DRIVINGSTYLE_SLOW_DOWN_FOR_CARS:
+	case DRIVINGSTYLE_STOP_FOR_CARS_IGNORE_LIGHTS:
 		speedStyleMultiplier = FindMaximumSpeedForThisCarInTraffic(pVehicle) / pVehicle->AutoPilot.m_nCruiseSpeed;
 		break;
 	default:
@@ -2447,6 +2899,7 @@ void CCarCtrl::SteerAICarWithPhysicsTryingToBlockTarget(CVehicle* pVehicle, floa
 		pVehicle->AutoPilot.m_nCarMission = (pVehicle->AutoPilot.m_nCarMission == MISSION_BLOCKCAR_CLOSE) ?
 			MISSION_BLOCKCAR_HANDBRAKESTOP : MISSION_BLOCKPLAYER_HANDBRAKESTOP;
 }
+
 void CCarCtrl::SteerAICarWithPhysicsTryingToBlockTarget_Stop(CVehicle* pVehicle, float targetX, float targetY, float targetSpeedX, float targetSpeedY, float* pSwerve, float* pAccel, float* pBrake, bool* pHandbrake)
 {
 	*pSwerve = 0.0f;
@@ -2488,26 +2941,6 @@ void CCarCtrl::SteerAICarWithPhysicsTryingToBlockTarget_Stop(CVehicle* pVehicle,
 	}
 }
 
-void CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget(CBoat* pBoat, float targetX, float targetY, float* pSwerve, float* pAccel, float* pBrake)
-{
-	CVector2D forward(pBoat->GetForward());
-	forward.Normalise();
-	CVector2D distanceToTarget = CVector2D(targetX, targetY) - pBoat->GetPosition();
-	float angleToTarget = CGeneral::GetATanOfXY(distanceToTarget.x, distanceToTarget.y);
-	float angleForward = CGeneral::GetATanOfXY(forward.x, forward.y);
-	float angleDiff = LimitRadianAngle(angleToTarget - angleForward);
-	angleDiff = Min(DEFAULT_MAX_STEER_ANGLE, Max(-DEFAULT_MAX_STEER_ANGLE, angleDiff));
-	float currentSpeed = pBoat->GetMoveSpeed().Magnitude2D(); // +0.0f for some reason
-	float speedDiff = pBoat->AutoPilot.m_nCruiseSpeed - currentSpeed * 60.0f;
-	if (speedDiff > 0.0f){
-		float accRemaining = speedDiff / pBoat->AutoPilot.m_nCruiseSpeed;
-		*pAccel = (accRemaining > 0.25f) ? 1.0f : 1.0f - (0.25f - accRemaining) * 4.0f;
-	}else
-		*pAccel = (speedDiff < -5.0f) ? -0.2f : -0.1f;
-	*pBrake = 0.0f;
-	*pSwerve = angleDiff;
-}
-
 void
 CCarCtrl::RegisterVehicleOfInterest(CVehicle* pVehicle)
 {
@@ -2629,6 +3062,8 @@ bool CCarCtrl::JoinCarWithRoadSystemGotoCoors(CVehicle* pVehicle, CVector vecTar
 
 void CCarCtrl::FindLinksToGoWithTheseNodes(CVehicle* pVehicle)
 {
+	if (pVehicle->m_nRouteSeed)
+		CGeneral::SetRandomSeed(pVehicle->m_nRouteSeed);
 	int nextLink;
 	CPathNode* pCurNode = &ThePaths.m_pathNodes[pVehicle->AutoPilot.m_nCurrentRouteNode];
 	for (nextLink = 0; nextLink < 12; nextLink++)
@@ -2642,11 +3077,23 @@ void CCarCtrl::FindLinksToGoWithTheseNodes(CVehicle* pVehicle)
 		curLink = 0;
 		curConnection = ThePaths.m_carPathConnections[pCurNode->firstLink];
 	}else{
-		curConnection = pVehicle->AutoPilot.m_nNextPathNodeInfo;
-		while (curConnection == pVehicle->AutoPilot.m_nNextPathNodeInfo){
-			curLink = CGeneral::GetRandomNumber() % pCurNode->numLinks;
-			curConnection = ThePaths.m_carPathConnections[curLink + pCurNode->firstLink];
+		int closestLink = -1;
+		float md = 999999.9f;
+
+		for (curLink = 0; curLink < pCurNode->numLinks; curLink++) {
+			int node = ThePaths.ConnectedNode(curLink + pCurNode->firstLink);
+			CPathNode* pNode = &ThePaths.m_pathNodes[node];
+			if (node == pVehicle->AutoPilot.m_nNextRouteNode)
+				continue;
+			CVector vCurPos = pCurNode->GetPosition();
+			CVector vNextPos = pNode->GetPosition();
+			float dist = CCollision::DistToLine(&vCurPos, &vNextPos, &pVehicle->GetPosition());
+			if (dist < md) {
+				md = dist;
+				closestLink = curLink;
+			}
 		}
+		curConnection = ThePaths.m_carPathConnections[closestLink + pCurNode->firstLink];
 	}
 	pVehicle->AutoPilot.m_nCurrentPathNodeInfo = curConnection;
 	pVehicle->AutoPilot.m_nCurrentDirection = (ThePaths.ConnectedNode(curLink + pCurNode->firstLink) >= pVehicle->AutoPilot.m_nCurrentRouteNode) ? 1 : -1;
@@ -2656,6 +3103,8 @@ void CCarCtrl::GenerateEmergencyServicesCar(void)
 {
 	if (FindPlayerPed()->m_pWanted->m_nWantedLevel > 3)
 		return;
+	if (CGame::IsInInterior())
+		return;
 	if (NumFiretrucksOnDuty + NumAmbulancesOnDuty + NumParkedCars + NumMissionCars +
 		NumLawEnforcerCars + NumRandomCars > MaxNumberOfCarsInUse)
 		return;
@@ -2711,9 +3160,11 @@ bool CCarCtrl::GenerateOneEmergencyServicesCar(uint32 mi, CVector vecPos)
 		if (ThePaths.NewGenerateCarCreationCoors(pPlayerPos.x, pPlayerPos.y, 0.707f, 0.707f,
 		  120.0f, -1.0f, true, &spawnPos, &curNode, &nextNode, &posBetweenNodes, false)){
 			int16 colliding[2];
-			CWorld::FindObjectsKindaColliding(spawnPos, 10.0f, true, colliding, 2, nil, false, true, true, false, false);
-			if (colliding[0] == 0)
-				created = true;
+			if (!ThePaths.GetNode(curNode)->bWaterPath) {
+				CWorld::FindObjectsKindaColliding(spawnPos, 10.0f, true, colliding, 2, nil, false, true, true, false, false);
+				if (colliding[0] == 0)
+					created = true;
+			}
 		}
 		attempts += 1;
 	}
@@ -2772,18 +3223,24 @@ void CCarCtrl::UpdateCarCount(CVehicle* pVehicle, bool remove)
 	if (remove){
 		switch (pVehicle->VehicleCreatedBy){
 		case RANDOM_VEHICLE:
-			if (pVehicle->bIsLawEnforcer)
-				--NumLawEnforcerCars;
-			--NumRandomCars;
+			if (pVehicle->bIsLawEnforcer) {
+				if (--NumLawEnforcerCars < 0)
+					NumLawEnforcerCars = 0;
+			}
+			if (--NumRandomCars < 0)
+				NumRandomCars = 0;
 			return;
 		case MISSION_VEHICLE:
-			--NumMissionCars;
+			if (--NumMissionCars < 0)
+				NumMissionCars = 0;
 			return;
 		case PARKED_VEHICLE:
-			--NumParkedCars;
+			if (--NumParkedCars < 0)
+				NumParkedCars = 0;
 			return;
 		case PERMANENT_VEHICLE:
-			--NumPermanentCars;;
+			if (--NumPermanentCars < 0)
+				NumPermanentCars = 0;
 			return;
 		}
 	}
@@ -2801,7 +3258,7 @@ void CCarCtrl::UpdateCarCount(CVehicle* pVehicle, bool remove)
 			++NumParkedCars;
 			return;
 		case PERMANENT_VEHICLE:
-			++NumPermanentCars;;
+			++NumPermanentCars;
 			return;
 		}
 	}
@@ -2809,12 +3266,30 @@ void CCarCtrl::UpdateCarCount(CVehicle* pVehicle, bool remove)
 
 bool CCarCtrl::ThisRoadObjectCouldMove(int16 mi)
 {
+#ifdef GTA_BRIDGE
 	return mi == MI_BRIDGELIFT || mi == MI_BRIDGEROADSEGMENT;
+#else
+	return false;
+#endif
 }
 
 bool CCarCtrl::MapCouldMoveInThisArea(float x, float y)
 {
+#ifdef GTA_BRIDGE	// actually they forgot that in VC...
 	// bridge moves up and down
 	return x > -342.0f && x < -219.0f &&
 		y > -677.0f && y < -580.0f;
+#else
+	return false;
+#endif
+}
+
+float CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(int8 type)
+{
+	switch (type)
+	{
+	case 1: return 1.5f;
+	case 2: return 2.0f;
+	}
+	return 1.0f;
 }
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h
index 457224fb..6b4e94ee 100644
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -9,14 +9,13 @@
 #define TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING 2500
 
 class CZoneInfo;
+class CAutomobile;
 
 enum{
 	MAX_CARS_TO_KEEP = 2,
-	MAX_CAR_MODELS_IN_ARRAY = 256,
+	MAX_CAR_MODELS_IN_ARRAY = 25,
 };
 
-#define LANE_WIDTH 5.0f
-
 #ifdef FIX_BUGS
 #define FIX_PATHFIND_BUG
 #endif
@@ -25,24 +24,37 @@ class CCarCtrl
 {
 public:
 	enum eCarClass {
-		POOR = 0,
+		NORMAL = 0,
+		POOR,
 		RICH,
 		EXEC,
 		WORKER,
-		SPECIAL,
 		BIG,
 		TAXI,
-		TOTAL_CUSTOM_CLASSES,
-		MAFIA,
-		TRIAD,
-		DIABLO,
-		YAKUZA,
-		YARDIE,
-		COLOMB,
-		NINES,
-		GANG8,
+		MOPED,
+		MOTORBIKE,
+
+		LEISUREBOAT,
+		WORKERBOAT,
+
+		COPS,
+		CUBAN,
+		HAITIAN,
+		STREET,
+		DIAZ,
+		BIKER,
+		SECURITY,
+		PLAYER,
+		GOLFERS,
 		GANG9,
-		COPS
+		COPS_BOAT,
+		FIRST_CAR_RATING = NORMAL,
+		FIRST_BOAT_RATING = LEISUREBOAT,
+		FIRST_GANG_CAR_RATING = CUBAN,
+		NUM_CAR_CLASSES = MOTORBIKE - FIRST_CAR_RATING + 1,
+		NUM_BOAT_CLASSES = WORKERBOAT - FIRST_BOAT_RATING + 1,
+		NUM_GANG_CAR_CLASSES = GANG9 - FIRST_GANG_CAR_RATING + 1,
+		TOTAL_CUSTOM_CLASSES = NUM_CAR_CLASSES + NUM_BOAT_CLASSES
 	};
 
 	static void SwitchVehicleToRealPhysics(CVehicle*);
@@ -94,17 +106,29 @@ public:
 	static float FindSpeedMultiplier(float, float, float, float);
 	static void SteerAICarWithPhysics(CVehicle*);
 	static void SteerAICarWithPhysics_OnlyMission(CVehicle*, float*, float*, float*, bool*);
-	static void SteerAIBoatWithPhysics(CBoat*);
 	static float FindMaxSteerAngle(CVehicle*);
 	static void SteerAICarWithPhysicsFollowPath(CVehicle*, float*, float*, float*, bool*);
 	static void SteerAICarWithPhysicsHeadingForTarget(CVehicle*, CPhysical*, float, float, float*, float*, float*, bool*);
 	static void SteerAICarWithPhysicsTryingToBlockTarget(CVehicle*, float, float, float, float, float*, float*, float*, bool*);
 	static void SteerAICarWithPhysicsTryingToBlockTarget_Stop(CVehicle*, float, float, float, float, float*, float*, float*, bool*);
-	static void SteerAIBoatWithPhysicsHeadingForTarget(CBoat*, float, float, float*, float*, float*);
 	static bool ThisRoadObjectCouldMove(int16);
 	static void ClearInterestingVehicleList();
 	static void FindLinksToGoWithTheseNodes(CVehicle*);
 	static bool GenerateOneEmergencyServicesCar(uint32, CVector);
+	static float FindSpeedMultiplierWithSpeedFromNodes(int8);
+	static int32 ChooseBoatModel(int32);
+	static int32 ChooseBoatRating(CZoneInfo* pZoneInfo);
+	static int32 ChooseCarRating(CZoneInfo* pZoneInfo);
+	static void AddToLoadedVehicleArray(int32 mi, int32 rating, int32 freq);
+	static void RemoveFromLoadedVehicleArray(int32 mi, int32 rating);
+	static int32 ChooseCarModelToLoad(int32 rating);
+	static bool BoatWithTallMast(int32 mi);
+	static void RemoveCarsIfThePoolGetsFull(void);
+	static void SteerAIBoatWithPhysicsHeadingForTarget(CVehicle*, float, float, float*, float*, float*);
+	static void SteerAIHeliTowardsTargetCoors(CAutomobile*);
+	static void SteerAIPlaneTowardsTargetCoors(CAutomobile*);
+	static void SteerAIBoatWithPhysicsAttackingPlayer(CVehicle*, float*, float*, float*, bool*);
+	static void SteerAICarBlockingPlayerForwardAndBack(CVehicle*, float*, float*, float*, bool*);
 
 	static float GetPositionAlongCurrentCurve(CVehicle* pVehicle)
 	{
@@ -136,8 +160,14 @@ public:
 	static uint32 LastTimeFireTruckCreated;
 	static uint32 LastTimeAmbulanceCreated;
 	static int32 TotalNumOfCarsOfRating[TOTAL_CUSTOM_CLASSES];
-	static int32 NextCarOfRating[TOTAL_CUSTOM_CLASSES];
 	static int32 CarArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
+
+	static int32 MiamiViceCycle;
+	static uint32 LastTimeMiamiViceGenerated;
+	static int32 NumRequestsOfCarRating[TOTAL_CUSTOM_CLASSES];
+	static int32 NumOfLoadedCarsOfRating[TOTAL_CUSTOM_CLASSES];
+	static int32 CarFreqArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
+	static int32 LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
 };
 
 extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
\ No newline at end of file
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index 0a01a7aa..29471608 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -2,6 +2,8 @@
 
 #include "Curves.h"
 
+//--MIAMI: file done
+
 float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y)
 {
 	CVector2D dir1(dir1X, dir1Y);
@@ -11,7 +13,7 @@ float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float di
 	if (dp > 0.9f)
 		return distance + Abs((pPoint1->x * dir1Y - pPoint1->y * dir1X) - (pPoint2->x * dir1Y - pPoint2->y * dir1X));
 	else
-		return ((1.0f - dp) * 0.2f + 1.0f) * distance;
+		return ((1.0f - dp) * 0.25f + 1.0f) * distance;
 }
 
 void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVector* pDir2, float between, int32 timeOnCurve, CVector* pOutPos, CVector* pOutDir)
@@ -19,7 +21,21 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe
 	float actualFactor = CalcSpeedScaleFactor(pPos1, pPos2, pDir1->x, pDir1->y, pDir2->x, pDir2->y);
 	CVector2D dir1 = *pDir1 * actualFactor;
 	CVector2D dir2 = *pDir2 * actualFactor;
-	float curveCoef = 0.5f - 0.5f * Cos(3.1415f * between);
+	float t1 = Abs(DotProduct2D(*pPos1 - *pPos2, *pDir1));
+	float t2 = Abs(DotProduct2D(*pPos2 - *pPos1, *pDir2));
+	float curveCoef;
+	if (t1 > t2) {
+		if (between < (t1 - t2) / (t1 + t2))
+			curveCoef = 0.0f;
+		else
+			curveCoef = 0.5f - 0.5f * Cos(3.1415f * (t1 + t2) / (2 * t2) * (between - (t1 - t2) / (t1 + t2)));
+	}
+	else {
+		if (2 * t1 / (t1 + t2) < between)
+			curveCoef = 1.0f;
+		else
+			curveCoef = 0.5f - 0.5f * Cos(3.1415f * between * (t1 + t2) / (2 * t1));
+	}
 	*pOutPos = CVector(
 		(pPos1->x + between * dir1.x) * (1.0f - curveCoef) + (pPos2->x - (1 - between) * dir2.x) * curveCoef,
 		(pPos1->y + between * dir1.y) * (1.0f - curveCoef) + (pPos2->y - (1 - between) * dir2.y) * curveCoef,
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index 5e87aaec..f00486e8 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -13,6 +13,7 @@
 #include "Font.h"
 #include "Text.h"
 #include "Vehicle.h"
+#include "GameLogic.h"
 
 #define FRENZY_ANY_PED -1
 #define FRENZY_ANY_CAR -2
@@ -246,6 +247,8 @@ CDarkel::ResetOnPlayerDeath()
 void
 CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 modelId0, wchar *text, int32 modelId2, int32 modelId3, int32 modelId4, bool standardSound, bool needHeadShot)
 {
+	CGameLogic::ClearShortCut();
+	CGameLogic::RemoveShortCutDropOffPointForMission();
 	eWeaponType fixedWeapon;
 	if (weaponType == WEAPONTYPE_UZI_DRIVEBY)
 		fixedWeapon = WEAPONTYPE_UZI;
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index ae26dd05..a98315e2 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -19,13 +19,42 @@
 #include "Fire.h"
 #include "Script.h"
 #include "Garages.h"
+#include "Population.h"
+#include "General.h"
+#include "DMAudio.h"
+#include "Radar.h"
+#include "Pools.h"
+#include "Hud.h"
+#include "Particle.h"
+#include "ColStore.h"
+#include "Automobile.h"
 
 uint8 CGameLogic::ActivePlayers;
+uint8 CGameLogic::ShortCutState;
+CAutomobile* CGameLogic::pShortCutTaxi;
+uint32 CGameLogic::NumAfterDeathStartPoints;
+CVector CGameLogic::ShortCutStart;
+float CGameLogic::ShortCutStartOrientation;
+CVector CGameLogic::ShortCutDestination;
+float CGameLogic::ShortCutDestinationOrientation;
+uint32 CGameLogic::ShortCutTimer;
+CVector CGameLogic::AfterDeathStartPoints[NUM_SHORTCUT_START_POINTS];
+float CGameLogic::AfterDeathStartPointOrientation[NUM_SHORTCUT_START_POINTS];
+CVector CGameLogic::ShortCutDropOffForMission;
+float CGameLogic::ShortCutDropOffOrientationForMission;
+bool CGameLogic::MissionDropOffReadyToBeUsed;
+
+//--MIAMI: file done except TODO
+
+#define SHORTCUT_TAXI_COST (9)
 
 void
 CGameLogic::InitAtStartOfGame()
 {
 	ActivePlayers = 1;
+	ShortCutState = SHORTCUT_NONE;
+	pShortCutTaxi = nil;
+	NumAfterDeathStartPoints = 0;
 }
 
 void
@@ -58,7 +87,10 @@ CGameLogic::SortOutStreamingAndMemory(const CVector &pos)
 	CStreaming::DeleteRwObjectsAfterDeath(pos);
 	CStreaming::RemoveUnusedModelsInLoadedList();
 	CGame::DrasticTidyUpMemory(true);
+	CWorld::Players[CWorld::PlayerInFocus].m_pPed->Undress("player");
+	CStreaming::LoadSceneCollision(pos);
 	CStreaming::LoadScene(pos);
+	CWorld::Players[CWorld::PlayerInFocus].m_pPed->Dress();
 	CTimer::Update();
 }
 
@@ -70,7 +102,9 @@ CGameLogic::Update()
 
 	if (CCutsceneMgr::IsCutsceneProcessing()) return;
 
+	UpdateShortCut();
 	CPlayerInfo &pPlayerInfo = CWorld::Players[CWorld::PlayerInFocus];
+
 	switch (pPlayerInfo.m_WBState) {
 	case WBSTATE_PLAYING:
 		if (pPlayerInfo.m_pPed->m_nPedState == PED_DEAD) {
@@ -101,7 +135,7 @@ CGameLogic::Update()
 			if (pPlayerInfo.m_bGetOutOfHospitalFree) {
 				pPlayerInfo.m_bGetOutOfHospitalFree = false;
 			} else {
-				pPlayerInfo.m_nMoney = Max(0, pPlayerInfo.m_nMoney - 1000);
+				pPlayerInfo.m_nMoney = Max(0, pPlayerInfo.m_nMoney - 100);
 				pPlayerInfo.m_pPed->ClearWeapons();
 			}
 
@@ -125,17 +159,20 @@ CGameLogic::Update()
 			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
+			AfterDeathArrestSetUpShortCutTaxi();
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
 			TheCamera.m_fCamShakeForce = 0.0f;
 			TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
 			CPad::GetPad(0)->StopShaking(0);
 			CReferences::RemoveReferencesToPlayer();
-			CCarCtrl::CountDownToCarsAtStart = 2;
+			CPopulation::m_CountDownToPedsAtStart = 10;
+			CCarCtrl::CountDownToCarsAtStart = 10;
 			CPad::GetPad(CWorld::PlayerInFocus)->DisablePlayerControls = PLAYERCONTROL_ENABLED;
 			if (CRestart::bFadeInAfterNextDeath) { 
 				TheCamera.SetFadeColour(200, 200, 200);
 				TheCamera.Fade(4.0f, FADE_IN);
-			} else CRestart::bFadeInAfterNextDeath = true;
+			} else
+				CRestart::bFadeInAfterNextDeath = true;
 		}
 		break;
 	case WBSTATE_BUSTED:
@@ -147,11 +184,35 @@ CGameLogic::Update()
 			TheCamera.SetFadeColour(0, 0, 0);
 			TheCamera.Fade(2.0f, FADE_OUT);
 		}
+
+
+		if (!CTheScripts::IsPlayerOnAMission() && pPlayerInfo.m_nBustedAudioStatus == 0) {
+			if (CGeneral::GetRandomNumberInRange(0, 4) == 0)
+				pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_DONE;
+			else {
+				pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_LOADING;
+				char name[12];
+				sprintf(name, pPlayerInfo.m_nCurrentBustedAudio >= 10 ? "bust_%d" : "bust_0%d", pPlayerInfo.m_nCurrentBustedAudio);
+				DMAudio.ClearMissionAudio(); // TODO(MIAMI): argument is 0
+				DMAudio.PreloadMissionAudio(name); // TODO(MIAMI): argument is 0
+				pPlayerInfo.m_nCurrentBustedAudio = pPlayerInfo.m_nCurrentBustedAudio % 28 + 1; // enum? const? TODO
+			}
+		}
+		if (CTimer::GetTimeInMilliseconds() - pPlayerInfo.m_nWBTime > 4000 &&
+			pPlayerInfo.m_nBustedAudioStatus == BUSTEDAUDIO_LOADING &&
+			DMAudio.GetMissionAudioLoadingStatus() == 1) { // TODO: argument is 0
+			DMAudio.PlayLoadedMissionAudio(); // TODO: argument is 0
+			pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_DONE;
+		}
+		
 #ifdef MISSION_REPLAY
 		if (CTimer::GetTimeInMilliseconds() - pPlayerInfo.m_nWBTime >= AddExtraDeathDelay() + 0x1000) {
 #else
 		if (CTimer::GetTimeInMilliseconds() - pPlayerInfo.m_nWBTime >= 0x1000) {
 #endif
+#ifdef FIX_BUGS
+			pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
+#endif
 			pPlayerInfo.m_WBState = WBSTATE_PLAYING;
 			int takeMoney;
 
@@ -204,18 +265,21 @@ CGameLogic::Update()
 			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
+			AfterDeathArrestSetUpShortCutTaxi();
 			pPlayerInfo.m_pPed->ClearWeapons();
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
 			TheCamera.m_fCamShakeForce = 0.0f;
 			TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
 			CPad::GetPad(0)->StopShaking(0);
 			CReferences::RemoveReferencesToPlayer();
-			CCarCtrl::CountDownToCarsAtStart = 2;
+			CPopulation::m_CountDownToPedsAtStart = 10;
+			CCarCtrl::CountDownToCarsAtStart = 10;
 			CPad::GetPad(CWorld::PlayerInFocus)->DisablePlayerControls = PLAYERCONTROL_ENABLED;
 			if (CRestart::bFadeInAfterNextArrest) {
 				TheCamera.SetFadeColour(0, 0, 0);
 				TheCamera.Fade(4.0f, FADE_IN);
-			} else CRestart::bFadeInAfterNextArrest = true;
+			} else
+				CRestart::bFadeInAfterNextArrest = true;
 		}
 		break;
 	case WBSTATE_FAILED_CRITICAL_MISSION:
@@ -257,7 +321,8 @@ CGameLogic::Update()
 			TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
 			CPad::GetPad(0)->StopShaking(0);
 			CReferences::RemoveReferencesToPlayer();
-			CCarCtrl::CountDownToCarsAtStart = 2;
+			CPopulation::m_CountDownToPedsAtStart = 10;
+			CCarCtrl::CountDownToCarsAtStart = 10;
 			CPad::GetPad(CWorld::PlayerInFocus)->DisablePlayerControls = PLAYERCONTROL_ENABLED;
 			TheCamera.SetFadeColour(0, 0, 0);
 			TheCamera.Fade(4.0f, FADE_IN);
@@ -271,11 +336,14 @@ CGameLogic::Update()
 void
 CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector pos, float angle)
 {
-	pPlayerPed->m_fHealth = 100.0f;
+	ClearShortCut();
+	CPlayerInfo* pPlayerInfo = pPlayerPed->GetPlayerInfoForThisPlayerPed();
+	pPlayerPed->m_fHealth = pPlayerInfo->m_nMaxHealth;
 	pPlayerPed->m_fArmour = 0.0f;
 	pPlayerPed->bIsVisible = true;
 	pPlayerPed->m_bloodyFootprintCountOrDeathTime = 0;
 	pPlayerPed->bDoBloodyFootprints = false;
+	//TODO(MIAMI): clear drunk stuff
 	pPlayerPed->ClearAdrenaline();
 	pPlayerPed->m_fCurrentStamina = pPlayerPed->m_fMaxStamina;
 	if (pPlayerPed->m_pFire)
@@ -284,27 +352,258 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
 	pPlayerPed->m_pMyVehicle = nil;
 	pPlayerPed->m_pVehicleAnim = nil;
 	pPlayerPed->m_pWanted->Reset();
+	pPlayerPed->bCancelEnteringCar = false;
 	pPlayerPed->RestartNonPartialAnims();
-	pPlayerPed->GetPlayerInfoForThisPlayerPed()->MakePlayerSafe(false);
+	pPlayerInfo->MakePlayerSafe(false);
 	pPlayerPed->bRemoveFromWorld = false;
 	pPlayerPed->ClearWeaponTarget();
 	pPlayerPed->SetInitialState();
 	CCarCtrl::ClearInterestingVehicleList();
-
-	pos.z += 1.0f;
-	pPlayerPed->Teleport(pos);
-	pPlayerPed->SetMoveSpeed(CVector(0.0f, 0.0f, 0.0f));
-
+	pPlayerPed->Teleport(pos + CVector(0.0f, 0.0f, 1.0f));
+	pPlayerPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
 	pPlayerPed->m_fRotationCur = DEGTORAD(angle);
 	pPlayerPed->m_fRotationDest = pPlayerPed->m_fRotationCur;
 	pPlayerPed->SetHeading(pPlayerPed->m_fRotationCur);
 	CTheScripts::ClearSpaceForMissionEntity(pos, pPlayerPed);
 	CWorld::ClearExcitingStuffFromArea(pos, 4000.0, 1);
 	pPlayerPed->RestoreHeadingRate();
+	CGame::currArea = AREA_MAIN_MAP;
+	//CStreaming::RemoveBuildingsNotInArea(0); // TODO(MIAMI)
 	TheCamera.SetCameraDirectlyInFrontForFollowPed_CamOnAString();
+	TheCamera.Restore();
 	CReferences::RemoveReferencesToPlayer();
 	CGarages::PlayerArrestedOrDied();
 	CStats::CheckPointReachedUnsuccessfully();
 	CWorld::Remove(pPlayerPed);
 	CWorld::Add(pPlayerPed);
+	//CHud::ResetWastedText() // TODO(MIAMI)
+	CStreaming::StreamZoneModels(pos);
+	clearWaterDrop = true;
+}
+
+void
+CGameLogic::ClearShortCut()
+{
+	if (pShortCutTaxi) {
+		if (pShortCutTaxi->VehicleCreatedBy == MISSION_VEHICLE) {
+			pShortCutTaxi->VehicleCreatedBy = RANDOM_VEHICLE;
+			--CCarCtrl::NumMissionCars;
+			++CCarCtrl::NumRandomCars;
+		}
+		CRadar::ClearBlipForEntity(BLIP_CAR, CPools::GetVehiclePool()->GetIndex(pShortCutTaxi));
+		pShortCutTaxi = nil;
+	}
+	CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_SHORTCUT_TAXI);
+}
+
+void
+CGameLogic::SetUpShortCut(CVector vStartPos, float fStartAngle, CVector vEndPos, float fEndAngle)
+{
+	ClearShortCut();
+	ShortCutState = SHORTCUT_INIT;
+	ShortCutStart = vStartPos;
+	ShortCutStartOrientation = fStartAngle;
+	ShortCutDestination = vEndPos;
+	ShortCutDestinationOrientation = fEndAngle;
+	CStreaming::RequestModel(MI_KAUFMAN, 0);
+}
+
+void
+CGameLogic::AbandonShortCutIfTaxiHasBeenMessedWith()
+{
+	if (!pShortCutTaxi)
+		return;
+	if (pShortCutTaxi->pDriver == nil ||
+		pShortCutTaxi->pDriver->DyingOrDead() ||
+		pShortCutTaxi->pDriver->GetPedState() == PED_DRAG_FROM_CAR ||
+		pShortCutTaxi->pDriver->GetPedState() == PED_ON_FIRE ||
+		pShortCutTaxi->pDriver->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE ||
+		pShortCutTaxi->m_fHealth < 250.0f ||
+		pShortCutTaxi->bRenderScorched)
+		ClearShortCut();
+}
+
+void
+CGameLogic::AbandonShortCutIfPlayerMilesAway()
+{
+	if (!pShortCutTaxi)
+		return;
+	if ((FindPlayerCoors() - pShortCutTaxi->GetPosition()).Magnitude() > 120.0f)
+		ClearShortCut();
+}
+
+void
+CGameLogic::UpdateShortCut()
+{
+	switch (ShortCutState) {
+	case SHORTCUT_INIT:
+		if (!CStreaming::HasModelLoaded(MI_KAUFMAN)) {
+			CStreaming::RequestModel(MI_KAUFMAN, 0);
+			return;
+		}
+		pShortCutTaxi = new CAutomobile(MI_KAUFMAN, RANDOM_VEHICLE);
+		if (!pShortCutTaxi)
+			return;
+		pShortCutTaxi->SetPosition(ShortCutStart);
+		pShortCutTaxi->SetHeading(DEGTORAD(ShortCutStartOrientation));
+		pShortCutTaxi->PlaceOnRoadProperly();
+		pShortCutTaxi->SetStatus(STATUS_PHYSICS);
+		pShortCutTaxi->AutoPilot.m_nCarMission = MISSION_STOP_FOREVER;
+		pShortCutTaxi->AutoPilot.m_nCruiseSpeed = 0;
+		pShortCutTaxi->SetUpDriver();
+		pShortCutTaxi->VehicleCreatedBy = MISSION_VEHICLE;
+		++CCarCtrl::NumMissionCars;
+		--CCarCtrl::NumRandomCars;
+		CTheScripts::ClearSpaceForMissionEntity(ShortCutStart, pShortCutTaxi);
+		CWorld::Add(pShortCutTaxi);
+		CRadar::SetEntityBlip(BLIP_CAR, CPools::GetVehiclePool()->GetIndex(pShortCutTaxi), 0, BLIP_DISPLAY_MARKER_ONLY);
+		ShortCutState = SHORTCUT_IDLE;
+		break;
+	case SHORTCUT_IDLE:
+		if (FindPlayerPed()->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && FindPlayerPed()->m_carInObjective == pShortCutTaxi) {
+			CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_SHORTCUT_TAXI);
+			FindPlayerPed()->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, pShortCutTaxi);
+			ShortCutState = SHORTCUT_GETTING_IN;
+		}
+		AbandonShortCutIfTaxiHasBeenMessedWith();
+		AbandonShortCutIfPlayerMilesAway();
+		break;
+	case SHORTCUT_GETTING_IN:
+		if (pShortCutTaxi->pPassengers[0] == FindPlayerPed() ||
+			pShortCutTaxi->pPassengers[1] == FindPlayerPed() ||
+			pShortCutTaxi->pPassengers[2] == FindPlayerPed()) {
+			pShortCutTaxi->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+			pShortCutTaxi->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 2500;
+			TheCamera.SetFadeColour(0, 0, 0);
+			TheCamera.Fade(2.5f, 0);
+			ShortCutState = SHORTCUT_TRANSITION;
+			ShortCutTimer = CTimer::GetTimeInMilliseconds() + 3000;
+			CMessages::AddBigMessage(TheText.Get("TAXI"), 4500, 1);
+		}
+		AbandonShortCutIfTaxiHasBeenMessedWith();
+		break;
+	case SHORTCUT_TRANSITION:
+		if (CTimer::GetTimeInMilliseconds() > ShortCutTimer) {
+			CTimer::Suspend();
+			CColStore::RequestCollision(ShortCutDestination);
+			CStreaming::LoadSceneCollision(ShortCutDestination);
+			CStreaming::LoadScene(ShortCutDestination);
+			CTheScripts::ClearSpaceForMissionEntity(ShortCutDestination, pShortCutTaxi);
+			pShortCutTaxi->Teleport(ShortCutDestination);
+			pShortCutTaxi->SetHeading(DEGTORAD(ShortCutDestinationOrientation));
+			pShortCutTaxi->PlaceOnRoadProperly();
+			pShortCutTaxi->SetMoveSpeed(pShortCutTaxi->GetForward() * 0.4f);
+			ShortCutTimer = CTimer::GetTimeInMilliseconds() + 1500;
+			TheCamera.SetFadeColour(0, 0, 0);
+			TheCamera.Fade(1.0f, 1);
+			ShortCutState = SHORTCUT_ARRIVING;
+			CTimer::Resume();
+		}
+		break;
+	case SHORTCUT_ARRIVING:
+		if (CTimer::GetTimeInMilliseconds() > ShortCutTimer) {
+			CWorld::Players[CWorld::PlayerInFocus].m_nMoney = Max(0, CWorld::Players[CWorld::PlayerInFocus].m_nMoney - SHORTCUT_TAXI_COST);
+			FindPlayerPed()->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pShortCutTaxi);
+			FindPlayerPed()->m_carInObjective = pShortCutTaxi;
+			ShortCutState = SHORTCUT_GETTING_OUT;
+		}
+		AbandonShortCutIfTaxiHasBeenMessedWith();
+		break;
+	case SHORTCUT_GETTING_OUT:
+		if (pShortCutTaxi->pPassengers[0] != FindPlayerPed() &&
+			pShortCutTaxi->pPassengers[1] != FindPlayerPed() &&
+			pShortCutTaxi->pPassengers[2] != FindPlayerPed()) {
+			CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_SHORTCUT_TAXI);
+			pShortCutTaxi->AutoPilot.m_nCarMission = MISSION_CRUISE;
+			pShortCutTaxi->AutoPilot.m_nCruiseSpeed = 18;
+			CCarCtrl::JoinCarWithRoadSystem(pShortCutTaxi);
+			pShortCutTaxi->VehicleCreatedBy = RANDOM_VEHICLE;
+			++CCarCtrl::NumRandomCars;
+			--CCarCtrl::NumMissionCars;
+			CRadar::ClearBlipForEntity(BLIP_CAR, CPools::GetVehiclePool()->GetIndex(pShortCutTaxi));
+			ShortCutState = SHORTCUT_NONE;
+			pShortCutTaxi = nil;
+		}
+		AbandonShortCutIfTaxiHasBeenMessedWith();
+		break;
+	}
+}
+
+void
+CGameLogic::AddShortCutPointAfterDeath(CVector point, float angle)
+{
+	if (NumAfterDeathStartPoints >= NUM_SHORTCUT_START_POINTS)
+		return;
+	AfterDeathStartPoints[NumAfterDeathStartPoints] = point;
+	AfterDeathStartPointOrientation[NumAfterDeathStartPoints] = angle;
+	NumAfterDeathStartPoints++;
+}
+
+void
+CGameLogic::AddShortCutDropOffPointForMission(CVector point, float angle)
+{
+	ShortCutDropOffForMission = point;
+	ShortCutDropOffOrientationForMission = angle;
+	MissionDropOffReadyToBeUsed = true;
+}
+
+void
+CGameLogic::RemoveShortCutDropOffPointForMission()
+{
+	MissionDropOffReadyToBeUsed = false;
+}
+
+void
+CGameLogic::AfterDeathArrestSetUpShortCutTaxi()
+{
+	if (!MissionDropOffReadyToBeUsed)
+		return;
+	int nClosestPoint = -1;
+	float fDistanceToPoint = 999999.9f;
+	for (int i = 0; i < NUM_SHORTCUT_START_POINTS; i++) {
+		float dist = (AfterDeathStartPoints[i] - FindPlayerCoors()).Magnitude();
+		if (dist < fDistanceToPoint) {
+			fDistanceToPoint = dist;
+			nClosestPoint = i;
+		}
+	}
+	if (fDistanceToPoint < 100.0f)
+		SetUpShortCut(AfterDeathStartPoints[nClosestPoint],
+			AfterDeathStartPointOrientation[nClosestPoint],
+			ShortCutDropOffForMission,
+			ShortCutDropOffOrientationForMission);
+	MissionDropOffReadyToBeUsed = false;
+}
+
+void
+CGameLogic::Save(uint8* buf, uint32* size)
+{
+INITSAVEBUF
+	WriteSaveBuf(buf, NumAfterDeathStartPoints);
+	*size += sizeof(NumAfterDeathStartPoints);
+	for (int i = 0; i < NUM_SHORTCUT_START_POINTS; i++) {
+		WriteSaveBuf(buf, AfterDeathStartPoints[i].x);
+		*size += sizeof(AfterDeathStartPoints[i].x);
+		WriteSaveBuf(buf, AfterDeathStartPoints[i].y);
+		*size += sizeof(AfterDeathStartPoints[i].y);
+		WriteSaveBuf(buf, AfterDeathStartPoints[i].z);
+		*size += sizeof(AfterDeathStartPoints[i].z);
+		WriteSaveBuf(buf, AfterDeathStartPointOrientation[i]);
+		*size += sizeof(AfterDeathStartPointOrientation[i]);
+	}
+VALIDATESAVEBUF(*size)
+}
+
+void
+CGameLogic::Load(uint8* buf, uint32 size)
+{
+INITSAVEBUF
+	NumAfterDeathStartPoints = ReadSaveBuf<uint32>(buf);
+	for (int i = 0; i < NUM_SHORTCUT_START_POINTS; i++) {
+		AfterDeathStartPoints[i].x = ReadSaveBuf<float>(buf);
+		AfterDeathStartPoints[i].y = ReadSaveBuf<float>(buf);
+		AfterDeathStartPoints[i].z = ReadSaveBuf<float>(buf);
+		AfterDeathStartPointOrientation[i] = ReadSaveBuf<float>(buf);
+	}
+VALIDATESAVEBUF(size)
 }
diff --git a/src/control/GameLogic.h b/src/control/GameLogic.h
index 43e244a3..9b774cc7 100644
--- a/src/control/GameLogic.h
+++ b/src/control/GameLogic.h
@@ -1,13 +1,51 @@
 #pragma once
 
+class CAutomobile;
+
 class CGameLogic
 {
 public:
+	enum {
+		SHORTCUT_NONE = 0,
+		SHORTCUT_INIT,
+		SHORTCUT_IDLE,
+		SHORTCUT_GETTING_IN,
+		SHORTCUT_TRANSITION,
+		SHORTCUT_ARRIVING,
+		SHORTCUT_GETTING_OUT
+	};
+
 	static void InitAtStartOfGame();
 	static void PassTime(uint32 time);
 	static void SortOutStreamingAndMemory(const CVector &pos);
 	static void Update();
 	static void RestorePlayerStuffDuringResurrection(class CPlayerPed *pPlayerPed, CVector pos, float angle);
 
+	static void ClearShortCut();
+	static void SetUpShortCut(CVector, float, CVector, float);
+	static void AbandonShortCutIfTaxiHasBeenMessedWith();
+	static void AbandonShortCutIfPlayerMilesAway();
+	static void UpdateShortCut();
+	static void AddShortCutPointAfterDeath(CVector, float);
+	static void AddShortCutDropOffPointForMission(CVector, float);
+	static void RemoveShortCutDropOffPointForMission();
+	static void AfterDeathArrestSetUpShortCutTaxi();
+
+	static void Save(uint8*, uint32*);
+	static void Load(uint8*, uint32);
+
 	static uint8 ActivePlayers;
+	static uint8 ShortCutState;
+	static CAutomobile* pShortCutTaxi;
+	static uint32 NumAfterDeathStartPoints;
+	static CVector ShortCutStart;
+	static float ShortCutStartOrientation;
+	static CVector ShortCutDestination;
+	static float ShortCutDestinationOrientation;
+	static uint32 ShortCutTimer;
+	static CVector AfterDeathStartPoints[NUM_SHORTCUT_START_POINTS];
+	static float AfterDeathStartPointOrientation[NUM_SHORTCUT_START_POINTS];
+	static CVector ShortCutDropOffForMission;
+	static float ShortCutDropOffOrientationForMission;
+	static bool MissionDropOffReadyToBeUsed;
 };
\ No newline at end of file
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 71f4b5d0..5d459b43 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -39,8 +39,8 @@
 #define CRUSHER_CRANE_SPEED (0.005f)
 
 // Prices
-#define BOMB_PRICE (1000)
-#define RESPRAY_PRICE (1000)
+#define BOMB_PRICE (500)
+#define RESPRAY_PRICE (100)
 
 // Distances
 #define DISTANCE_TO_CALL_OFF_CHASE (10.0f)
@@ -50,10 +50,10 @@
 #define DISTANCE_TO_CLOSE_MISSION_GARAGE (30.0f)
 #define DISTANCE_TO_CLOSE_COLLECTSPECIFICCARS_GARAGE (25.0f)
 #define DISTANCE_TO_CLOSE_COLLECTCARS_GARAGE (40.0f)
-#define DISTANCE_TO_CLOSE_HIDEOUT_GARAGE_ON_FOOT (2.2f)
+#define DISTANCE_TO_CLOSE_HIDEOUT_GARAGE_ON_FOOT (3.2f)
 #define DISTANCE_TO_CLOSE_HIDEOUT_GARAGE_IN_CAR (15.0f)
 #define DISTANCE_TO_FORCE_CLOSE_HIDEOUT_GARAGE (70.0f)
-#define DISTANCE_TO_OPEN_HIDEOUT_GARAGE_ON_FOOT (1.7f)
+#define DISTANCE_TO_OPEN_HIDEOUT_GARAGE_ON_FOOT (2.8f)
 #define DISTANCE_TO_OPEN_HIDEOUT_GARAGE_IN_CAR (10.0f)
 #define DISTANCE_TO_SHOW_HIDEOUT_MESSAGE (5.0f)
 
@@ -68,7 +68,7 @@
 // Respray stuff
 #define FREE_RESPRAY_HEALTH_THRESHOLD (970.0f)
 #define NUM_PARTICLES_IN_RESPRAY (200)
-#define RESPRAY_CENTERING_COEFFICIENT (0.75f)
+#define RESPRAY_CENTERING_COEFFICIENT (0.4f)
 
 // Bomb stuff
 #define KGS_OF_EXPLOSIVES_IN_BOMB (10)
@@ -81,8 +81,8 @@
 
 // Collect cars stuff
 #define MAX_SPEED_TO_SHOW_COLLECTED_MESSAGE (0.03f)
-#define IMPORT_REWARD (1000)
-#define IMPORT_ALLCARS_REWARD (200000)
+#define IMPORT_REWARD (500)
+#define IMPORT_ALLCARS_REWARD (20500)
 
 // Crusher stuff
 #define CRUSHER_VEHICLE_TEST_SPAN (8)
@@ -91,26 +91,23 @@
 #define CRUSHER_REWARD_COEFFICIENT (1.0f/500000)
 
 // Hideout stuff
-#define MAX_STORED_CARS_IN_INDUSTRIAL (1)
-#define MAX_STORED_CARS_IN_COMMERCIAL (NUM_GARAGE_STORED_CARS)
-#define MAX_STORED_CARS_IN_SUBURBAN (NUM_GARAGE_STORED_CARS)
-#define LIMIT_CARS_IN_INDUSTRIAL (1)
-#define LIMIT_CARS_IN_COMMERCIAL (2)
-#define LIMIT_CARS_IN_SUBURBAN (3)
 #define HIDEOUT_DOOR_SPEED_COEFFICIENT (1.7f)
 #define TIME_BETWEEN_HIDEOUT_MESSAGES (18000)
 
 // Camera stuff
-#define MARGIN_FOR_CAMERA_COLLECTCARS (1.3f)
-#define MARGIN_FOR_CAMERA_DEFAULT (4.0f)
+#define MARGIN_FOR_CAMERA_COLLECTCARS (0.5f)
+#define MARGIN_FOR_CAMERA_DEFAULT (0.5f)
 
 const int32 gaCarsToCollectInCraigsGarages[TOTAL_COLLECTCARS_GARAGES][TOTAL_COLLECTCARS_CARS] =
 {
-	{ MI_SECURICA, MI_MOONBEAM, MI_COACH,    MI_FLATBED,  MI_LINERUN,  MI_TRASH,    MI_PATRIOT,  MI_MRWHOOP,  MI_BLISTA,   MI_MULE,     MI_YANKEE,   MI_BOBCAT,   MI_DODO,     MI_BUS,      MI_RUMPO,    MI_PONY     },
-	{ MI_SENTINEL, MI_CHEETAH,  MI_BANSHEE,  MI_IDAHO,    MI_INFERNUS, MI_TAXI,     MI_KURUMA,   MI_STRETCH,  MI_PEREN,    MI_STINGER,  MI_MANANA,   MI_LANDSTAL, MI_STALLION, MI_BFINJECT, MI_CABBIE,   MI_ESPERANT },
-	{ MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_LANDSTAL, MI_CHEETAH,  MI_TAXI,     MI_ESPERANT, MI_SENTINEL, MI_IDAHO    }
+	{ MI_LANDSTAL, MI_IDAHO,    MI_ESPERANT, MI_STALLION, MI_RANCHER, MI_BLISTAC  },
+	{ MI_SABRE,    MI_VIRGO,    MI_SENTINEL, MI_STRETCH,  MI_WASHING, MI_ADMIRAL  },
+	{ MI_CHEETAH,  MI_INFERNUS, MI_BANSHEE,  MI_PHEONIX,  MI_COMET,   MI_STINGER  },
+	{ MI_VOODOO,   MI_CUBAN,    MI_CADDY,    MI_BAGGAGE,  MI_MRWHOOP, MI_PIZZABOY }
 };
 
+const int32 gaCarsToCollectIn60Seconds[] = { MI_CHEETAH, MI_TAXI, MI_ESPERANT, MI_SENTINEL, MI_IDAHO }; // what is this?
+
 int32 CGarages::BankVansCollected;
 bool CGarages::BombsAreFree;
 bool CGarages::RespraysAreFree;
@@ -126,9 +123,7 @@ uint32 CGarages::MessageEndTime;
 uint32 CGarages::NumGarages;
 bool CGarages::PlayerInGarage;
 int32 CGarages::PoliceCarsCollected;
-CStoredCar CGarages::aCarsInSafeHouse1[NUM_GARAGE_STORED_CARS];
-CStoredCar CGarages::aCarsInSafeHouse2[NUM_GARAGE_STORED_CARS];
-CStoredCar CGarages::aCarsInSafeHouse3[NUM_GARAGE_STORED_CARS];
+CStoredCar CGarages::aCarsInSafeHouses[TOTAL_HIDEOUT_GARAGES][CGarages::MAX_NUM_CARS_IN_HIDEOUT_GARAGE];
 int32 CGarages::AudioEntity = AEHANDLE_NONE;
 CGarage CGarages::aGarages[NUM_GARAGES];
 bool CGarages::bCamShouldBeOutisde;
@@ -147,22 +142,15 @@ void CGarages::Init(void)
 	for (int i = 0; i < TOTAL_COLLECTCARS_GARAGES; i++)
 		CarTypesCollected[i] = 0;
 	LastTimeHelpMessage = 0;
-	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++)
-		aCarsInSafeHouse1[i].Init();
-	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++)
-		aCarsInSafeHouse2[i].Init();
-	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++)
-		aCarsInSafeHouse3[i].Init();
+	for (int i = 0; i < TOTAL_HIDEOUT_GARAGES; i++) {
+		for (int j = 0; j < MAX_NUM_CARS_IN_HIDEOUT_GARAGE; j++)
+			aCarsInSafeHouses[i][j].Init();
+	}
 	AudioEntity = DMAudio.CreateEntity(AUDIOTYPE_GARAGE, (void*)1);
 	if (AudioEntity >= 0)
 		DMAudio.SetEntityStatus(AudioEntity, 1);
-	AddOne(
-		CRUSHER_GARAGE_X1, CRUSHER_GARAGE_Y1, CRUSHER_GARAGE_Z1,
-		CRUSHER_GARAGE_X2, CRUSHER_GARAGE_Y2, CRUSHER_GARAGE_Z2,
-		GARAGE_CRUSHER, 0);
 }
 
-#ifndef PS2
 void CGarages::Shutdown(void)
 {
 	NumGarages = 0;
@@ -171,7 +159,6 @@ void CGarages::Shutdown(void)
 	DMAudio.DestroyEntity(AudioEntity);
 	AudioEntity = AEHANDLE_NONE;
 }
-#endif
 
 void CGarages::Update(void)
 {
@@ -199,19 +186,27 @@ void CGarages::Update(void)
 		aGarages[GarageToBeTidied].TidyUpGarage();
 }
 
-int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float Z2, eGarageType type, int32 targetId)
+int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, eGarageType type, int32 targetId)
 {
 	if (NumGarages >= NUM_GARAGES) {
 		assert(0);
 		return NumGarages++;
 	}
 	CGarage* pGarage = &aGarages[NumGarages];
-	pGarage->m_fX1 = Min(X1, X2);
-	pGarage->m_fX2 = Max(X1, X2);
-	pGarage->m_fY1 = Min(Y1, Y2);
-	pGarage->m_fY2 = Max(Y1, Y2);
-	pGarage->m_fZ1 = Min(Z1, Z2);
-	pGarage->m_fZ2 = Max(Z1, Z2);
+	pGarage->m_fInfX = Min(Min(Min(X1, X2), X3), X2 + X3 - X1);
+	pGarage->m_fSupX = Max(Max(X1, X2), X3);
+	pGarage->m_fInfY = Min(Min(Min(Y1, Y2), Y3), Y2 + Y3 - Y1);
+	pGarage->m_fSupY = Max(Max(Y1, Y2), Y3);
+	pGarage->m_vecCorner1 = CVector(X1, Y1, Z1);
+	pGarage->m_fInfZ = Z1;
+	pGarage->m_vDir1 = CVector2D(X2 - X1, Y2 - Y1);
+	pGarage->m_vDir2 = CVector2D(X3 - X1, Y3 - Y1);
+	pGarage->m_fSupZ = Z2;
+	pGarage->m_nMaxStoredCars = NUM_GARAGE_STORED_CARS;
+	pGarage->m_fDir1Len = pGarage->m_vDir1.Magnitude();
+	pGarage->m_fDir2Len = pGarage->m_vDir2.Magnitude();
+	pGarage->m_vDir1 /= pGarage->m_fDir1Len;
+	pGarage->m_vDir2 /= pGarage->m_fDir2Len;
 	pGarage->m_pDoor1 = nil;
 	pGarage->m_pDoor2 = nil;
 	pGarage->m_fDoor1Z = Z1;
@@ -258,6 +253,17 @@ int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float Z
 	case GARAGE_FOR_SCRIPT_TO_OPEN_AND_CLOSE:
 	case GARAGE_KEEPS_OPENING_FOR_SPECIFIC_CAR:
 	case GARAGE_MISSION_KEEPCAR_REMAINCLOSED:
+	case GARAGE_COLLECTCARS_4:
+	case GARAGE_FOR_SCRIPT_TO_OPEN_FOR_CAR:
+	case GARAGE_HIDEOUT_FOUR:
+	case GARAGE_HIDEOUT_FIVE:
+	case GARAGE_HIDEOUT_SIX:
+	case GARAGE_HIDEOUT_SEVEN:
+	case GARAGE_HIDEOUT_EIGHT:
+	case GARAGE_HIDEOUT_NINE:
+	case GARAGE_HIDEOUT_TEN:
+	case GARAGE_HIDEOUT_ELEVEN:
+	case GARAGE_HIDEOUT_TWELVE:
 		pGarage->m_eGarageState = GS_FULLYCLOSED;
 		pGarage->m_fDoorPos = 0.0f;
 		break;
@@ -311,10 +317,10 @@ void CGarage::Update()
 						TheCamera.pToGarageWeAreInForHackAvoidFirstPerson = this;
 					if (pVehicle->GetModelIndex() == MI_MRWHOOP) {
 						if (pVehicle->IsWithinArea(
-							m_fX1 - DISTANCE_FOR_MRWHOOP_HACK,
-							m_fY1 + DISTANCE_FOR_MRWHOOP_HACK,
-							m_fX2 - DISTANCE_FOR_MRWHOOP_HACK,
-							m_fY2 + DISTANCE_FOR_MRWHOOP_HACK)) {
+							m_fInfX - DISTANCE_FOR_MRWHOOP_HACK,
+							m_fInfY - DISTANCE_FOR_MRWHOOP_HACK,
+							m_fSupX + DISTANCE_FOR_MRWHOOP_HACK,
+							m_fSupY + DISTANCE_FOR_MRWHOOP_HACK)) {
 							TheCamera.pToGarageWeAreIn = this;
 							CGarages::bCamShouldBeOutisde = true;
 						}
@@ -332,7 +338,7 @@ void CGarage::Update()
 	case GARAGE_RESPRAY:
 		switch (m_eGarageState) {
 		case GS_OPENED:
-			if (IsStaticPlayerCarEntirelyInside() && !IsAnyOtherCarTouchingGarage(FindPlayerVehicle())) {
+			if (IsStaticPlayerCarEntirelyInside()) {
 				if (CGarages::IsCarSprayable(FindPlayerVehicle())) {
 					if (CWorld::Players[CWorld::PlayerInFocus].m_nMoney >= RESPRAY_PRICE || CGarages::RespraysAreFree) {
 						m_eGarageState = GS_CLOSING;
@@ -354,13 +360,15 @@ void CGarage::Update()
 			if (FindPlayerVehicle()) {
 				if (CalcDistToGarageRectangleSquared(FindPlayerVehicle()->GetPosition().x, FindPlayerVehicle()->GetPosition().y) < SQR(DISTANCE_TO_ACTIVATE_GARAGE))
 					CWorld::CallOffChaseForArea(
-						m_fX1 - DISTANCE_TO_CALL_OFF_CHASE,
-						m_fY1 - DISTANCE_TO_CALL_OFF_CHASE,
-						m_fX2 + DISTANCE_TO_CALL_OFF_CHASE,
-						m_fY2 + DISTANCE_TO_CALL_OFF_CHASE);
+						m_fInfX - DISTANCE_TO_CALL_OFF_CHASE,
+						m_fInfY - DISTANCE_TO_CALL_OFF_CHASE,
+						m_fSupX + DISTANCE_TO_CALL_OFF_CHASE,
+						m_fSupY + DISTANCE_TO_CALL_OFF_CHASE);
 			}
 			break;
 		case GS_CLOSING:
+			if (FindPlayerVehicle())
+				ThrowCarsNearDoorOutOfGarage(FindPlayerVehicle());
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				m_eGarageState = GS_FULLYCLOSED;
@@ -376,19 +384,20 @@ void CGarage::Update()
 #endif
 				((CAutomobile*)(FindPlayerVehicle()))->m_fFireBlowUpTimer = 0.0f;
 			CWorld::CallOffChaseForArea(
-				m_fX1 - DISTANCE_TO_CALL_OFF_CHASE,
-				m_fY1 - DISTANCE_TO_CALL_OFF_CHASE,
-				m_fX2 + DISTANCE_TO_CALL_OFF_CHASE,
-				m_fY2 + DISTANCE_TO_CALL_OFF_CHASE);
+				m_fInfX - DISTANCE_TO_CALL_OFF_CHASE,
+				m_fInfY - DISTANCE_TO_CALL_OFF_CHASE,
+				m_fSupX + DISTANCE_TO_CALL_OFF_CHASE,
+				m_fSupY + DISTANCE_TO_CALL_OFF_CHASE);
 			break;
 		case GS_FULLYCLOSED:
 			if (CTimer::GetTimeInMilliseconds() > m_nTimeToStartAction) {
 				m_eGarageState = GS_OPENING;
 				DMAudio.PlayFrontEndSound(SOUND_GARAGE_OPENING, 1);
 				bool bTakeMoney = false;
-				if (FindPlayerPed()->m_pWanted->m_nWantedLevel != 0)
+				if (FindPlayerPed()->m_pWanted->m_nWantedLevel != 0) {
 					bTakeMoney = true;
-				FindPlayerPed()->m_pWanted->Reset();
+					FindPlayerPed()->m_pWanted->Suspend();
+				}
 				CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
 				FindPlayerPed()->m_pWanted->m_bIgnoredByCops = true;
 #ifdef FIX_BUGS
@@ -396,18 +405,29 @@ void CGarage::Update()
 #else
 				bool bChangedColour;
 #endif
-				if (FindPlayerVehicle() && FindPlayerVehicle()->IsCar()) {
+				if (FindPlayerVehicle() && (FindPlayerVehicle()->IsCar() || FindPlayerVehicle()->IsBike())) {
 					if (FindPlayerVehicle()->m_fHealth < FREE_RESPRAY_HEALTH_THRESHOLD)
 						bTakeMoney = true;
 					FindPlayerVehicle()->m_fHealth = 1000.0f;
-					((CAutomobile*)(FindPlayerVehicle()))->m_fFireBlowUpTimer = 0.0f;
-					((CAutomobile*)(FindPlayerVehicle()))->Fix();
+					if (FindPlayerVehicle()->IsCar()) {
+						((CAutomobile*)(FindPlayerVehicle()))->m_fFireBlowUpTimer = 0.0f;
+						((CAutomobile*)(FindPlayerVehicle()))->Fix();
+					}
+					else {
+						// TODO(MIAMI): Bike Fix
+					}
+					FindPlayerVehicle()->m_nDoorLock = CARLOCK_UNLOCKED;
+					++CStats::Sprayings;
 					if (FindPlayerVehicle()->GetUp().z < 0.0f) {
 						FindPlayerVehicle()->GetUp() = -FindPlayerVehicle()->GetUp();
 						FindPlayerVehicle()->GetRight() = -FindPlayerVehicle()->GetRight();
 					}
 					bChangedColour = false;
+#ifdef FIX_BUGS
+					if (!FindPlayerVehicle()->IsCar() || !((CAutomobile*)(FindPlayerVehicle()))->bFixedColour) {
+#else
 					if (!((CAutomobile*)(FindPlayerVehicle()))->bFixedColour) {
+#endif
 						uint8 colour1, colour2;
 						uint16 attempt;
 						FindPlayerVehicle()->GetModelInfo()->ChooseVehicleColour(colour1, colour2);
@@ -422,16 +442,9 @@ void CGarage::Update()
 						if (bChangedColour) {
 							for (int i = 0; i < NUM_PARTICLES_IN_RESPRAY; i++) {
 								CVector pos;
-#ifdef FIX_BUGS
-								pos.x = CGeneral::GetRandomNumberInRange(m_fX1 + 0.5f, m_fX2 - 0.5f);
-								pos.y = CGeneral::GetRandomNumberInRange(m_fY1 + 0.5f, m_fY2 - 0.5f);
+								pos.x = CGeneral::GetRandomNumberInRange(m_fInfX + 0.5f, m_fSupX - 0.5f);
+								pos.y = CGeneral::GetRandomNumberInRange(m_fInfY + 0.5f, m_fSupY - 0.5f);
 								pos.z = CGeneral::GetRandomNumberInRange(m_fDoor1Z - 3.0f, m_fDoor1Z + 1.0f);
-#else
-								// wtf is this
-								pos.x = m_fX1 + 0.5f + (uint8)(CGeneral::GetRandomNumber()) / 256.0f * (m_fX2 - m_fX1 - 1.0f);
-								pos.y = m_fY1 + 0.5f + (uint8)(CGeneral::GetRandomNumber()) / 256.0f * (m_fY2 - m_fY1 - 1.0f);
-								pos.z = m_fDoor1Z - 3.0f + (uint8)(CGeneral::GetRandomNumber()) / 256.0f * 4.0f;
-#endif
 								CParticle::AddParticle(PARTICLE_GARAGEPAINT_SPRAY, pos, CVector(0.0f, 0.0f, 0.0f), nil, 0.0f, CVehicleModelInfo::ms_vehicleColourTable[colour1]);
 							}
 						}
@@ -439,8 +452,10 @@ void CGarage::Update()
 					CenterCarInGarage(FindPlayerVehicle());
 				}
 				if (bTakeMoney) {
-					if (!CGarages::RespraysAreFree)
+					if (!CGarages::RespraysAreFree) {
 						CWorld::Players[CWorld::PlayerInFocus].m_nMoney = Max(0, CWorld::Players[CWorld::PlayerInFocus].m_nMoney - RESPRAY_PRICE);
+						CStats::AutoPaintingBudget += RESPRAY_PRICE;
+					}
 					CGarages::TriggerMessage("GA_2", -1, 4000, -1); // New engine and paint job. The cops won't recognize you!
 				}
 				else if (bChangedColour) {
@@ -452,10 +467,10 @@ void CGarage::Update()
 				m_bResprayHappened = true;
 			}
 			CWorld::CallOffChaseForArea(
-				m_fX1 - DISTANCE_TO_CALL_OFF_CHASE,
-				m_fY1 - DISTANCE_TO_CALL_OFF_CHASE,
-				m_fX2 + DISTANCE_TO_CALL_OFF_CHASE,
-				m_fY2 + DISTANCE_TO_CALL_OFF_CHASE);
+				m_fInfX - DISTANCE_TO_CALL_OFF_CHASE,
+				m_fInfY - DISTANCE_TO_CALL_OFF_CHASE,
+				m_fSupX + DISTANCE_TO_CALL_OFF_CHASE,
+				m_fSupY + DISTANCE_TO_CALL_OFF_CHASE);
 			break;
 		case GS_OPENING:
 			m_fDoorPos = Min(m_fDoorHeight, m_fDoorPos + (m_bRotatedDoor ? ROTATED_DOOR_OPEN_SPEED : DEFAULT_DOOR_OPEN_SPEED) * CTimer::GetTimeStep());
@@ -480,12 +495,8 @@ void CGarage::Update()
 	case GARAGE_BOMBSHOP3:
 		switch (m_eGarageState) {
 		case GS_OPENED:
-			if (IsStaticPlayerCarEntirelyInside() && !IsAnyOtherCarTouchingGarage(FindPlayerVehicle())) {
-#ifdef FIX_BUGS // FindPlayerVehicle() can never be NULL here because IsStaticPlayerCarEntirelyInside() is true, and there is no IsCar() check
-				if (FindPlayerVehicle()->IsCar() && ((CAutomobile*)FindPlayerVehicle())->m_bombType) {
-#else
-				if (!FindPlayerVehicle() || ((CAutomobile*)FindPlayerVehicle())->m_bombType) {
-#endif
+			if (IsStaticPlayerCarEntirelyInside()) {
+				if (!FindPlayerVehicle() || FindPlayerVehicle()->m_bombType) {
 					CGarages::TriggerMessage("GA_5", -1, 4000, -1); //"Your car is already fitted with a bomb"
 					m_eGarageState = GS_OPENEDCONTAINSCAR;
 					DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB_ALREADY_SET, 1);
@@ -503,6 +514,8 @@ void CGarage::Update()
 				}
 			break;
 		case GS_CLOSING:
+			if (FindPlayerVehicle())
+				ThrowCarsNearDoorOutOfGarage(FindPlayerVehicle());
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				m_eGarageState = GS_FULLYCLOSED;
@@ -510,62 +523,69 @@ void CGarage::Update()
 				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
 			}
 			UpdateDoorsHeight();
+			if (m_eGarageType == GARAGE_BOMBSHOP3)
+				CStreaming::RequestModel(MI_BOMB, STREAMFLAGS_DONT_REMOVE);
 			break;
 		case GS_FULLYCLOSED:
 			if (CTimer::GetTimeInMilliseconds() > m_nTimeToStartAction) {
-				switch (m_eGarageType) {
-				case GARAGE_BOMBSHOP1: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB1_SET, 1); break;
-				case GARAGE_BOMBSHOP2: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB2_SET, 1); break;
-				case GARAGE_BOMBSHOP3: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB3_SET, 1); break;
+				if (m_eGarageType != GARAGE_BOMBSHOP3 || CStreaming::HasModelLoaded(MI_BOMB)) {
+					switch (m_eGarageType) {
+					case GARAGE_BOMBSHOP1: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB1_SET, 1); break;
+					case GARAGE_BOMBSHOP2: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB2_SET, 1); break;
+					case GARAGE_BOMBSHOP3: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB3_SET, 1); break;
 				default: break;
-				}
-				m_eGarageState = GS_OPENING;
-				if (!CGarages::BombsAreFree)
-					CWorld::Players[CWorld::PlayerInFocus].m_nMoney = Max(0, CWorld::Players[CWorld::PlayerInFocus].m_nMoney - BOMB_PRICE);
-				if (FindPlayerVehicle() && FindPlayerVehicle()->IsCar()) {
-					((CAutomobile*)(FindPlayerVehicle()))->m_bombType = CGarages::GetBombTypeForGarageType(m_eGarageType);
-					((CAutomobile*)(FindPlayerVehicle()))->m_pBombRigger = FindPlayerPed();
-					if (m_eGarageType == GARAGE_BOMBSHOP3)
-						CGarages::GivePlayerDetonator();
-					CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB;
-				}
+					}
+					m_eGarageState = GS_OPENING;
+					if (!CGarages::BombsAreFree)
+						CWorld::Players[CWorld::PlayerInFocus].m_nMoney = Max(0, CWorld::Players[CWorld::PlayerInFocus].m_nMoney - BOMB_PRICE);
+					if (FindPlayerVehicle() && (FindPlayerVehicle()->IsCar() || FindPlayerVehicle()->IsBike())) {
+						FindPlayerVehicle()->m_bombType = CGarages::GetBombTypeForGarageType(m_eGarageType);
+						FindPlayerVehicle()->m_pBombRigger = FindPlayerPed();
+						if (m_eGarageType == GARAGE_BOMBSHOP3)
+							CGarages::GivePlayerDetonator();
+						CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB;
+					}
 #ifdef DETECT_PAD_INPUT_SWITCH
-				int16 Mode = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0;
+					int16 Mode = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0;
 #else
-				int16 Mode = CPad::GetPad(0)->Mode;
+					int16 Mode = CPad::GetPad(0)->Mode;
 #endif
-				switch (m_eGarageType) {
-				case GARAGE_BOMBSHOP1:
-					switch (Mode) {
-					case 0:
-					case 1:
-					case 2:
-						CHud::SetHelpMessage(TheText.Get("GA_6"), false); // Arm with ~h~~k~~PED_FIREWEAPON~ button~w~. Bomb will go off when engine is started.
-						break;
-					case 3:
-						CHud::SetHelpMessage(TheText.Get("GA_6B"), false); // Arm with ~h~~k~~PED_FIREWEAPON~ button~w~. Bomb will go off when engine is started.
+					switch (m_eGarageType) {
+					case GARAGE_BOMBSHOP1:
+						switch (Mode) {
+						case 0:
+						case 1:
+						case 2:
+							CHud::SetHelpMessage(TheText.Get("GA_6"), false); // Arm with ~h~~k~~PED_FIREWEAPON~ button~w~. Bomb will go off when engine is started.
+							break;
+						case 3:
+							CHud::SetHelpMessage(TheText.Get("GA_6B"), false); // Arm with ~h~~k~~PED_FIREWEAPON~ button~w~. Bomb will go off when engine is started.
+							break;
+						}
 						break;
-					}
-					break;
-				case GARAGE_BOMBSHOP2:
-					switch (Mode) {
-					case 0:
-					case 1:
-					case 2:
-						CHud::SetHelpMessage(TheText.Get("GA_7"), false); // Park it, prime it by pressing the ~h~~k~~PED_FIREWEAPON~ button~w~ and LEG IT!
+					case GARAGE_BOMBSHOP2:
+						switch (Mode) {
+						case 0:
+						case 1:
+						case 2:
+							CHud::SetHelpMessage(TheText.Get("GA_7"), false); // Park it, prime it by pressing the ~h~~k~~PED_FIREWEAPON~ button~w~ and LEG IT!
+							break;
+						case 3:
+							CHud::SetHelpMessage(TheText.Get("GA_7B"), false); // Park it, prime it by pressing the ~h~~k~~PED_FIREWEAPON~ button~w~ and LEG IT!
+							break;
+						}
 						break;
-					case 3:
-						CHud::SetHelpMessage(TheText.Get("GA_7B"), false); // Park it, prime it by pressing the ~h~~k~~PED_FIREWEAPON~ button~w~ and LEG IT!
+					case GARAGE_BOMBSHOP3:
+						CHud::SetHelpMessage(TheText.Get("GA_8"), false); // Use the detonator to activate the bomb.
 						break;
-					}
-					break;
-				case GARAGE_BOMBSHOP3:
-					CHud::SetHelpMessage(TheText.Get("GA_8"), false); // Use the detonator to activate the bomb.
-					break;
 				default: break;
+					}
+					CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
+					FindPlayerPed()->m_pWanted->m_bIgnoredByCops = false;
+				}
+				else {
+					CStreaming::RequestModel(MI_BOMB, STREAMFLAGS_DONT_REMOVE);
 				}
-				CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
-				FindPlayerPed()->m_pWanted->m_bIgnoredByCops = false;
 			}
 			break;
 		case GS_OPENING:
@@ -604,6 +624,8 @@ void CGarage::Update()
 			}
 			break;
 		case GS_CLOSING:
+			if (m_pTarget)
+				ThrowCarsNearDoorOutOfGarage(m_pTarget);
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
@@ -648,92 +670,10 @@ void CGarage::Update()
 		}
 		break;
 	case GARAGE_COLLECTSPECIFICCARS:
-		switch (m_eGarageState) {
-		case GS_OPENED:
-			if (FindPlayerVehicle() && m_nTargetModelIndex == FindPlayerVehicle()->GetModelIndex()) {
-				m_pTarget = FindPlayerVehicle();
-				m_pTarget->RegisterReference((CEntity**)&m_pTarget);
-			}
-			if (!FindPlayerVehicle()) {
-				if (m_pTarget && IsEntityEntirelyInside3D(m_pTarget, 0.0f) && !IsAnyOtherCarTouchingGarage(m_pTarget)) {
-					if (IsEntityEntirelyOutside(FindPlayerPed(), 2.0f)) {
-						CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_GARAGE);
-						FindPlayerPed()->m_pWanted->m_bIgnoredByCops = true;
-						m_eGarageState = GS_CLOSING;
-					}
-				}
-				else if (Abs(FindPlayerCoors().x - GetGarageCenterX()) > DISTANCE_TO_CLOSE_COLLECTSPECIFICCARS_GARAGE ||
-					Abs(FindPlayerCoors().y - GetGarageCenterY()) > DISTANCE_TO_CLOSE_COLLECTSPECIFICCARS_GARAGE) {
-					m_eGarageState = GS_CLOSING;
-					m_pTarget = nil;
-				}
-			}
-			break;
-		case GS_CLOSING:
-			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
-			if (m_fDoorPos == 0.0f) {
-				m_eGarageState = GS_FULLYCLOSED;
-				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
-				if (m_pTarget) {
-					DestroyVehicleAndDriverAndPassengers(m_pTarget);
-					m_pTarget = nil;
-					CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
-					FindPlayerPed()->m_pWanted->m_bIgnoredByCops = false;
-					int16 reward;
-					switch (m_nTargetModelIndex) {
-					case MI_POLICE:
-						reward = REWARD_FOR_FIRST_POLICE_CAR * (MAX_POLICE_CARS_TO_COLLECT - CGarages::PoliceCarsCollected++) / MAX_POLICE_CARS_TO_COLLECT;
-						break;
-					case MI_SECURICA:
-						reward = REWARD_FOR_FIRST_BANK_VAN * (MAX_BANK_VANS_TO_COLLECT - CGarages::BankVansCollected++) / MAX_BANK_VANS_TO_COLLECT;
-						break;
-#ifdef FIX_BUGS // not possible though
-					default:
-						reward = 0;
-						break;
-#endif
-					}
-					if (reward > 0) {
-						CWorld::Players[CWorld::PlayerInFocus].m_nMoney += reward;
-						CGarages::TriggerMessage("GA_10", reward, 4000, -1); // Nice one. Here's your $~1~
-						DMAudio.PlayFrontEndSound(SOUND_GARAGE_VEHICLE_ACCEPTED, 1);
-					}
-					else {
-						CGarages::TriggerMessage("GA_11", -1, 4000, -1); // We got these wheels already. It's worthless to us!
-						DMAudio.PlayFrontEndSound(SOUND_GARAGE_VEHICLE_DECLINED, 1);
-					}
-				}
-			}
-			UpdateDoorsHeight();
-			break;
-		case GS_FULLYCLOSED:
-			if (FindPlayerVehicle() && m_nTargetModelIndex == FindPlayerVehicle()->GetModelIndex()) {
-				if (CalcDistToGarageRectangleSquared(FindPlayerVehicle()->GetPosition().x, FindPlayerVehicle()->GetPosition().y) < SQR(DISTANCE_TO_ACTIVATE_GARAGE))
-					m_eGarageState = GS_OPENING;
-			}
-			break;
-		case GS_OPENING:
-			if (FindPlayerVehicle() && m_nTargetModelIndex == FindPlayerVehicle()->GetModelIndex()) {
-				m_pTarget = FindPlayerVehicle();
-				m_pTarget->RegisterReference((CEntity**)&m_pTarget);
-			}
-			m_fDoorPos = Min(m_fDoorHeight, m_fDoorPos + (m_bRotatedDoor ? ROTATED_DOOR_OPEN_SPEED : DEFAULT_DOOR_OPEN_SPEED) * CTimer::GetTimeStep());
-			if (m_fDoorPos == m_fDoorHeight) {
-				m_eGarageState = GS_OPENED;
-				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_OPENED, 1.0f);
-			}
-			UpdateDoorsHeight();
-			break;
-		//case GS_OPENEDCONTAINSCAR:
-		//case GS_CLOSEDCONTAINSCAR:
-		//case GS_AFTERDROPOFF:
-		default:
-			break;
-		}
-		break;
 	case GARAGE_COLLECTCARS_1:
 	case GARAGE_COLLECTCARS_2:
 	case GARAGE_COLLECTCARS_3:
+	case GARAGE_COLLECTCARS_4:
 		switch (m_eGarageState) {
 		case GS_OPENED:
 			if (FindPlayerVehicle() && DoesCraigNeedThisCar(FindPlayerVehicle()->GetModelIndex())) {
@@ -766,6 +706,8 @@ void CGarage::Update()
 			}
 			break;
 		case GS_CLOSING:
+			if (m_pTarget)
+				ThrowCarsNearDoorOutOfGarage(m_pTarget);
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				m_eGarageState = GS_FULLYCLOSED;
@@ -853,75 +795,6 @@ void CGarage::Update()
 		}
 		break;
 	case GARAGE_CRUSHER:
-		switch (m_eGarageState) {
-		case GS_OPENED:
-		{
-			int i = CPools::GetVehiclePool()->GetSize() * (CTimer::GetFrameCounter() % CRUSHER_VEHICLE_TEST_SPAN) / CRUSHER_VEHICLE_TEST_SPAN;
-			int end = CPools::GetVehiclePool()->GetSize() * (CTimer::GetFrameCounter() % CRUSHER_VEHICLE_TEST_SPAN + 1) / CRUSHER_VEHICLE_TEST_SPAN;
-			for (; i < end; i++) {
-				CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
-				if (!pVehicle)
-					continue;
-				if (pVehicle->IsCar() && IsEntityEntirelyInside3D(pVehicle, 0.0f)) {
-					m_eGarageState = GS_CLOSING;
-					m_pTarget = pVehicle;
-					m_pTarget->RegisterReference((CEntity**)&m_pTarget);
-				}
-			}
-			break;
-		}
-		case GS_CLOSING:
-			if (m_pTarget) {
-				m_fDoorPos = Max(0.0f, m_fDoorPos - CRUSHER_CRANE_SPEED * CTimer::GetTimeStep());
-				if (m_fDoorPos < TWOPI / 5) {
-					m_pTarget->bUsesCollision = false;
-					m_pTarget->bAffectedByGravity = false;
-					m_pTarget->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-				}
-				else {
-					m_pTarget->SetMoveSpeed(m_pTarget->GetMoveSpeed() * Pow(0.8f, CTimer::GetTimeStep()));
-				}
-				if (m_fDoorPos == 0.0f) {
-					CGarages::CrushedCarId = CPools::GetVehiclePool()->GetIndex(m_pTarget);
-					float reward = Min(CRUSHER_MAX_REWARD, CRUSHER_MIN_REWARD + m_pTarget->pHandling->nMonetaryValue * m_pTarget->m_fHealth * CRUSHER_REWARD_COEFFICIENT);
-					CWorld::Players[CWorld::PlayerInFocus].m_nMoney += reward;
-					DestroyVehicleAndDriverAndPassengers(m_pTarget);
-					++CStats::CarsCrushed;
-					m_pTarget = nil;
-					m_eGarageState = GS_AFTERDROPOFF;
-					m_nTimeToStartAction = CTimer::GetTimeInMilliseconds() + TIME_TO_CRUSH_CAR;
-					DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
-				}
-			}
-			else
-				m_eGarageState = GS_OPENING;
-			UpdateCrusherAngle();
-			break;
-		case GS_AFTERDROPOFF:
-			if (CTimer::GetTimeInMilliseconds() <= m_nTimeToStartAction) {
-				UpdateCrusherShake((myrand() & 0xFF - 128) * 0.0002f, (myrand() & 0xFF - 128) * 0.0002f);
-			}
-			else {
-				UpdateCrusherShake(0.0f, 0.0f);
-				m_eGarageState = GS_OPENING;
-			}
-			break;
-		case GS_OPENING:
-			m_fDoorPos = Min(HALFPI, m_fDoorPos + CTimer::GetTimeStep() * CRUSHER_CRANE_SPEED);
-			if (m_fDoorPos == HALFPI) {
-				m_eGarageState = GS_OPENED;
-				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_OPENED, 1.0f);
-			}
-			UpdateCrusherAngle();
-			break;
-		//case GS_FULLYCLOSED:
-		//case GS_CLOSEDCONTAINSCAR:
-		//case GS_OPENEDCONTAINSCAR:
-		default:
-			break;
-		}
-		if (!FindPlayerVehicle() && (CTimer::GetFrameCounter() & 0x1F) == 0x17 && IsEntityEntirelyInside(FindPlayerPed()))
-			FindPlayerPed()->InflictDamage(nil, WEAPONTYPE_RAMMEDBYCAR, 300.0f, PEDPIECE_TORSO, 0);
 		break;
 	case GARAGE_MISSION_KEEPCAR:
 	case GARAGE_MISSION_KEEPCAR_REMAINCLOSED:
@@ -940,6 +813,8 @@ void CGarage::Update()
 			}
 			break;
 		case GS_CLOSING:
+			if (m_pTarget)
+				ThrowCarsNearDoorOutOfGarage(m_pTarget);
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
@@ -1035,6 +910,15 @@ void CGarage::Update()
 	case GARAGE_HIDEOUT_ONE:
 	case GARAGE_HIDEOUT_TWO:
 	case GARAGE_HIDEOUT_THREE:
+	case GARAGE_HIDEOUT_FOUR:
+	case GARAGE_HIDEOUT_FIVE:
+	case GARAGE_HIDEOUT_SIX:
+	case GARAGE_HIDEOUT_SEVEN:
+	case GARAGE_HIDEOUT_EIGHT:
+	case GARAGE_HIDEOUT_NINE:
+	case GARAGE_HIDEOUT_TEN:
+	case GARAGE_HIDEOUT_ELEVEN:
+	case GARAGE_HIDEOUT_TWELVE:
 		switch (m_eGarageState) {
 		case GS_OPENED:
 		{
@@ -1047,7 +931,7 @@ void CGarage::Update()
 				m_eGarageState = GS_CLOSING;
 			else if (FindPlayerVehicle() &&
 				CountCarsWithCenterPointWithinGarage(FindPlayerVehicle()) >=
-				CGarages::FindMaxNumStoredCarsForGarage(m_eGarageType)) {
+				FindMaxNumStoredCarsForGarage()) {
 				m_eGarageState = GS_CLOSING;
 			}
 			else if (distance > SQR(DISTANCE_TO_FORCE_CLOSE_HIDEOUT_GARAGE)) {
@@ -1063,12 +947,7 @@ void CGarage::Update()
 			else if (m_fDoorPos == 0.0f) {
 				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
 				m_eGarageState = GS_FULLYCLOSED;
-				switch (m_eGarageType) {
-				case GARAGE_HIDEOUT_ONE:   StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse1, MAX_STORED_CARS_IN_INDUSTRIAL); break;
-				case GARAGE_HIDEOUT_TWO:   StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse2, MAX_STORED_CARS_IN_COMMERCIAL); break;
-				case GARAGE_HIDEOUT_THREE: StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse3, MAX_STORED_CARS_IN_SUBURBAN);   break;
-				default: break;
-				}
+				StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouses[CGarages::FindSafeHouseIndexForGarageType(m_eGarageType)], NUM_GARAGE_STORED_CARS);
 			}
 			UpdateDoorsHeight();
 			break;
@@ -1077,30 +956,19 @@ void CGarage::Update()
 			float distance = CalcDistToGarageRectangleSquared(FindPlayerCoors().x, FindPlayerCoors().y);
 			if (distance < SQR(DISTANCE_TO_OPEN_HIDEOUT_GARAGE_ON_FOOT) ||
 				distance < SQR(DISTANCE_TO_OPEN_HIDEOUT_GARAGE_IN_CAR) && FindPlayerVehicle()) {
-				if (FindPlayerVehicle() && CGarages::CountCarsInHideoutGarage(m_eGarageType) >= CGarages::FindMaxNumStoredCarsForGarage(m_eGarageType)) {
+				if (FindPlayerVehicle() && CGarages::CountCarsInHideoutGarage(m_eGarageType) >= FindMaxNumStoredCarsForGarage()) {
 					if (m_pDoor1) {
 						if (((CVector2D)FindPlayerVehicle()->GetPosition() - (CVector2D)m_pDoor1->GetPosition()).MagnitudeSqr() < SQR(DISTANCE_TO_SHOW_HIDEOUT_MESSAGE) &&
 							CTimer::GetTimeInMilliseconds() - CGarages::LastTimeHelpMessage > TIME_BETWEEN_HIDEOUT_MESSAGES) {
-							CHud::SetHelpMessage(TheText.Get("GA_21"), false); // You cannot store any more cars in this garage.
-							CGarages::LastTimeHelpMessage = CTimer::GetTimeInMilliseconds();
+							if (FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_APPEARANCE_HELI && FindPlayerVehicle()->GetVehicleAppearance() != VEHICLE_APPEARANCE_PLANE) {
+								CHud::SetHelpMessage(TheText.Get("GA_21"), false); // You cannot store any more cars in this garage.
+								CGarages::LastTimeHelpMessage = CTimer::GetTimeInMilliseconds();
+							}
 						}
 					}
 				}
-				else {
-#ifdef FIX_BUGS
-					bool bCreatedAllCars = false;
-#else
-					bool bCreatedAllCars;
-#endif
-					switch (m_eGarageType) {
-					case GARAGE_HIDEOUT_ONE:   bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse1); break;
-					case GARAGE_HIDEOUT_TWO:   bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse2); break;
-					case GARAGE_HIDEOUT_THREE: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse3); break;
-					default: break;
-					}
-					if (bCreatedAllCars)
-						m_eGarageState = GS_OPENING;
-				}
+				else if (RestoreCarsForThisHideout(CGarages::aCarsInSafeHouses[CGarages::FindSafeHouseIndexForGarageType(m_eGarageType)]))
+					m_eGarageState = GS_OPENING;
 			}
 			break;
 		}
@@ -1130,6 +998,8 @@ void CGarage::Update()
 			}
 			break;
 		case GS_CLOSING:
+			if (m_pTarget)
+				ThrowCarsNearDoorOutOfGarage(m_pTarget);
 			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
 			if (m_fDoorPos == 0.0f) {
 				m_eGarageState = GS_FULLYCLOSED;
@@ -1162,11 +1032,64 @@ void CGarage::Update()
 		break;
 		//case GARAGE_COLLECTORSITEMS:
 		//case GARAGE_60SECONDS:
+	case GARAGE_FOR_SCRIPT_TO_OPEN_FOR_CAR:
+		switch (m_eGarageState) {
+		case GS_OPENED:
+			if (m_pTarget && IsEntityEntirelyInside3D(m_pTarget, 0.0f) && !IsAnyCarBlockingDoor() && IsPlayerOutsideGarage()) {
+				CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_GARAGE);
+				m_eGarageState = GS_CLOSING;
+				m_bClosingWithoutTargetCar = false;
+			}
+		case GS_CLOSING:
+			m_fDoorPos = Max(0.0f, m_fDoorPos - (m_bRotatedDoor ? ROTATED_DOOR_CLOSE_SPEED : DEFAULT_DOOR_CLOSE_SPEED) * CTimer::GetTimeStep());
+			if (m_fDoorPos == 0.0f) {
+				m_eGarageState = GS_FULLYCLOSED;
+				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_CLOSED, 1.0f);
+				CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
+			}
+		case GS_FULLYCLOSED:
+			break;
+		case GS_OPENING:
+			m_fDoorPos = Min(m_fDoorHeight, m_fDoorPos + (m_bRotatedDoor ? ROTATED_DOOR_OPEN_SPEED : DEFAULT_DOOR_OPEN_SPEED) * CTimer::GetTimeStep());
+			if (m_fDoorPos == m_fDoorHeight) {
+				m_eGarageState = GS_OPENED;
+				DMAudio.PlayOneShot(CGarages::AudioEntity, SOUND_GARAGE_DOOR_OPENED, 1.0f);
+			}
+			UpdateDoorsHeight();
+			break;
+			//case GS_OPENEDCONTAINSCAR:
+			//case GS_CLOSEDCONTAINSCAR:
+			//case GS_AFTERDROPOFF:
+		default:
+			break;
+		}
 	default:
 		break;
 	}
 }
 
+void CGarage::ThrowCarsNearDoorOutOfGarage(CVehicle* pException)
+{
+	uint32 i = CPools::GetVehiclePool()->GetSize();
+	while (i--) {
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+		if (!pVehicle || pVehicle == pException)
+			continue;
+		if (!IsEntityTouching3D(pVehicle))
+			continue;
+		CColModel* pColModel = pVehicle->GetColModel();
+		for (int i = 0; i < pColModel->numSpheres; i++) {
+			CVector pos = pVehicle->GetMatrix() * pColModel->spheres[i].center;
+			float radius = pColModel->spheres[i].radius;
+			if (!IsPointInsideGarage(pos, 0.0f)) {
+				CVector vecDirectionAway(pVehicle->GetPosition().x - GetGarageCenterX(), pVehicle->GetPosition().y - GetGarageCenterY(), 0.0f);
+				vecDirectionAway.Normalise();
+				pVehicle->AddToMoveSpeed(vecDirectionAway * CTimer::GetTimeStepInSeconds());
+			}
+		}
+	}
+}
+
 bool CGarage::IsStaticPlayerCarEntirelyInside()
 {
 	if (!FindPlayerVehicle())
@@ -1178,8 +1101,8 @@ bool CGarage::IsStaticPlayerCarEntirelyInside()
 	if (FindPlayerPed()->m_objective == OBJECTIVE_LEAVE_VEHICLE)
 		return false;
 	CVehicle* pVehicle = FindPlayerVehicle();
-	if (pVehicle->GetPosition().x < m_fX1 || pVehicle->GetPosition().x > m_fX2 ||
-		pVehicle->GetPosition().y < m_fY1 || pVehicle->GetPosition().y > m_fY2)
+	if (pVehicle->GetPosition().x < m_fInfX || pVehicle->GetPosition().x > m_fSupX ||
+		pVehicle->GetPosition().y < m_fInfY || pVehicle->GetPosition().y > m_fSupY)
 		return false;
 	if (Abs(pVehicle->GetSpeed().x) > 0.01f ||
 		Abs(pVehicle->GetSpeed().y) > 0.01f ||
@@ -1190,35 +1113,58 @@ bool CGarage::IsStaticPlayerCarEntirelyInside()
 	return IsEntityEntirelyInside3D(pVehicle, 0.0f);
 }
 
-bool CGarage::IsEntityEntirelyInside(CEntity * pEntity)
+bool CGarage::IsPointInsideGarage(CVector pos)
 {
-	if (pEntity->GetPosition().x < m_fX1 || pEntity->GetPosition().x > m_fX2 ||
-		pEntity->GetPosition().y < m_fY1 || pEntity->GetPosition().y > m_fY2)
+	// is it IsPointInsideGarage(pos, 0.0f)?
+	if (pos.z < m_fInfZ)
+		return false;
+	if (pos.z > m_fSupZ)
+		return false;
+	CVector2D vecToTarget((CVector2D)pos - m_vecCorner1);
+	float dp = DotProduct2D(m_vDir1, vecToTarget);
+	if (dp < 0.0f)
+		return false;
+	if (m_fDir1Len < dp)
+		return false;
+	dp = DotProduct2D(m_vDir2, vecToTarget);
+	if (dp < 0.0f)
+		return false;
+	if (m_fDir2Len < dp)
+		return false;
+	return true;
+}
+
+bool CGarage::IsPointInsideGarage(CVector pos, float m_fMargin)
+{
+	if (pos.z < m_fInfZ - m_fMargin)
+		return false;
+	if (pos.z > m_fSupZ + m_fMargin)
+		return false;
+	CVector2D vecToTarget((CVector2D)pos - m_vecCorner1);
+	float dp = DotProduct2D(m_vDir1, vecToTarget);
+	if (dp < -m_fMargin)
+		return false;
+	if (m_fDir1Len + m_fMargin < dp)
+		return false;
+	dp = DotProduct2D(m_vDir2, vecToTarget);
+	if (dp < -m_fMargin)
+		return false;
+	if (m_fDir2Len + m_fMargin < dp)
 		return false;
-	CColModel* pColModel = pEntity->GetColModel();
-	for (int i = 0; i < pColModel->numSpheres; i++) {
-		CVector pos = pEntity->GetMatrix() * pColModel->spheres[i].center;
-		float radius = pColModel->spheres[i].radius;
-		if (pos.x - radius < m_fX1 || pos.x + radius > m_fX2 ||
-			pos.y - radius < m_fY1 || pos.y + radius > m_fY2)
-			return false;
-	}
 	return true;
 }
 
 bool CGarage::IsEntityEntirelyInside3D(CEntity * pEntity, float fMargin)
 {
-	if (pEntity->GetPosition().x < m_fX1 - fMargin || pEntity->GetPosition().x > m_fX2 + fMargin ||
-		pEntity->GetPosition().y < m_fY1 - fMargin || pEntity->GetPosition().y > m_fY2 + fMargin ||
-		pEntity->GetPosition().z < m_fZ1 - fMargin || pEntity->GetPosition().z > m_fZ2 + fMargin)
+	if (pEntity->GetPosition().x < m_fInfX - fMargin || pEntity->GetPosition().x > m_fSupX + fMargin ||
+		pEntity->GetPosition().y < m_fInfY - fMargin || pEntity->GetPosition().y > m_fSupY + fMargin ||
+		pEntity->GetPosition().z < m_fInfZ - fMargin || pEntity->GetPosition().z > m_fSupZ + fMargin)
 		return false;
 	CColModel* pColModel = pEntity->GetColModel();
 	for (int i = 0; i < pColModel->numSpheres; i++) {
 		CVector pos = pEntity->GetMatrix() * pColModel->spheres[i].center;
 		float radius = pColModel->spheres[i].radius;
-		if (pos.x + radius < m_fX1 - fMargin || pos.x - radius > m_fX2 + fMargin ||
-			pos.y + radius < m_fY1 - fMargin || pos.y - radius > m_fY2 + fMargin ||
-			pos.z + radius < m_fZ1 - fMargin || pos.z - radius > m_fZ2 + fMargin)
+		if (!IsPointInsideGarage(pos, fMargin - radius))
 			return false;
 	}
 	return true;
@@ -1226,15 +1172,14 @@ bool CGarage::IsEntityEntirelyInside3D(CEntity * pEntity, float fMargin)
 
 bool CGarage::IsEntityEntirelyOutside(CEntity * pEntity, float fMargin)
 {
-	if (pEntity->GetPosition().x > m_fX1 - fMargin && pEntity->GetPosition().x < m_fX2 + fMargin &&
-		pEntity->GetPosition().y > m_fY1 - fMargin && pEntity->GetPosition().y < m_fY2 + fMargin)
+	if (pEntity->GetPosition().x > m_fInfX - fMargin && pEntity->GetPosition().x < m_fSupX + fMargin &&
+		pEntity->GetPosition().y > m_fInfY - fMargin && pEntity->GetPosition().y < m_fSupY + fMargin)
 		return false;
 	CColModel* pColModel = pEntity->GetColModel();
 	for (int i = 0; i < pColModel->numSpheres; i++) {
 		CVector pos = pEntity->GetMatrix() * pColModel->spheres[i].center;
 		float radius = pColModel->spheres[i].radius;
-		if (pos.x + radius > m_fX1 - fMargin && pos.x - radius < m_fX2 + fMargin &&
-			pos.y + radius > m_fY1 - fMargin && pos.y - radius < m_fY2 + fMargin)
+		if (IsPointInsideGarage(pos, fMargin + radius))
 			return false;
 	}
 	return true;
@@ -1243,8 +1188,15 @@ bool CGarage::IsEntityEntirelyOutside(CEntity * pEntity, float fMargin)
 bool CGarage::IsGarageEmpty()
 {
 	int16 num;
-	CWorld::FindObjectsIntersectingCube(CVector(m_fX1, m_fY1, m_fZ1), CVector(m_fX2, m_fY2, m_fZ2), &num, 2, nil, false, true, true, false, false);
-	return num == 0;
+	CEntity* pEntities[16];
+	CWorld::FindObjectsIntersectingCube(CVector(m_fInfX, m_fInfY, m_fInfZ), CVector(m_fSupX, m_fSupY, m_fSupZ), &num, 16, pEntities, false, true, true, false, false);
+	if (num <= 0)
+		return true;
+	for (int i = 0; i < 16; i++) {
+		if (IsEntityTouching3D(pEntities[i]))
+			return false;
+	}
+	return true;
 }
 
 bool CGarage::IsPlayerOutsideGarage()
@@ -1257,20 +1209,18 @@ bool CGarage::IsPlayerOutsideGarage()
 bool CGarage::IsEntityTouching3D(CEntity * pEntity)
 {
 	float radius = pEntity->GetBoundRadius();
-	if (pEntity->GetPosition().x - radius < m_fX1 || pEntity->GetPosition().x + radius > m_fX2 ||
-		pEntity->GetPosition().y - radius < m_fY1 || pEntity->GetPosition().y + radius > m_fY2 ||
-		pEntity->GetPosition().z - radius < m_fZ1 || pEntity->GetPosition().z + radius > m_fZ2)
+	if (pEntity->GetPosition().x - radius < m_fInfX || pEntity->GetPosition().x + radius > m_fSupX ||
+		pEntity->GetPosition().y - radius < m_fInfY || pEntity->GetPosition().y + radius > m_fSupY ||
+		pEntity->GetPosition().z - radius < m_fInfZ || pEntity->GetPosition().z + radius > m_fSupZ)
 		return false;
 	CColModel* pColModel = pEntity->GetColModel();
 	for (int i = 0; i < pColModel->numSpheres; i++) {
 		CVector pos = pEntity->GetMatrix() * pColModel->spheres[i].center;
 		radius = pColModel->spheres[i].radius;
-		if (pos.x + radius > m_fX1 && pos.x - radius < m_fX2 &&
-			pos.y + radius > m_fY1 && pos.y - radius < m_fY2 &&
-			pos.z + radius > m_fZ1 && pos.z - radius < m_fZ2)
-			return false;
+		if (IsPointInsideGarage(pos, radius))
+			return true;
 	}
-	return true;
+	return false;
 }
 
 bool CGarage::EntityHasASphereWayOutsideGarage(CEntity * pEntity, float fMargin)
@@ -1279,9 +1229,7 @@ bool CGarage::EntityHasASphereWayOutsideGarage(CEntity * pEntity, float fMargin)
 	for (int i = 0; i < pColModel->numSpheres; i++) {
 		CVector pos = pEntity->GetMatrix() * pColModel->spheres[i].center;
 		float radius = pColModel->spheres[i].radius;
-		if (pos.x + radius + fMargin < m_fX1 || pos.x - radius - fMargin > m_fX2 ||
-			pos.y + radius + fMargin < m_fY1 || pos.y - radius - fMargin > m_fY2 ||
-			pos.z + radius + fMargin < m_fZ1 || pos.z - radius - fMargin > m_fZ2)
+		if (!IsPointInsideGarage(pos, fMargin + radius))
 			return true;
 	}
 	return false;
@@ -1300,9 +1248,7 @@ bool CGarage::IsAnyOtherCarTouchingGarage(CVehicle * pException)
 		for (int i = 0; i < pColModel->numSpheres; i++) {
 			CVector pos = pVehicle->GetMatrix() * pColModel->spheres[i].center;
 			float radius = pColModel->spheres[i].radius;
-			if (pos.x + radius > m_fX1 && pos.x - radius < m_fX2 &&
-				pos.y + radius > m_fY1 && pos.y - radius < m_fY2 &&
-				pos.z + radius > m_fZ1 && pos.z - radius < m_fZ2)
+			if (IsPointInsideGarage(pos, radius))
 				return true;
 		}
 	}
@@ -1322,9 +1268,7 @@ bool CGarage::IsAnyOtherPedTouchingGarage(CPed * pException)
 		for (int i = 0; i < pColModel->numSpheres; i++) {
 			CVector pos = pPed->GetMatrix() * pColModel->spheres[i].center;
 			float radius = pColModel->spheres[i].radius;
-			if (pos.x + radius > m_fX1 && pos.x - radius < m_fX2 &&
-				pos.y + radius > m_fY1 && pos.y - radius < m_fY2 &&
-				pos.z + radius > m_fZ1 && pos.z - radius < m_fZ2)
+			if (IsPointInsideGarage(pos, radius))
 				return true;
 		}
 	}
@@ -1344,9 +1288,7 @@ bool CGarage::IsAnyCarBlockingDoor()
 		for (int i = 0; i < pColModel->numSpheres; i++) {
 			CVector pos = pVehicle->GetMatrix() * pColModel->spheres[i].center;
 			float radius = pColModel->spheres[i].radius;
-			if (pos.x + radius < m_fX1 || pos.x - radius > m_fX2 ||
-				pos.y + radius < m_fY1 || pos.y - radius > m_fY2 ||
-				pos.z + radius < m_fZ1 || pos.z - radius > m_fZ2)
+			if (!IsPointInsideGarage(pos, radius))
 				return true;
 		}
 	}
@@ -1361,9 +1303,7 @@ int32 CGarage::CountCarsWithCenterPointWithinGarage(CEntity * pException)
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
 		if (!pVehicle || pVehicle == pException)
 			continue;
-		if (pVehicle->GetPosition().x > m_fX1 && pVehicle->GetPosition().x < m_fX2 &&
-			pVehicle->GetPosition().y > m_fY1 && pVehicle->GetPosition().y < m_fY2 &&
-			pVehicle->GetPosition().z > m_fZ1 && pVehicle->GetPosition().z < m_fZ2)
+		if (IsPointInsideGarage(pVehicle->GetPosition()))
 			total++;
 	}
 	return total;
@@ -1378,9 +1318,7 @@ void CGarage::RemoveCarsBlockingDoorNotInside()
 			continue;
 		if (!IsEntityTouching3D(pVehicle))
 			continue;
-		if (pVehicle->GetPosition().x < m_fX1 || pVehicle->GetPosition().x > m_fX2 ||
-			pVehicle->GetPosition().y < m_fY1 || pVehicle->GetPosition().y > m_fY2 ||
-			pVehicle->GetPosition().z < m_fZ1 || pVehicle->GetPosition().z > m_fZ2) {
+		if (!IsPointInsideGarage(pVehicle->GetPosition())) {
 			if (pVehicle->bIsLocked && pVehicle->CanBeDeleted()) {
 				CWorld::Remove(pVehicle);
 				delete pVehicle;
@@ -1412,7 +1350,7 @@ void CGarages::PrintMessages()
 			if (MessageNumberInString < 0) {
 				CFont::PrintString(SCREEN_WIDTH / 2 - SCREEN_SCALE_X(2.0f), y_offset - SCREEN_SCALE_Y(2.0f), TheText.Get(MessageIDString));
 
-				CFont::SetColor(CRGBA(89, 115, 150, 255));
+				CFont::SetColor(CRGBA(27, 89, 130, 255));
 				CFont::PrintString(SCREEN_WIDTH / 2, y_offset, TheText.Get(MessageIDString));
 			}
 			else {
@@ -1420,7 +1358,7 @@ void CGarages::PrintMessages()
 
 				CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), y_offset - SCREEN_SCALE_Y(40.0f) + SCREEN_SCALE_Y(2.0f), gUString);
 
-				CFont::SetColor(CRGBA(89, 115, 150, 255));
+				CFont::SetColor(CRGBA(27, 89, 130, 255));
 				CFont::PrintString(SCREEN_WIDTH / 2, y_offset - SCREEN_SCALE_Y(40.0f), gUString);
 			}
 		}
@@ -1428,7 +1366,7 @@ void CGarages::PrintMessages()
 			CMessages::InsertNumberInString(TheText.Get(MessageIDString), MessageNumberInString, MessageNumberInString2, -1, -1, -1, -1, gUString);
 			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), y_offset - SCREEN_SCALE_Y(40.0f) + SCREEN_SCALE_Y(2.0f), gUString);
 
-			CFont::SetColor(CRGBA(89, 115, 150, 255));
+			CFont::SetColor(CRGBA(27, 89, 130, 255));
 			CFont::PrintString(SCREEN_WIDTH / 2, y_offset - SCREEN_SCALE_Y(40.0f), gUString);
 		}
 	}
@@ -1458,15 +1396,27 @@ void CGarage::UpdateDoorsHeight()
 	RefreshDoorPointers(false);
 	if (m_pDoor1) {
 		m_pDoor1->GetMatrix().GetPosition().z = m_fDoorPos + m_fDoor1Z;
-		if (m_bRotatedDoor)
+		if (m_bRotatedDoor) {
+			CVector pos;
+			pos.x = m_fDoor1X + m_fDoorPos * m_pDoor1->GetForward().y * 5.0f / 6.0f;
+			pos.y = m_fDoor1Y - m_fDoorPos * m_pDoor1->GetForward().x * 5.0f / 6.0f;
+			pos.z = m_pDoor1->GetPosition().z;
+			m_pDoor1->SetPosition(pos);
 			BuildRotatedDoorMatrix(m_pDoor1, m_fDoorPos / m_fDoorHeight);
+		}
 		m_pDoor1->GetMatrix().UpdateRW();
 		m_pDoor1->UpdateRwFrame();
 	}
 	if (m_pDoor2) {
 		m_pDoor2->GetMatrix().GetPosition().z = m_fDoorPos + m_fDoor2Z;
-		if (m_bRotatedDoor)
+		if (m_bRotatedDoor) {
+			CVector pos;
+			pos.x = m_fDoor2X + m_fDoorPos * m_pDoor2->GetForward().y * 5.0f / 6.0f;
+			pos.y = m_fDoor2Y - m_fDoorPos * m_pDoor2->GetForward().x * 5.0f / 6.0f;
+			pos.z = m_pDoor2->GetPosition().z;
+			m_pDoor2->SetPosition(pos);
 			BuildRotatedDoorMatrix(m_pDoor2, m_fDoorPos / m_fDoorHeight);
+		}
 		m_pDoor2->GetMatrix().UpdateRW();
 		m_pDoor2->UpdateRwFrame();
 	}
@@ -1568,6 +1518,7 @@ void CGarages::SetTargetCarForMissonGarage(int16 garage, CVehicle * pVehicle)
 	assert(garage >= 0 && garage < NUM_GARAGES);
 	if (pVehicle) {
 		aGarages[garage].m_pTarget = pVehicle;
+		aGarages[garage].m_pTarget->RegisterReference((CEntity**)&aGarages[garage].m_pTarget);
 		if (aGarages[garage].m_eGarageState == GS_CLOSEDCONTAINSCAR)
 			aGarages[garage].m_eGarageState = GS_FULLYCLOSED;
 	}
@@ -1619,11 +1570,9 @@ bool CGarages::HasThisCarBeenCollected(int16 garage, uint8 id)
 
 bool CGarage::DoesCraigNeedThisCar(int32 mi)
 {
-	if (mi == MI_CORPSE)
-		mi = MI_MANANA;
 	int ct = CGarages::GetCarsCollectedIndexForGarageType(m_eGarageType);
 	for (int i = 0; i < TOTAL_COLLECTCARS_CARS; i++) {
-		if (mi == gaCarsToCollectInCraigsGarages[ct][i])
+		if (mi == gaCarsToCollectInCraigsGarages[ct][i] || (gaCarsToCollectInCraigsGarages[ct][i] == MI_CHEETAH && mi == MI_VICECHEE))
 			return (CGarages::CarTypesCollected[ct] & BIT(i)) == 0;
 	}
 	return false;
@@ -1631,11 +1580,9 @@ bool CGarage::DoesCraigNeedThisCar(int32 mi)
 
 bool CGarage::HasCraigCollectedThisCar(int32 mi)
 {
-	if (mi == MI_CORPSE)
-		mi = MI_MANANA;
 	int ct = CGarages::GetCarsCollectedIndexForGarageType(m_eGarageType);
 	for (int i = 0; i < TOTAL_COLLECTCARS_CARS; i++) {
-		if (mi == gaCarsToCollectInCraigsGarages[ct][i])
+		if (mi == gaCarsToCollectInCraigsGarages[ct][i] || (gaCarsToCollectInCraigsGarages[ct][i] == MI_CHEETAH && mi == MI_VICECHEE))
 			return CGarages::CarTypesCollected[ct] & BIT(i);
 	}
 	return false;
@@ -1643,12 +1590,10 @@ bool CGarage::HasCraigCollectedThisCar(int32 mi)
 
 bool CGarage::MarkThisCarAsCollectedForCraig(int32 mi)
 {
-	if (mi == MI_CORPSE)
-		mi = MI_MANANA;
 	int ct = CGarages::GetCarsCollectedIndexForGarageType(m_eGarageType);
 	int index;
 	for (index = 0; index < TOTAL_COLLECTCARS_CARS; index++) {
-		if (mi == gaCarsToCollectInCraigsGarages[ct][index])
+		if (mi == gaCarsToCollectInCraigsGarages[ct][index] || (gaCarsToCollectInCraigsGarages[ct][index] == MI_CHEETAH && mi == MI_VICECHEE))
 			break;
 	}
 	if (index >= TOTAL_COLLECTCARS_CARS)
@@ -1681,16 +1626,16 @@ void CGarage::CloseThisGarage()
 float CGarage::CalcDistToGarageRectangleSquared(float X, float Y)
 {
 	float distX, distY;
-	if (X < m_fX1)
-		distX = m_fX1 - X;
-	else if (X > m_fX2)
-		distX = X - m_fX2;
+	if (X < m_fInfX)
+		distX = m_fInfX - X;
+	else if (X > m_fSupX)
+		distX = X - m_fSupX;
 	else
 		distX = 0.0f;
-	if (Y < m_fY1)
-		distY = m_fY1 - Y;
-	else if (Y > m_fY2)
-		distY = Y - m_fY2;
+	if (Y < m_fInfY)
+		distY = m_fInfY - Y;
+	else if (Y > m_fSupY)
+		distY = Y - m_fSupY;
 	else
 		distY = 0.0f;
 	return SQR(distX) + SQR(distY);
@@ -1711,10 +1656,10 @@ void CGarage::FindDoorsEntities()
 {
 	m_pDoor1 = nil;
 	m_pDoor2 = nil;
-	int xstart = Max(0, CWorld::GetSectorIndexX(m_fX1));
-	int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(m_fX2));
-	int ystart = Max(0, CWorld::GetSectorIndexY(m_fY1));
-	int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(m_fY2));
+	int xstart = Max(0, CWorld::GetSectorIndexX(m_fInfX));
+	int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(m_fSupX));
+	int ystart = Max(0, CWorld::GetSectorIndexY(m_fInfY));
+	int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(m_fSupY));
 	assert(xstart <= xend);
 	assert(ystart <= yend);
 
@@ -1729,20 +1674,22 @@ void CGarage::FindDoorsEntities()
 			FindDoorsEntitiesSectorList(s->m_lists[ENTITYLIST_DUMMIES_OVERLAP], true);
 		}
 	}
-	if (!m_pDoor1 || !m_pDoor2)
-		return;
-	if (m_pDoor1->GetModelIndex() == MI_CRUSHERBODY || m_pDoor1->GetModelIndex() == MI_CRUSHERLID)
-		return;
-	CVector2D vecDoor1ToGarage(m_pDoor1->GetPosition().x - GetGarageCenterX(), m_pDoor1->GetPosition().y - GetGarageCenterY());
-	CVector2D vecDoor2ToGarage(m_pDoor2->GetPosition().x - GetGarageCenterX(), m_pDoor2->GetPosition().y - GetGarageCenterY());
-	if (DotProduct2D(vecDoor1ToGarage, vecDoor2ToGarage) > 0.0f) {
-		if (vecDoor1ToGarage.MagnitudeSqr() >= vecDoor2ToGarage.MagnitudeSqr()) {
-			m_pDoor1 = m_pDoor2;
-			m_bDoor1IsDummy = m_bDoor2IsDummy;
+	if (m_pDoor1 && m_pDoor2) {
+		CVector2D vecDoor1ToGarage(m_pDoor1->GetPosition().x - GetGarageCenterX(), m_pDoor1->GetPosition().y - GetGarageCenterY());
+		CVector2D vecDoor2ToGarage(m_pDoor2->GetPosition().x - GetGarageCenterX(), m_pDoor2->GetPosition().y - GetGarageCenterY());
+		if (DotProduct2D(vecDoor1ToGarage, vecDoor2ToGarage) > 0.0f) {
+			if (vecDoor1ToGarage.MagnitudeSqr() >= vecDoor2ToGarage.MagnitudeSqr()) {
+				m_pDoor1 = m_pDoor2;
+				m_bDoor1IsDummy = m_bDoor2IsDummy;
+			}
+			m_pDoor2 = nil;
+			m_bDoor2IsDummy = false;
 		}
-		m_pDoor2 = nil;
-		m_bDoor2IsDummy = false;
 	}
+	if (m_pDoor1)
+		m_pDoor1->bUsesCollision = true;
+	if (m_pDoor2)
+		m_pDoor2->bUsesCollision = true;
 }
 
 void CGarage::FindDoorsEntitiesSectorList(CPtrList& list, bool dummy)
@@ -1755,29 +1702,8 @@ void CGarage::FindDoorsEntitiesSectorList(CPtrList& list, bool dummy)
 		pEntity->m_scanCode = CWorld::GetCurrentScanCode();
 		if (!pEntity || !CGarages::IsModelIndexADoor(pEntity->GetModelIndex()))
 			continue;
-		if (Abs(pEntity->GetPosition().x - GetGarageCenterX()) >= DISTANCE_TO_CONSIDER_DOOR_FOR_GARAGE)
-			continue;
-		if (Abs(pEntity->GetPosition().y - GetGarageCenterY()) >= DISTANCE_TO_CONSIDER_DOOR_FOR_GARAGE)
-			continue;
-		if (pEntity->GetModelIndex() == MI_CRUSHERBODY) {
-			m_pDoor1 = pEntity;
-			m_bDoor1IsDummy = dummy;
-			// very odd pool operations, they could have used GetJustIndex
-			if (dummy)
-				m_bDoor1PoolIndex = (CPools::GetDummyPool()->GetIndex((CDummy*)pEntity)) & 0x7F;
-			else
-				m_bDoor1PoolIndex = (CPools::GetObjectPool()->GetIndex((CObject*)pEntity)) & 0x7F;
-			continue;
-		}
-		if (pEntity->GetModelIndex() == MI_CRUSHERLID) {
-			m_pDoor2 = pEntity;
-			m_bDoor2IsDummy = dummy;
-			if (dummy)
-				m_bDoor2PoolIndex = (CPools::GetDummyPool()->GetIndex((CDummy*)pEntity)) & 0x7F;
-			else
-				m_bDoor2PoolIndex = (CPools::GetObjectPool()->GetIndex((CObject*)pEntity)) & 0x7F;
+		if (!IsPointInsideGarage(pEntity->GetPosition(), 2.0f))
 			continue;
-		}
 		if (!m_pDoor1) {
 			m_pDoor1 = pEntity;
 			m_bDoor1IsDummy = dummy;
@@ -1812,6 +1738,8 @@ void CGarages::SetGarageDoorToRotate(int16 garage)
 	aGarages[garage].m_bRotatedDoor = true;
 	aGarages[garage].m_fDoorHeight /= 2.0f;
 	aGarages[garage].m_fDoorHeight -= 0.1f;
+	aGarages[garage].m_fDoorPos = Min(aGarages[garage].m_fDoorHeight, aGarages[garage].m_fDoorPos);
+	aGarages[garage].UpdateDoorsHeight();
 }
 
 void CGarages::SetLeaveCameraForThisGarage(int16 garage)
@@ -1861,15 +1789,12 @@ CVehicle* CStoredCar::RestoreCar()
 	{
 		CVehicleModelInfo::SetComponentsToUse(m_nVariationA, m_nVariationB);
 	}
-#ifdef FIX_BUGS
 	CVehicle* pVehicle;
 	if (CModelInfo::IsBoatModel(m_nModelIndex))
 		pVehicle = new CBoat(m_nModelIndex, RANDOM_VEHICLE);
+	// else if bike - TODO(MIAMI)
 	else
 		pVehicle = new CAutomobile(m_nModelIndex, RANDOM_VEHICLE);
-#else
-	CVehicle* pVehicle = new CAutomobile(m_nModelIndex, RANDOM_VEHICLE);
-#endif
 	pVehicle->SetPosition(m_vecPos);
 	pVehicle->SetStatus(STATUS_ABANDONED);
 	pVehicle->GetForward() = m_vecAngle;
@@ -1903,9 +1828,7 @@ void CGarage::StoreAndRemoveCarsForThisHideout(CStoredCar* aCars, int32 nMax)
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
 		if (!pVehicle)
 			continue;
-		if (pVehicle->GetPosition().x > m_fX1 && pVehicle->GetPosition().x < m_fX2 &&
-			pVehicle->GetPosition().y > m_fY1 && pVehicle->GetPosition().y < m_fY2 &&
-			pVehicle->GetPosition().z > m_fZ1 && pVehicle->GetPosition().z < m_fZ2) {
+		if (IsPointInsideGarage(pVehicle->GetPosition())) {
 			if (pVehicle->VehicleCreatedBy != MISSION_VEHICLE) {
 				if (index < Max(NUM_GARAGE_STORED_CARS, nMax) && !EntityHasASphereWayOutsideGarage(pVehicle, 1.0f))
 					aCars[index++].StoreCar(pVehicle);
@@ -1947,17 +1870,12 @@ bool CGarages::IsPointInAGarageCameraZone(CVector point)
 		case GARAGE_COLLECTCARS_1:
 		case GARAGE_COLLECTCARS_2:
 		case GARAGE_COLLECTCARS_3:
-			if (aGarages[i].m_fX1 - MARGIN_FOR_CAMERA_COLLECTCARS <= point.x &&
-				aGarages[i].m_fX2 + MARGIN_FOR_CAMERA_COLLECTCARS >= point.x &&
-				aGarages[i].m_fY1 - MARGIN_FOR_CAMERA_COLLECTCARS <= point.y &&
-				aGarages[i].m_fY2 + MARGIN_FOR_CAMERA_COLLECTCARS >= point.y)
+		case GARAGE_COLLECTCARS_4:
+			if (aGarages[i].IsPointInsideGarage(point, MARGIN_FOR_CAMERA_COLLECTCARS))
 				return true;
 			break;
 		default:
-			if (aGarages[i].m_fX1 - MARGIN_FOR_CAMERA_DEFAULT <= point.x &&
-				aGarages[i].m_fX2 + MARGIN_FOR_CAMERA_DEFAULT >= point.x &&
-				aGarages[i].m_fY1 - MARGIN_FOR_CAMERA_DEFAULT <= point.y &&
-				aGarages[i].m_fY2 + MARGIN_FOR_CAMERA_DEFAULT >= point.y)
+			if (aGarages[i].IsPointInsideGarage(point, MARGIN_FOR_CAMERA_DEFAULT))
 				return true;
 			break;
 		}
@@ -1988,9 +1906,7 @@ void CGarage::TidyUpGarage()
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
 		if (!pVehicle || !pVehicle->IsCar())
 			continue;
-		if (pVehicle->GetPosition().x > m_fX1 && pVehicle->GetPosition().x < m_fX2 &&
-			pVehicle->GetPosition().y > m_fY1 && pVehicle->GetPosition().y < m_fY2 &&
-			pVehicle->GetPosition().z > m_fZ1 && pVehicle->GetPosition().z < m_fZ2) {
+		if (IsPointInsideGarage(pVehicle->GetPosition())) {
 			if (pVehicle->GetStatus() == STATUS_WRECKED || pVehicle->GetUp().z < 0.5f) {
 				CWorld::Remove(pVehicle);
 				delete pVehicle;
@@ -2014,11 +1930,8 @@ void CGarage::TidyUpGarageClose()
 			for (int i = 0; i < pColModel->numSpheres; i++) {
 				CVector pos = pVehicle->GetMatrix() * pColModel->spheres[i].center;
 				float radius = pColModel->spheres[i].radius;
-				if (pos.x + radius < m_fX1 || pos.x - radius > m_fX2 ||
-					pos.y + radius < m_fY1 || pos.y - radius > m_fY2 ||
-					pos.z + radius < m_fZ1 || pos.z - radius > m_fZ2) {
+				if (!IsPointInsideGarage(pos, radius))
 					bRemove = true;
-				}
 			}
 		}
 		else
@@ -2061,6 +1974,17 @@ void CGarage::PlayerArrestedOrDied()
 	case GARAGE_FOR_SCRIPT_TO_OPEN_AND_CLOSE:
 	case GARAGE_KEEPS_OPENING_FOR_SPECIFIC_CAR:
 	case GARAGE_MISSION_KEEPCAR_REMAINCLOSED:
+	case GARAGE_COLLECTCARS_4:
+	case GARAGE_FOR_SCRIPT_TO_OPEN_FOR_CAR:
+	case GARAGE_HIDEOUT_FOUR:
+	case GARAGE_HIDEOUT_FIVE:
+	case GARAGE_HIDEOUT_SIX:
+	case GARAGE_HIDEOUT_SEVEN:
+	case GARAGE_HIDEOUT_EIGHT:
+	case GARAGE_HIDEOUT_NINE:
+	case GARAGE_HIDEOUT_TEN:
+	case GARAGE_HIDEOUT_ELEVEN:
+	case GARAGE_HIDEOUT_TWELVE:
 		switch (m_eGarageState) {
 		case GS_OPENED:
 		case GS_CLOSING:
@@ -2112,36 +2036,19 @@ void CGarage::CenterCarInGarage(CVehicle* pVehicle)
 		pVehicle->GetMatrix().GetPosition().x += offsetX * RESPRAY_CENTERING_COEFFICIENT / distance;
 		pVehicle->GetMatrix().GetPosition().y += offsetY * RESPRAY_CENTERING_COEFFICIENT / distance;
 	}
-	if (!IsEntityEntirelyInside3D(pVehicle, 0.1f))
+	if (!IsEntityEntirelyInside3D(pVehicle, 0.3f))
 		pVehicle->SetPosition(pos);
 }
 
 void CGarages::CloseHideOutGaragesBeforeSave()
 {
 	for (int i = 0; i < NUM_GARAGES; i++) {
-		if (aGarages[i].m_eGarageType != GARAGE_HIDEOUT_ONE &&
-			aGarages[i].m_eGarageType != GARAGE_HIDEOUT_TWO &&
-			aGarages[i].m_eGarageType != GARAGE_HIDEOUT_THREE)
+		if (!IsThisGarageTypeSafehouse(aGarages[i].m_eGarageType))
 			continue;
-		if (aGarages[i].m_eGarageState != GS_FULLYCLOSED &&
-			(aGarages[i].m_eGarageType != GARAGE_HIDEOUT_ONE || !aGarages[i].IsAnyCarBlockingDoor())) {
+		if (aGarages[i].m_eGarageState != GS_FULLYCLOSED) {
 			aGarages[i].m_eGarageState = GS_FULLYCLOSED;
-			switch (aGarages[i].m_eGarageType) {
-			case GARAGE_HIDEOUT_ONE:
-				aGarages[i].StoreAndRemoveCarsForThisHideout(aCarsInSafeHouse1, NUM_GARAGE_STORED_CARS);
-				aGarages[i].RemoveCarsBlockingDoorNotInside();
-				break;
-			case GARAGE_HIDEOUT_TWO:
-				aGarages[i].StoreAndRemoveCarsForThisHideout(aCarsInSafeHouse2, NUM_GARAGE_STORED_CARS);
-				aGarages[i].RemoveCarsBlockingDoorNotInside();
-				break;
-			case GARAGE_HIDEOUT_THREE:
-				aGarages[i].StoreAndRemoveCarsForThisHideout(aCarsInSafeHouse3, NUM_GARAGE_STORED_CARS);
-				aGarages[i].RemoveCarsBlockingDoorNotInside();
-				break;
-			default:
-				break;
-			}
+			aGarages[i].StoreAndRemoveCarsForThisHideout(aCarsInSafeHouses[FindSafeHouseIndexForGarageType(aGarages[i].m_eGarageType)], NUM_GARAGE_STORED_CARS);
+			aGarages[i].RemoveCarsBlockingDoorNotInside();
 		}
 		aGarages[i].m_fDoorPos = 0.0f;
 		aGarages[i].UpdateDoorsHeight();
@@ -2152,36 +2059,11 @@ int32 CGarages::CountCarsInHideoutGarage(eGarageType type)
 {
 	int32 total = 0;
 	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++) {
-		switch (type) {
-		case GARAGE_HIDEOUT_ONE:
-			total += (aCarsInSafeHouse1[i].HasCar());
-			break;
-		case GARAGE_HIDEOUT_TWO:
-			total += (aCarsInSafeHouse2[i].HasCar());
-			break;
-		case GARAGE_HIDEOUT_THREE:
-			total += (aCarsInSafeHouse3[i].HasCar());
-			break;
-		default: break;
-		}
+		total += aCarsInSafeHouses[FindSafeHouseIndexForGarageType(type)][i].HasCar();
 	}
 	return total;
 }
 
-int32 CGarages::FindMaxNumStoredCarsForGarage(eGarageType type)
-{
-	switch (type) {
-	case GARAGE_HIDEOUT_ONE:
-		return LIMIT_CARS_IN_INDUSTRIAL;
-	case GARAGE_HIDEOUT_TWO:
-		return LIMIT_CARS_IN_COMMERCIAL;
-	case GARAGE_HIDEOUT_THREE:
-		return LIMIT_CARS_IN_SUBURBAN;
-	default: break;
-	}
-	return 0;
-}
-
 bool CGarages::IsPointWithinHideOutGarage(Const CVector& point)
 {
 	for (int i = 0; i < NUM_GARAGES; i++) {
@@ -2189,9 +2071,7 @@ bool CGarages::IsPointWithinHideOutGarage(Const CVector& point)
 		case GARAGE_HIDEOUT_ONE:
 		case GARAGE_HIDEOUT_TWO:
 		case GARAGE_HIDEOUT_THREE:
-			if (point.x > aGarages[i].m_fX1 && point.x < aGarages[i].m_fX2 &&
-				point.y > aGarages[i].m_fY1 && point.y < aGarages[i].m_fY2 &&
-				point.z > aGarages[i].m_fZ1 && point.z < aGarages[i].m_fZ2)
+			if (aGarages[i].IsPointInsideGarage(point))
 				return true;
 		default: break;
 		}
@@ -2206,9 +2086,7 @@ bool CGarages::IsPointWithinAnyGarage(Const CVector& point)
 		case GARAGE_NONE:
 			continue;
 		default:
-			if (point.x > aGarages[i].m_fX1 && point.x < aGarages[i].m_fX2 &&
-				point.y > aGarages[i].m_fY1 && point.y < aGarages[i].m_fY2 &&
-				point.z > aGarages[i].m_fZ1 && point.z < aGarages[i].m_fZ2)
+			if (aGarages[i].IsPointInsideGarage(point))
 				return true;
 		}
 	}
@@ -2245,14 +2123,11 @@ void CGarages::SetAllDoorsBackToOriginalHeight()
 	}
 }
 
+// TODO(MIAMI)
 void CGarages::Save(uint8 * buf, uint32 * size)
 {
-#ifdef FIX_GARAGE_SIZE
-	INITSAVEBUF
-	*size = (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + 3 * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
-#else
-	* size = 5484;
-#endif
+INITSAVEBUF
+	*size = (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + TOTAL_HIDEOUT_GARAGES * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
 	CloseHideOutGaragesBeforeSave();
 	WriteSaveBuf(buf, NumGarages);
 	WriteSaveBuf(buf, (uint32)BombsAreFree);
@@ -2264,15 +2139,13 @@ void CGarages::Save(uint8 * buf, uint32 * size)
 		WriteSaveBuf(buf, CarTypesCollected[i]);
 	WriteSaveBuf(buf, LastTimeHelpMessage);
 	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++) {
-		WriteSaveBuf(buf, aCarsInSafeHouse1[i]);
-		WriteSaveBuf(buf, aCarsInSafeHouse2[i]);
-		WriteSaveBuf(buf, aCarsInSafeHouse3[i]);
+		for (int j = 0; j < TOTAL_HIDEOUT_GARAGES; j++) {
+			WriteSaveBuf(buf, aCarsInSafeHouses[j][i]);
+		}
 	}
 	for (int i = 0; i < NUM_GARAGES; i++)
 		WriteSaveBuf(buf, aGarages[i]);
-#ifdef FIX_GARAGE_SIZE
-	VALIDATESAVEBUF(*size);
-#endif
+VALIDATESAVEBUF(*size);
 }
 
 const CStoredCar &CStoredCar::operator=(const CStoredCar & other)
@@ -2294,14 +2167,11 @@ const CStoredCar &CStoredCar::operator=(const CStoredCar & other)
 	return *this;
 }
 
+//TODO(MIAMI)
 void CGarages::Load(uint8* buf, uint32 size)
 {
-#ifdef FIX_GARAGE_SIZE
-	INITSAVEBUF
-	assert(size == (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + 3 * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
-#else
-	assert(size == 5484);
-#endif
+INITSAVEBUF
+	assert(size == (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + TOTAL_HIDEOUT_GARAGES * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage)));
 	CloseHideOutGaragesBeforeSave();
 	NumGarages = ReadSaveBuf<uint32>(buf);
 	BombsAreFree = ReadSaveBuf<uint32>(buf);
@@ -2313,9 +2183,9 @@ void CGarages::Load(uint8* buf, uint32 size)
 		CarTypesCollected[i] = ReadSaveBuf<uint32>(buf);
 	LastTimeHelpMessage = ReadSaveBuf<uint32>(buf);
 	for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++) {
-		aCarsInSafeHouse1[i] = ReadSaveBuf<CStoredCar>(buf);
-		aCarsInSafeHouse2[i] = ReadSaveBuf<CStoredCar>(buf);
-		aCarsInSafeHouse3[i] = ReadSaveBuf<CStoredCar>(buf);
+		for (int j = 0; j < TOTAL_HIDEOUT_GARAGES; j++) {
+			aCarsInSafeHouses[j][i] = ReadSaveBuf<CStoredCar>(buf);
+		}
 	}
 	for (int i = 0; i < NUM_GARAGES; i++) {
 		aGarages[i] = ReadSaveBuf<CGarage>(buf);
@@ -2330,9 +2200,7 @@ void CGarages::Load(uint8* buf, uint32 size)
 		else
 			aGarages[i].UpdateDoorsHeight();
 	}
-#ifdef FIX_GARAGE_SIZE
-	VALIDATESAVEBUF(size);
-#endif
+VALIDATESAVEBUF(size);
 
 	MessageEndTime = 0;
 	bCamShouldBeOutisde = false;
@@ -2342,8 +2210,7 @@ void CGarages::Load(uint8* buf, uint32 size)
 bool
 CGarages::IsModelIndexADoor(uint32 id)
 {
-	return id == MI_GARAGEDOOR1 ||
-		id == MI_GARAGEDOOR2 ||
+	return id == MI_GARAGEDOOR2 ||
 		id == MI_GARAGEDOOR3 ||
 		id == MI_GARAGEDOOR4 ||
 		id == MI_GARAGEDOOR5 ||
@@ -2357,7 +2224,6 @@ CGarages::IsModelIndexADoor(uint32 id)
 		id == MI_GARAGEDOOR14 ||
 		id == MI_GARAGEDOOR15 ||
 		id == MI_GARAGEDOOR16 ||
-		id == MI_GARAGEDOOR17 ||
 		id == MI_GARAGEDOOR18 ||
 		id == MI_GARAGEDOOR19 ||
 		id == MI_GARAGEDOOR20 ||
@@ -2366,13 +2232,5 @@ CGarages::IsModelIndexADoor(uint32 id)
 		id == MI_GARAGEDOOR23 ||
 		id == MI_GARAGEDOOR24 ||
 		id == MI_GARAGEDOOR25 ||
-		id == MI_GARAGEDOOR26 ||
-		id == MI_GARAGEDOOR27 ||
-		id == MI_GARAGEDOOR28 ||
-		id == MI_GARAGEDOOR29 ||
-		id == MI_GARAGEDOOR30 ||
-		id == MI_GARAGEDOOR31 ||
-		id == MI_GARAGEDOOR32 ||
-		id == MI_CRUSHERBODY ||
-		id == MI_CRUSHERLID;
+		id == MI_GARAGEDOOR26;
 }
diff --git a/src/control/Garages.h b/src/control/Garages.h
index 00020eb3..79905ede 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -42,12 +42,24 @@ enum eGarageType : int8
 	GARAGE_FOR_SCRIPT_TO_OPEN_AND_CLOSE,
 	GARAGE_KEEPS_OPENING_FOR_SPECIFIC_CAR,
 	GARAGE_MISSION_KEEPCAR_REMAINCLOSED,
+	GARAGE_COLLECTCARS_4,
+	GARAGE_FOR_SCRIPT_TO_OPEN_FOR_CAR,
+	GARAGE_HIDEOUT_FOUR,
+	GARAGE_HIDEOUT_FIVE,
+	GARAGE_HIDEOUT_SIX,
+	GARAGE_HIDEOUT_SEVEN,
+	GARAGE_HIDEOUT_EIGHT,
+	GARAGE_HIDEOUT_NINE,
+	GARAGE_HIDEOUT_TEN,
+	GARAGE_HIDEOUT_ELEVEN,
+	GARAGE_HIDEOUT_TWELVE
 };
 
 enum
 {
-	TOTAL_COLLECTCARS_GARAGES = GARAGE_COLLECTCARS_3 - GARAGE_COLLECTCARS_1 + 1,
-	TOTAL_COLLECTCARS_CARS = 16
+	TOTAL_COLLECTCARS_GARAGES = 4,
+	TOTAL_HIDEOUT_GARAGES = 12,
+	TOTAL_COLLECTCARS_CARS = 6
 };
 
 class CStoredCar
@@ -83,6 +95,7 @@ class CGarage
 {
 	eGarageType m_eGarageType;
 	eGarageState m_eGarageState;
+	uint8 m_nMaxStoredCars;
 	bool field_2; // unused
 	bool m_bClosingWithoutTargetCar;
 	bool m_bDeactivated;
@@ -97,12 +110,17 @@ class CGarage
 	bool m_bRecreateDoorOnNextRefresh;
 	bool m_bRotatedDoor;
 	bool m_bCameraFollowsPlayer;
-	float m_fX1;
-	float m_fX2;
-	float m_fY1;
-	float m_fY2;
-	float m_fZ1;
-	float m_fZ2;
+	CVector2D m_vecCorner1;
+	float m_fInfZ;
+	CVector2D m_vDir1;
+	CVector2D m_vDir2;
+	float m_fSupZ;
+	float m_fDir1Len;
+	float m_fDir2Len;
+	float m_fInfX;
+	float m_fSupX;
+	float m_fInfY;
+	float m_fSupY;
 	float m_fDoorPos;
 	float m_fDoorHeight;
 	float m_fDoor1X;
@@ -123,8 +141,8 @@ class CGarage
 	bool IsClosed() { return m_eGarageState == GS_FULLYCLOSED; }
 	bool IsUsed() { return m_eGarageType != GARAGE_NONE; }
 	void Update();
-	float GetGarageCenterX() { return (m_fX1 + m_fX2) / 2; }
-	float GetGarageCenterY() { return (m_fY1 + m_fY2) / 2; }
+	float GetGarageCenterX() { return (m_fInfX + m_fSupX) / 2; }
+	float GetGarageCenterY() { return (m_fInfY + m_fSupY) / 2; }
 	bool IsFar()
 	{ 
 #ifdef FIX_BUGS
@@ -142,7 +160,6 @@ class CGarage
 	void UpdateDoorsHeight();
 	bool IsEntityEntirelyInside3D(CEntity*, float);
 	bool IsEntityEntirelyOutside(CEntity*, float);
-	bool IsEntityEntirelyInside(CEntity*);
 	float CalcDistToGarageRectangleSquared(float, float);
 	float CalcSmallestDistToGarageDoorSquared(float, float);
 	bool IsAnyOtherCarTouchingGarage(CVehicle* pException);
@@ -167,17 +184,22 @@ class CGarage
 	void FindDoorsEntitiesSectorList(CPtrList&, bool);
 	void PlayerArrestedOrDied();
 
+	bool IsPointInsideGarage(CVector);
+	bool IsPointInsideGarage(CVector, float);
+	void ThrowCarsNearDoorOutOfGarage(CVehicle*);
+
+	int32 FindMaxNumStoredCarsForGarage() { return Max(NUM_GARAGE_STORED_CARS, m_nMaxStoredCars); }
+
 	friend class CGarages;
 	friend class cAudioManager;
 	friend class CCamera;
 };
 
-VALIDATE_SIZE(CGarage, 140);
-
 class CGarages
 {
 	enum {
-		MESSAGE_LENGTH = 8
+		MESSAGE_LENGTH = 8,
+		MAX_NUM_CARS_IN_HIDEOUT_GARAGE = 4
 	};
 	static int32 BankVansCollected;
 	static bool BombsAreFree;
@@ -195,9 +217,7 @@ class CGarages
 	static bool PlayerInGarage;
 	static int32 PoliceCarsCollected;
 	static CGarage aGarages[NUM_GARAGES];
-	static CStoredCar aCarsInSafeHouse1[NUM_GARAGE_STORED_CARS];
-	static CStoredCar aCarsInSafeHouse2[NUM_GARAGE_STORED_CARS];
-	static CStoredCar aCarsInSafeHouse3[NUM_GARAGE_STORED_CARS];
+	static CStoredCar aCarsInSafeHouses[TOTAL_HIDEOUT_GARAGES][MAX_NUM_CARS_IN_HIDEOUT_GARAGE];
 	static int32 AudioEntity;
 	static bool bCamShouldBeOutisde;
 
@@ -208,7 +228,7 @@ public:
 #endif
 	static void Update(void);
 
-	static int16 AddOne(float X1, float Y1, float Z1, float X2, float Y2, float Z2, eGarageType type, int32 targetId);
+	static int16 AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, eGarageType type, int32 targetId);
 	static void ChangeGarageType(int16, eGarageType, int32);
 	static void PrintMessages(void);
 	static void TriggerMessage(const char* text, int16, uint16 time, int16);
@@ -240,15 +260,44 @@ public:
 	static bool IsModelIndexADoor(uint32 id);
 	static void SetFreeBombs(bool bValue) { BombsAreFree = bValue; }
 	static void SetFreeResprays(bool bValue) { RespraysAreFree = bValue; }
+	static void SetMaxNumStoredCarsForGarage(int16 garage, uint8 num) { aGarages[garage].m_nMaxStoredCars = num; }
 
 private:
 	static bool IsCarSprayable(CVehicle*);
 	static float FindDoorHeightForMI(int32);
 	static void CloseHideOutGaragesBeforeSave(void);
 	static int32 CountCarsInHideoutGarage(eGarageType);
-	static int32 FindMaxNumStoredCarsForGarage(eGarageType);
 	static int32 GetBombTypeForGarageType(eGarageType type) { return type - GARAGE_BOMBSHOP1 + 1; }
-	static int32 GetCarsCollectedIndexForGarageType(eGarageType type) { return type - GARAGE_COLLECTCARS_1; }
+	static int32 GetCarsCollectedIndexForGarageType(eGarageType type)
+	{
+		switch (type) {
+		case GARAGE_COLLECTCARS_1: return 0;
+		case GARAGE_COLLECTCARS_2: return 1;
+		case GARAGE_COLLECTCARS_3: return 2;
+		case GARAGE_COLLECTCARS_4: return 3;
+		default: assert(0);
+		}
+		return 0;
+	}
+	static int32 FindSafeHouseIndexForGarageType(eGarageType type)
+	{
+		switch (type) {
+		case GARAGE_HIDEOUT_ONE: return 0;
+		case GARAGE_HIDEOUT_TWO: return 1;
+		case GARAGE_HIDEOUT_THREE: return 2;
+		case GARAGE_HIDEOUT_FOUR: return 3;
+		case GARAGE_HIDEOUT_FIVE: return 4;
+		case GARAGE_HIDEOUT_SIX: return 5;
+		case GARAGE_HIDEOUT_SEVEN: return 6;
+		case GARAGE_HIDEOUT_EIGHT: return 7;
+		case GARAGE_HIDEOUT_NINE: return 8;
+		case GARAGE_HIDEOUT_TEN: return 9;
+		case GARAGE_HIDEOUT_ELEVEN: return 10;
+		case GARAGE_HIDEOUT_TWELVE: return 11;
+		}
+		return -1;
+	}
+	static bool IsThisGarageTypeSafehouse(eGarageType type) { return FindSafeHouseIndexForGarageType(type) >= 0; }
 
 	friend class cAudioManager;
 	friend class CGarage;
diff --git a/src/control/OnscreenTimer.cpp b/src/control/OnscreenTimer.cpp
index d128efeb..d94e993e 100644
--- a/src/control/OnscreenTimer.cpp
+++ b/src/control/OnscreenTimer.cpp
@@ -20,8 +20,9 @@ void COnscreenTimer::Init() {
 		}
 
 		m_sEntries[i].m_nType = COUNTER_DISPLAY_NUMBER;
-		m_sEntries[i].m_bTimerProcessed = 0;
-		m_sEntries[i].m_bCounterProcessed = 0;
+		m_sEntries[i].m_bTimerProcessed = false;
+		m_sEntries[i].m_bCounterProcessed = false;
+		m_sEntries[i].m_bTimerGoingDown = true;
 	}
 }
 
@@ -65,26 +66,21 @@ void COnscreenTimer::ClearClock(uint32 offset) {
 	}
 }
 
-void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text) {
-	uint32 i = 0;
-	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
-		if(m_sEntries[i].m_nCounterOffset == 0) {
-			break;
-		}
-		return;
-	}
+void COnscreenTimer::AddCounter(uint32 offset, uint16 type, char* text, uint16 pos) {
 
-	m_sEntries[i].m_nCounterOffset = offset;
+	m_sEntries[pos].m_nCounterOffset = offset;
+	if (m_sEntries[pos].m_aCounterText[0] != '\0')
+		return;
 	if(text) {
-		strncpy(m_sEntries[i].m_aCounterText, text, 10);
+		strncpy(m_sEntries[pos].m_aCounterText, text, 10);
 	} else {
-		m_sEntries[i].m_aCounterText[0] = 0;
+		m_sEntries[pos].m_aCounterText[0] = 0;
 	}
 
-	m_sEntries[i].m_nType = type;
+	m_sEntries[pos].m_nType = type;
 }
 
-void COnscreenTimer::AddClock(uint32 offset, char* text) {
+void COnscreenTimer::AddClock(uint32 offset, char* text, bool bGoingDown) {
 	uint32 i = 0;
 	for(uint32 i = 0; i < NUMONSCREENTIMERENTRIES; i++) {
 		if(m_sEntries[i].m_nTimerOffset == 0) {
@@ -94,6 +90,7 @@ void COnscreenTimer::AddClock(uint32 offset, char* text) {
 	}
 
 	m_sEntries[i].m_nTimerOffset = offset;
+	m_sEntries[i].m_bTimerGoingDown = bGoingDown;
 	if(text) {
 		strncpy(m_sEntries[i].m_aTimerText, text, 10);
 	} else {
@@ -108,19 +105,24 @@ void COnscreenTimerEntry::Process() {
 
 	int32* timerPtr = CTheScripts::GetPointerToScriptVariable(m_nTimerOffset);
 	int32 oldTime = *timerPtr;
-	int32 newTime = oldTime - int32(CTimer::GetTimeStepInSeconds() * 1000);
-	if(newTime < 0) {
-		*timerPtr = 0;
-		m_bTimerProcessed = 0;
-		m_nTimerOffset = 0;
-		m_aTimerText[0] = 0;
-	} else {
-		*timerPtr = newTime;
-		int32 oldTimeSeconds = oldTime / 1000;
-		if(oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds) {
-			DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
+	if (m_bTimerGoingDown) {
+		int32 newTime = oldTime - int32(CTimer::GetTimeStepInMilliseconds());
+		if (newTime < 0) {
+			*timerPtr = 0;
+			m_bTimerProcessed = 0;
+			m_nTimerOffset = 0;
+			m_aTimerText[0] = 0;
+		}
+		else {
+			*timerPtr = newTime;
+			int32 oldTimeSeconds = oldTime / 1000;
+			if (oldTimeSeconds < 12 && newTime / 1000 != oldTimeSeconds) {
+				DMAudio.PlayFrontEndSound(SOUND_CLOCK_TICK, newTime / 1000);
+			}
 		}
 	}
+	else
+		*timerPtr = oldTime + int32(CTimer::GetTimeStepInMilliseconds());
 }
 
 bool COnscreenTimerEntry::ProcessForDisplay() {
diff --git a/src/control/OnscreenTimer.h b/src/control/OnscreenTimer.h
index 3ef7764a..09473397 100644
--- a/src/control/OnscreenTimer.h
+++ b/src/control/OnscreenTimer.h
@@ -17,6 +17,7 @@ public:
 	char m_bCounterBuffer[42];
 	char m_bTimerBuffer[42];
 	bool m_bTimerProcessed;
+	bool m_bTimerGoingDown;
 	bool m_bCounterProcessed;
 
 	void Process();
@@ -42,8 +43,8 @@ public:
 	void ClearCounter(uint32 offset);
 	void ClearClock(uint32 offset);
 
-	void AddCounter(uint32 offset, uint16 type, char* text);
-	void AddClock(uint32 offset, char* text);
+	void AddCounter(uint32 offset, uint16 type, char* text, uint16 pos);
+	void AddClock(uint32 offset, char* text, bool bGoingDown);
 };
 
 VALIDATE_SIZE(COnscreenTimer, 0x78);
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 46895678..0dd9359c 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -18,21 +18,20 @@ CPathFind ThePaths;
 #define MIN_PED_ROUTE_DISTANCE 23.8f
 
 
-#define NUMTEMPNODES 4000
-#define NUMDETACHED_CARS 100
-#define NUMDETACHED_PEDS 50
-
-
-// object flags:
-//	1	UseInRoadBlock
-//	2	east/west road(?)
+#define NUMTEMPNODES 5000
+#define NUMDETACHED_CARS 1024
+#define NUMDETACHED_PEDS 1214
+#define NUMTEMPEXTERNALNODES 4600
 
 CPathInfoForObject *InfoForTileCars;
 CPathInfoForObject *InfoForTilePeds;
 
-// unused
-CTempDetachedNode *DetachedNodesCars;
-CTempDetachedNode *DetachedNodesPeds;
+CPathInfoForObject *DetachedInfoForTileCars;
+CPathInfoForObject *DetachedInfoForTilePeds;
+CTempNodeExternal *TempExternalNodes;
+int32 NumTempExternalNodes;
+int32 NumDetachedPedNodeGroups;
+int32 NumDetachedCarNodeGroups;
 
 bool 
 CPedPath::CalcPedRoute(int8 pathType, CVector position, CVector destination, CVector *pointPoses, int16 *pointsFound, int16 maxPoints)
@@ -197,7 +196,7 @@ CPedPath::AddBlockadeSectorList(CPtrList& list, CPedPathNode(*pathNodes)[40], CV
 void 
 CPedPath::AddBlockade(CEntity *pEntity, CPedPathNode(*pathNodes)[40], CVector *pPosition)
 {
-	const CColBox& boundingBox = pEntity->GetColModel()->boundingBox;
+	const CBox& boundingBox = pEntity->GetColModel()->boundingBox;
 	const float fBoundMaxY = boundingBox.max.y + 0.3f;
 	const float fBoundMinY = boundingBox.min.y - 0.3f;
 	const float fBoundMaxX = boundingBox.max.x + 0.3f;
@@ -227,6 +226,27 @@ CPedPath::AddBlockade(CEntity *pEntity, CPedPathNode(*pathNodes)[40], CVector *p
 	}
 }
 
+//--MIAMI: done
+// Make sure all externals link TO an internal
+void
+CPathInfoForObject::SwapConnectionsToBeRightWayRound(void)
+{
+	int e, i;
+	CPathInfoForObject *tile = this;
+
+	for(e = 0; e < 12; e++)
+	if(tile[e].type == NodeTypeExtern && tile[e].next < 0)
+		for(i = 0; i < 12; i++)
+		if(tile[i].type == NodeTypeIntern && tile[i].next == e){
+			tile[e].next = i;
+			tile[i].next = -1;
+			bool tmp = !!tile[e].crossing;
+			tile[e].crossing = tile[i].crossing;
+			tile[i].crossing = tmp;
+		}
+}
+
+//--MIAMI: done
 void
 CPathFind::Init(void)
 {
@@ -237,11 +257,13 @@ CPathFind::Init(void)
 	m_numConnections = 0;
 	m_numCarPathLinks = 0;
 	unk = 0;
+	NumTempExternalNodes = 0;
 
 	for(i = 0; i < NUM_PATHNODES; i++)
 		m_pathNodes[i].distance = MAX_DIST;
 }
 
+//--MIAMI: done
 void
 CPathFind::AllocatePathFindInfoMem(int16 numPathGroups)
 {
@@ -250,93 +272,172 @@ CPathFind::AllocatePathFindInfoMem(int16 numPathGroups)
 	delete[] InfoForTilePeds;
 	InfoForTilePeds = nil;
 
-	// NB: MIAMI doesn't use numPathGroups here but hardcodes 4500
-	InfoForTileCars = new CPathInfoForObject[12*numPathGroups];
-	memset(InfoForTileCars, 0, 12*numPathGroups*sizeof(CPathInfoForObject));
-	InfoForTilePeds = new CPathInfoForObject[12*numPathGroups];
-	memset(InfoForTilePeds, 0, 12*numPathGroups*sizeof(CPathInfoForObject));
-
-	// unused
-	delete[] DetachedNodesCars;
-	DetachedNodesCars = nil;
-	delete[] DetachedNodesPeds;
-	DetachedNodesPeds = nil;
-	DetachedNodesCars = new CTempDetachedNode[NUMDETACHED_CARS];
-	memset(DetachedNodesCars, 0, NUMDETACHED_CARS*sizeof(CTempDetachedNode));
-	DetachedNodesPeds = new CTempDetachedNode[NUMDETACHED_PEDS];
-	memset(DetachedNodesPeds, 0, NUMDETACHED_PEDS*sizeof(CTempDetachedNode));
+	// NB: MIAMI doesn't use numPathGroups here but hardcodes PATHNODESIZE
+	InfoForTileCars = new CPathInfoForObject[12*PATHNODESIZE];
+	memset(InfoForTileCars, 0, 12*PATHNODESIZE*sizeof(CPathInfoForObject));
+	InfoForTilePeds = new CPathInfoForObject[12*PATHNODESIZE];
+	memset(InfoForTilePeds, 0, 12*PATHNODESIZE*sizeof(CPathInfoForObject));
+
+	delete[] DetachedInfoForTileCars;
+	DetachedInfoForTileCars = nil;
+	delete[] DetachedInfoForTilePeds;
+	DetachedInfoForTilePeds = nil;
+	DetachedInfoForTileCars = new CPathInfoForObject[12*NUMDETACHED_CARS];
+	memset(DetachedInfoForTileCars, 0, 12*NUMDETACHED_CARS*sizeof(CPathInfoForObject));
+	DetachedInfoForTilePeds = new CPathInfoForObject[12*NUMDETACHED_PEDS];
+	memset(DetachedInfoForTilePeds, 0, 12*NUMDETACHED_PEDS*sizeof(CPathInfoForObject));
+
+	TempExternalNodes = new CTempNodeExternal[NUMTEMPEXTERNALNODES];
+	memset(TempExternalNodes, 0, NUMTEMPEXTERNALNODES*sizeof(CTempNodeExternal));
+	NumTempExternalNodes = 0;
+	NumDetachedPedNodeGroups = 0;
+	NumDetachedCarNodeGroups = 0;
 }
 
+//--MIAMI: done
 void
 CPathFind::RegisterMapObject(CTreadable *mapObject)
 {
 	m_mapObjects[m_numMapObjects++] = mapObject;
 }
 
+//--MIAMI: done
 void
-CPathFind::StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, bool crossing)
+CPathFind::StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, float width, bool crossing, uint8 spawnRate)
 {
-	int i, j;
+	int i;
 
 	i = id*12 + node;
 	InfoForTilePeds[i].type = type;
 	InfoForTilePeds[i].next = next;
-	InfoForTilePeds[i].x = x;
-	InfoForTilePeds[i].y = y;
-	InfoForTilePeds[i].z = z;
+	InfoForTilePeds[i].x = x/16.0f;
+	InfoForTilePeds[i].y = y/16.0f;
+	InfoForTilePeds[i].z = z/16.0f;
+	InfoForTilePeds[i].width = 8.0f*Min(width, 15.0f);
 	InfoForTilePeds[i].numLeftLanes = 0;
 	InfoForTilePeds[i].numRightLanes = 0;
 	InfoForTilePeds[i].crossing = crossing;
-
-	if(type)
-		for(i = 0; i < node; i++){
-			j = id*12 + i;
-			if(x == InfoForTilePeds[j].x && y == InfoForTilePeds[j].y){
-				printf("^^^^^^^^^^^^^ AARON IS TOO CHICKEN TO EAT MEAT!\n");
-				printf("Several ped nodes on one road segment have identical coordinates (%d==%d && %d==%d)\n",
-					x, InfoForTilePeds[j].x, y, InfoForTilePeds[j].y);
-				printf("Modelindex of cullprit: %d\n\n", id);
-			}
-		}
+	InfoForTilePeds[i].speedLimit = 0;
+	InfoForTilePeds[i].roadBlock = false;
+	InfoForTilePeds[i].disabled = false;
+	InfoForTilePeds[i].waterPath = false;
+	InfoForTilePeds[i].onlySmallBoats = false;
+	InfoForTilePeds[i].betweenLevels = false;
+	InfoForTilePeds[i].spawnRate = Min(spawnRate, 15);
+
+	if(node == 11)
+		InfoForTilePeds[id*12].SwapConnectionsToBeRightWayRound();
 }
 
+//--MIAMI: done
 void
-CPathFind::StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, int8 numLeft, int8 numRight)
+CPathFind::StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, float width, int8 numLeft, int8 numRight,
+	bool disabled, bool betweenLevels, uint8 speedLimit, bool roadBlock, bool waterPath, uint8 spawnRate)
 {
-	int i, j;
+	int i;
 
 	i = id*12 + node;
 	InfoForTileCars[i].type = type;
 	InfoForTileCars[i].next = next;
-	InfoForTileCars[i].x = x;
-	InfoForTileCars[i].y = y;
-	InfoForTileCars[i].z = z;
+	InfoForTileCars[i].x = x/16.0f;
+	InfoForTileCars[i].y = y/16.0f;
+	InfoForTileCars[i].z = z/16.0f;
+	InfoForTilePeds[i].width = 8.0f*Min(width, 15.0f);
 	InfoForTileCars[i].numLeftLanes = numLeft;
 	InfoForTileCars[i].numRightLanes = numRight;
+	InfoForTilePeds[i].crossing = false;
+	InfoForTilePeds[i].speedLimit = 0;
+	InfoForTilePeds[i].roadBlock = false;
+	InfoForTilePeds[i].disabled = false;
+	InfoForTilePeds[i].waterPath = false;
+	InfoForTilePeds[i].onlySmallBoats = false;
+	InfoForTilePeds[i].betweenLevels = false;
+	InfoForTilePeds[i].spawnRate = Min(spawnRate, 15);
+
+	if(node == 11)
+		InfoForTileCars[id*12].SwapConnectionsToBeRightWayRound();
+}
 
+//--MIAMI: done
+void
+CPathFind::StoreDetachedNodeInfoPed(int32 node, int8 type, int32 next, float x, float y, float z, float width, bool crossing,
+	bool disabled, bool betweenLevels, uint8 spawnRate)
+{
+	int i;
 
-	if(type)
-		for(i = 0; i < node; i++){
-			j = id*12 + i;
-			if(x == InfoForTileCars[j].x && y == InfoForTileCars[j].y){
-				printf("^^^^^^^^^^^^^ AARON IS TOO CHICKEN TO EAT MEAT!\n");
-				printf("Several car nodes on one road segment have identical coordinates (%d==%d && %d==%d)\n",
-					x, InfoForTileCars[j].x, y, InfoForTileCars[j].y);
-				printf("Modelindex of cullprit: %d\n\n", id);
-			}
-		}
+	if(NumDetachedPedNodeGroups >= NUMDETACHED_PEDS)
+		return;
+
+	i = NumDetachedPedNodeGroups*12 + node;
+	DetachedInfoForTilePeds[i].type = type;
+	DetachedInfoForTilePeds[i].next = next;
+	DetachedInfoForTilePeds[i].x = x/16.0f;
+	DetachedInfoForTilePeds[i].y = y/16.0f;
+	DetachedInfoForTilePeds[i].z = z/16.0f;
+	DetachedInfoForTilePeds[i].width = 8.0f*Min(width, 31.0f);
+	DetachedInfoForTilePeds[i].numLeftLanes = 0;
+	DetachedInfoForTilePeds[i].numRightLanes = 0;
+	DetachedInfoForTilePeds[i].crossing = crossing;
+	DetachedInfoForTilePeds[i].speedLimit = 0;
+	DetachedInfoForTilePeds[i].roadBlock = false;
+	DetachedInfoForTilePeds[i].disabled = disabled;
+	DetachedInfoForTilePeds[i].waterPath = false;
+	DetachedInfoForTilePeds[i].onlySmallBoats = false;
+	DetachedInfoForTilePeds[i].betweenLevels = betweenLevels;
+	DetachedInfoForTilePeds[i].spawnRate = Min(spawnRate, 15);
+
+	if(node == 11){
+		DetachedInfoForTilePeds[NumDetachedPedNodeGroups*12].SwapConnectionsToBeRightWayRound();
+		NumDetachedPedNodeGroups++;
+	}
 }
 
+//--MIAMI: done
 void
-CPathFind::CalcNodeCoors(int16 x, int16 y, int16 z, int id, CVector *out)
+CPathFind::StoreDetachedNodeInfoCar(int32 node, int8 type, int32 next, float x, float y, float z, float width, int8 numLeft, int8 numRight,
+	bool disabled, bool betweenLevels, uint8 speedLimit, bool roadBlock, bool waterPath, uint8 spawnRate, bool onlySmallBoats)
+{
+	int i;
+
+	if(NumDetachedCarNodeGroups >= NUMDETACHED_CARS)
+		return;
+
+	i = NumDetachedCarNodeGroups*12 + node;
+	DetachedInfoForTileCars[i].type = type;
+	DetachedInfoForTileCars[i].next = next;
+	DetachedInfoForTileCars[i].x = x/16.0f;
+	DetachedInfoForTileCars[i].y = y/16.0f;
+	DetachedInfoForTileCars[i].z = z/16.0f;
+	DetachedInfoForTileCars[i].width = 8.0f*Min(width, 15.0f);
+	DetachedInfoForTileCars[i].numLeftLanes = numLeft;
+	DetachedInfoForTileCars[i].numRightLanes = numRight;
+	DetachedInfoForTileCars[i].crossing = false;
+	DetachedInfoForTileCars[i].speedLimit = speedLimit;
+	DetachedInfoForTileCars[i].roadBlock = roadBlock;
+	DetachedInfoForTileCars[i].disabled = disabled;
+	DetachedInfoForTileCars[i].waterPath = waterPath;
+	DetachedInfoForTileCars[i].onlySmallBoats = onlySmallBoats;
+	DetachedInfoForTileCars[i].betweenLevels = betweenLevels;
+	DetachedInfoForTileCars[i].spawnRate = Min(spawnRate, 15);
+
+	if(node == 11){
+		DetachedInfoForTileCars[NumDetachedCarNodeGroups*12].SwapConnectionsToBeRightWayRound();
+		NumDetachedCarNodeGroups++;
+	}
+}
+
+//--MIAMI: done
+void
+CPathFind::CalcNodeCoors(float x, float y, float z, int id, CVector *out)
 {
 	CVector pos;
-	pos.x = x / 16.0f;
-	pos.y = y / 16.0f;
-	pos.z = z / 16.0f;
+	pos.x = x;
+	pos.y = y;
+	pos.z = z;
 	*out = m_mapObjects[id]->GetMatrix() * pos;
 }
 
+//--MIAMI: done
 bool
 CPathFind::LoadPathFindData(void)
 {
@@ -344,26 +445,22 @@ CPathFind::LoadPathFindData(void)
 	return false;
 }
 
+//--MIAMI: done
 void
 CPathFind::PreparePathData(void)
 {
-	int i, j, k;
-	int numExtern, numIntern, numLanes;
-	float maxX, maxY;
+	int i, j;
+	int numExtern, numIntern;
 	CTempNode *tempNodes;
 
 	printf("PreparePathData\n");
 	if(!CPathFind::LoadPathFindData() &&	// empty
 	   InfoForTileCars && InfoForTilePeds &&
-	   DetachedNodesCars && DetachedNodesPeds
-		){
+	   DetachedInfoForTileCars && DetachedInfoForTilePeds && TempExternalNodes){
 		tempNodes = new CTempNode[NUMTEMPNODES];
 
 		m_numConnections = 0;
 
-		for(i = 0; i < PATHNODESIZE; i++)
-			m_pathNodes[i].unkBits = 0;
-
 		for(i = 0; i < PATHNODESIZE; i++){
 			numExtern = 0;
 			numIntern = 0;
@@ -377,6 +474,19 @@ CPathFind::PreparePathData(void)
 				printf("ILLEGAL BLOCK. MORE THAN 1 INTERNALS AND NOT 2 EXTERNALS (Modelindex:%d)\n", i);
 		}
 
+		int numExternDetached, numInternDetached;
+		for(i = 0; i < NUMDETACHED_CARS; i++){
+			numExternDetached = 0;
+			numInternDetached = 0;
+			for(j = 0; j < 12; j++){
+				if(DetachedInfoForTileCars[i*12 + j].type == NodeTypeExtern)
+					numExternDetached++;
+				if(DetachedInfoForTilePeds[i*12 + j].type == NodeTypeIntern)
+					numInternDetached++;
+			}
+			// no diagnostic here
+		}
+
 		for(i = 0; i < PATHNODESIZE; i++)
 			for(j = 0; j < 12; j++)
 				if(InfoForTileCars[i*12 + j].type == NodeTypeExtern){
@@ -388,51 +498,24 @@ CPathFind::PreparePathData(void)
 					if(InfoForTileCars[i*12 + j].numLeftLanes + InfoForTileCars[i*12 + j].numRightLanes <= 0)
 						printf("ILLEGAL BLOCK. NO LANES IN NODE (Obj:%d)\n", i);
 				}
+		for(i = 0; i < NUMDETACHED_CARS; i++)
+			for(j = 0; j < 12; j++)
+				if(DetachedInfoForTileCars[i*12 + j].type == NodeTypeExtern){
+					// MI:%d here but no argument for it
+					if(DetachedInfoForTileCars[i*12 + j].numLeftLanes < 0)
+						printf("ILLEGAL BLOCK. NEGATIVE NUMBER OF LANES (Obj:%d)\n", i);
+					if(DetachedInfoForTileCars[i*12 + j].numRightLanes < 0)
+						printf("ILLEGAL BLOCK. NEGATIVE NUMBER OF LANES (Obj:%d)\n", i);
+					if(DetachedInfoForTileCars[i*12 + j].numLeftLanes + DetachedInfoForTileCars[i*12 + j].numRightLanes <= 0)
+						printf("ILLEGAL BLOCK. NO LANES IN NODE (Obj:%d)\n", i);
+				}
 
 		m_numPathNodes = 0;
-		PreparePathDataForType(PATH_CAR, tempNodes, InfoForTileCars, 1.0f, DetachedNodesCars, NUMDETACHED_CARS);
+		PreparePathDataForType(PATH_CAR, tempNodes, InfoForTileCars, 1.0f, DetachedInfoForTileCars, NumDetachedCarNodeGroups);
 		m_numCarPathNodes = m_numPathNodes;
-		PreparePathDataForType(PATH_PED, tempNodes, InfoForTilePeds, 1.0f, DetachedNodesPeds, NUMDETACHED_PEDS);
+		PreparePathDataForType(PATH_PED, tempNodes, InfoForTilePeds, 1.0f, DetachedInfoForTilePeds, NumDetachedPedNodeGroups);
 		m_numPedPathNodes = m_numPathNodes - m_numCarPathNodes;
 
-		// TODO: figure out what exactly is going on here
-		// Some roads seem to get a west/east flag
-		for(i = 0; i < m_numMapObjects; i++){
-			numExtern = 0;
-			numIntern = 0;
-			numLanes = 0;
-			maxX = 0.0f;
-			maxY = 0.0f;
-			for(j = 0; j < 12; j++){
-				k = m_mapObjects[i]->GetModelIndex()*12 + j;
-				if(InfoForTileCars[k].type == NodeTypeExtern){
-					numExtern++;
-					numLanes = Max(numLanes, InfoForTileCars[k].numLeftLanes + InfoForTileCars[k].numRightLanes);
-					maxX = Max(maxX, Abs(InfoForTileCars[k].x));
-					maxY = Max(maxY, Abs(InfoForTileCars[k].y));
-				}else if(InfoForTileCars[k].type == NodeTypeIntern)
-					numIntern++;
-			}
-
-			if(numIntern == 1 && numExtern == 2){
-				if(numLanes < 4){
-					if((i & 7) == 4){		// 1/8 probability
-						m_objectFlags[i] |= UseInRoadBlock;
-						if(maxX > maxY)
-							m_objectFlags[i] |= ObjectEastWest;
-						else
-							m_objectFlags[i] &= ~ObjectEastWest;
-					}
-				}else{
-					m_objectFlags[i] |= UseInRoadBlock;
-					if(maxX > maxY)
-						m_objectFlags[i] |= ObjectEastWest;
-					else
-						m_objectFlags[i] &= ~ObjectEastWest;
-				}
-			}
-		}
-
 		delete[] tempNodes;
 
 		CountFloodFillGroups(PATH_CAR);
@@ -443,14 +526,17 @@ CPathFind::PreparePathData(void)
 		delete[] InfoForTilePeds;
 		InfoForTilePeds = nil;
 
-		delete[] DetachedNodesCars;
-		DetachedNodesCars = nil;
-		delete[] DetachedNodesPeds;
-		DetachedNodesPeds = nil;
+		delete[] DetachedInfoForTileCars;
+		DetachedInfoForTileCars = nil;
+		delete[] DetachedInfoForTilePeds;
+		DetachedInfoForTilePeds = nil;
+		delete[] TempExternalNodes;
+		TempExternalNodes = nil;
 	}
 	printf("Done with PreparePathData\n");
 }
 
+//--MIAMI: done
 /* String together connected nodes in a list by a flood fill algorithm */
 void
 CPathFind::CountFloodFillGroups(uint8 type)
@@ -493,8 +579,8 @@ CPathFind::CountFloodFillGroups(uint8 type)
 
 		if(node->numLinks == 0){
 			if(type == PATH_CAR)
-				printf("Single car node: %f %f %f (%d)\n",
-					node->GetX(), node->GetY(), node->GetZ(), m_mapObjects[node->objectIndex]->GetModelIndex());
+				printf("Single car node: %f %f %f\n",
+					node->GetX(), node->GetY(), node->GetZ());
 			else
 				printf("Single ped node: %f %f %f\n",
 					node->GetX(), node->GetY(), node->GetZ());
@@ -522,34 +608,31 @@ CPathFind::CountFloodFillGroups(uint8 type)
 
 int32 TempListLength;
 
+//--MIAMI: done
 void
 CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoForObject *objectpathinfo,
-	float maxdist, CTempDetachedNode *detachednodes, int numDetached)
+	float maxdist, CPathInfoForObject *detachednodes, int numDetached)
 {
 	static CVector CoorsXFormed;
-	int i, j, k, l;
+	int i, j, k;
 	int l1, l2;
 	int start;
 	float posx, posy;
 	float dx, dy, mag;
 	float nearestDist;
 	int nearestId;
-	int next;
 	int oldNumPathNodes, oldNumLinks;
 	float dist;
 	int iseg, jseg;
-	int istart, jstart;
 	int done, cont;
 	int tileStart;
 
 	oldNumPathNodes = m_numPathNodes;
 	oldNumLinks = m_numConnections;
 
-#define OBJECTINDEX(n) (m_pathNodes[(n)].objectIndex)
-	// Initialize map objects
-	for(i = 0; i < m_numMapObjects; i++)
-		for(j = 0; j < 12; j++)
-			m_mapObjects[i]->m_nodeIndices[type][j] = -1;
+#define OBJECTINDEX(n) (mapObjIndices[(n)])
+	int16 *mapObjIndices = new int16[NUM_PATHNODES];
+	NumTempExternalNodes = 0;
 
 	// Calculate internal nodes, store them and connect them to defining object
 	for(i = 0; i < m_numMapObjects; i++){
@@ -565,89 +648,125 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 					&CoorsXFormed);
 				m_pathNodes[m_numPathNodes].SetPosition(CoorsXFormed);
 				OBJECTINDEX(m_numPathNodes) = i;
-				m_pathNodes[m_numPathNodes].unkBits = 1;
-				m_mapObjects[i]->m_nodeIndices[type][j] = m_numPathNodes;
+				m_pathNodes[m_numPathNodes].width = objectpathinfo[start + j].width;
+				m_pathNodes[m_numPathNodes].speedLimit = objectpathinfo[start + j].speedLimit;
+				m_pathNodes[m_numPathNodes].spawnRate = objectpathinfo[start + j].spawnRate;
+				m_pathNodes[m_numPathNodes].bUseInRoadBlock = objectpathinfo[start + j].roadBlock;
+				m_pathNodes[m_numPathNodes].bDisabled = objectpathinfo[start + j].disabled;
+				m_pathNodes[m_numPathNodes].bWaterPath = objectpathinfo[start + j].waterPath;
+				m_pathNodes[m_numPathNodes].bOnlySmallBoats = objectpathinfo[start + j].onlySmallBoats;
+				m_pathNodes[m_numPathNodes].bBetweenLevels = objectpathinfo[start + j].betweenLevels;
 				m_numPathNodes++;
 			}
+			else if(objectpathinfo[start + j].type == NodeTypeExtern){
+				CalcNodeCoors(
+					objectpathinfo[start + j].x,
+					objectpathinfo[start + j].y,
+					objectpathinfo[start + j].z,
+					i,
+					&CoorsXFormed);
+				TempExternalNodes[NumTempExternalNodes].pos = CoorsXFormed;
+				assert(objectpathinfo[start + j].next >= 0);
+				TempExternalNodes[NumTempExternalNodes].next = tileStart + objectpathinfo[start + j].next;
+				TempExternalNodes[NumTempExternalNodes].numLeftLanes = objectpathinfo[start + j].numLeftLanes;
+				TempExternalNodes[NumTempExternalNodes].numRightLanes = objectpathinfo[start + j].numRightLanes;
+				TempExternalNodes[NumTempExternalNodes].width = objectpathinfo[start + j].width;
+				TempExternalNodes[NumTempExternalNodes].isCross = !!objectpathinfo[start + j].crossing;
+				NumTempExternalNodes++;
+			}
 		}
 	}
 
+	// Same thing for detached nodes
+	for(i = 0; i < numDetached; i++){
+		tileStart = m_numPathNodes;
+		start = 12*i;
+		for(j = 0; j < 12; j++){
+			if(detachednodes[start + j].type == NodeTypeIntern){
+				CVector pos;
+				pos.x = detachednodes[start + j].x;
+				pos.y = detachednodes[start + j].y;
+				pos.z = detachednodes[start + j].z;
+				m_pathNodes[m_numPathNodes].SetPosition(pos);
+				mapObjIndices[m_numPathNodes] = -(i+1);
+				m_pathNodes[m_numPathNodes].width = detachednodes[start + j].width;
+				m_pathNodes[m_numPathNodes].speedLimit = detachednodes[start + j].speedLimit;
+				m_pathNodes[m_numPathNodes].spawnRate = detachednodes[start + j].spawnRate;
+				m_pathNodes[m_numPathNodes].bUseInRoadBlock = detachednodes[start + j].roadBlock;
+				m_pathNodes[m_numPathNodes].bDisabled = detachednodes[start + j].disabled;
+				m_pathNodes[m_numPathNodes].bWaterPath = detachednodes[start + j].waterPath;
+				m_pathNodes[m_numPathNodes].bOnlySmallBoats = detachednodes[start + j].onlySmallBoats;
+				m_pathNodes[m_numPathNodes].bBetweenLevels = detachednodes[start + j].betweenLevels;
+				m_numPathNodes++;
+			}else if(detachednodes[start + j].type == NodeTypeExtern){
+				TempExternalNodes[NumTempExternalNodes].pos.x = detachednodes[start + j].x;
+				TempExternalNodes[NumTempExternalNodes].pos.y = detachednodes[start + j].y;
+				TempExternalNodes[NumTempExternalNodes].pos.z = detachednodes[start + j].z;
+				assert(detachednodes[start + j].next >= 0);
+				TempExternalNodes[NumTempExternalNodes].next = tileStart + detachednodes[start + j].next;
+				TempExternalNodes[NumTempExternalNodes].numLeftLanes = detachednodes[start + j].numLeftLanes;
+				TempExternalNodes[NumTempExternalNodes].numRightLanes = detachednodes[start + j].numRightLanes;
+				TempExternalNodes[NumTempExternalNodes].width = detachednodes[start + j].width;
+				TempExternalNodes[NumTempExternalNodes].isCross = !!detachednodes[start + j].crossing;
+				NumTempExternalNodes++;
+			}
+		}
+	}
 
 	// Insert external nodes into TempList
 	TempListLength = 0;
-	for(i = 0; i < m_numMapObjects; i++){
-		start = 12 * m_mapObjects[i]->GetModelIndex();
-		for(j = 0; j < 12; j++){
-			if(objectpathinfo[start + j].type != NodeTypeExtern)
+	for(i = 0; i < NumTempExternalNodes; i++){
+		// find closest unconnected node
+		nearestId = -1;
+		nearestDist = maxdist;
+		for(k = 0; k < TempListLength; k++){
+			if(tempnodes[k].linkState != 1)
 				continue;
-			CalcNodeCoors(
-				objectpathinfo[start + j].x,
-				objectpathinfo[start + j].y,
-				objectpathinfo[start + j].z,
-				i,
-				&CoorsXFormed);
-
-			// find closest unconnected node
-			nearestId = -1;
-			nearestDist = maxdist;
-			for(k = 0; k < TempListLength; k++){
-				if(tempnodes[k].linkState != 1)
-					continue;
-				dx = tempnodes[k].pos.x - CoorsXFormed.x;
-				if(Abs(dx) < nearestDist){
-					dy = tempnodes[k].pos.y - CoorsXFormed.y;
-					if(Abs(dy) < nearestDist){
-						nearestDist = Max(Abs(dx), Abs(dy));
-						nearestId = k;
-					}
+			dx = tempnodes[k].pos.x - TempExternalNodes[i].pos.x;
+			if(Abs(dx) < nearestDist){
+				dy = tempnodes[k].pos.y - TempExternalNodes[i].pos.y;
+				if(Abs(dy) < nearestDist){
+					nearestDist = Max(Abs(dx), Abs(dy));
+					nearestId = k;
 				}
 			}
+		}
 
-			if(nearestId < 0){
-				// None found, add this one to temp list
-				tempnodes[TempListLength].pos = CoorsXFormed;
-				next = objectpathinfo[start + j].next;
-				if(next < 0){
-					// no link from this node, find link to this node
-					next = 0;
-					for(k = start; j != objectpathinfo[k].next; k++)
-						next++;
-				}
-				// link to connecting internal node
-				tempnodes[TempListLength].link1 = m_mapObjects[i]->m_nodeIndices[type][next];
-				if(type == PATH_CAR){
-					tempnodes[TempListLength].numLeftLanes = objectpathinfo[start + j].numLeftLanes;
-					tempnodes[TempListLength].numRightLanes = objectpathinfo[start + j].numRightLanes;
-				}
-				tempnodes[TempListLength++].linkState = 1;
-			}else{
-				// Found nearest, connect it to our neighbour
-				next = objectpathinfo[start + j].next;
-				if(next < 0){
-					// no link from this node, find link to this node
-					next = 0;
-					for(k = start; j != objectpathinfo[k].next; k++)
-						next++;
-				}
-				tempnodes[nearestId].link2 = m_mapObjects[i]->m_nodeIndices[type][next];
-				tempnodes[nearestId].linkState = 2;
-
-				// collapse this node with nearest we found
-				dx = m_pathNodes[tempnodes[nearestId].link1].GetX() - m_pathNodes[tempnodes[nearestId].link2].GetX();
-				dy = m_pathNodes[tempnodes[nearestId].link1].GetY() - m_pathNodes[tempnodes[nearestId].link2].GetY();
-				tempnodes[nearestId].pos = (tempnodes[nearestId].pos + CoorsXFormed)*0.5f;
-				mag = Sqrt(dx*dx + dy*dy);
-				tempnodes[nearestId].dirX = dx/mag;
-				tempnodes[nearestId].dirY = dy/mag;
-				// do something when number of lanes doesn't agree
-				if(type == PATH_CAR)
-					if(tempnodes[nearestId].numLeftLanes != 0 && tempnodes[nearestId].numRightLanes != 0 &&
-					   (objectpathinfo[start + j].numLeftLanes == 0 || objectpathinfo[start + j].numRightLanes == 0)){
-						// why switch left and right here?
-						tempnodes[nearestId].numLeftLanes = objectpathinfo[start + j].numRightLanes;
-						tempnodes[nearestId].numRightLanes = objectpathinfo[start + j].numLeftLanes;
-					}
+		if(nearestId < 0){
+			// None found, add this one to temp list
+			tempnodes[TempListLength].pos = TempExternalNodes[i].pos;
+			// link to connecting internal node
+			tempnodes[TempListLength].link1 = TempExternalNodes[i].next;
+			if(type == PATH_CAR){
+				tempnodes[TempListLength].numLeftLanes = TempExternalNodes[i].numLeftLanes;
+				tempnodes[TempListLength].numRightLanes = TempExternalNodes[i].numRightLanes;
 			}
+			tempnodes[TempListLength].width = TempExternalNodes[i].width;
+			tempnodes[TempListLength].isCross = TempExternalNodes[i].isCross;
+			tempnodes[TempListLength++].linkState = 1;
+		}else{
+			// Found nearest, connect it to our neighbour
+			tempnodes[nearestId].link2 = TempExternalNodes[i].next;
+			tempnodes[nearestId].linkState = 2;
+
+			// collapse this node with nearest we found
+			dx = m_pathNodes[tempnodes[nearestId].link1].GetX() - m_pathNodes[tempnodes[nearestId].link2].GetX();
+			dy = m_pathNodes[tempnodes[nearestId].link1].GetY() - m_pathNodes[tempnodes[nearestId].link2].GetY();
+			tempnodes[nearestId].pos = (tempnodes[nearestId].pos + TempExternalNodes[i].pos)*0.5f;
+			mag = Sqrt(dx*dx + dy*dy);
+			tempnodes[nearestId].dirX = dx/mag * 100;
+			tempnodes[nearestId].dirY = dy/mag * 100;
+			tempnodes[nearestId].width = Max(tempnodes[nearestId].width, TempExternalNodes[i].width);
+			if(TempExternalNodes[i].isCross)
+				tempnodes[nearestId].isCross = true;	// TODO: is this guaranteed to be false otherwise?
+			// do something when number of lanes doesn't agree
+			if(type == PATH_CAR)
+				if(tempnodes[nearestId].numLeftLanes != 0 && tempnodes[nearestId].numRightLanes != 0 &&
+				   (TempExternalNodes[i].numLeftLanes == 0 || TempExternalNodes[i].numRightLanes == 0)){
+					// why switch left and right here?
+					tempnodes[nearestId].numLeftLanes = TempExternalNodes[i].numRightLanes;
+					tempnodes[nearestId].numRightLanes = TempExternalNodes[i].numLeftLanes;
+				}
 		}
 	}
 
@@ -672,27 +791,30 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 				continue;
 
 			dist = (m_pathNodes[i].GetPosition() - m_pathNodes[ConnectedNode(m_numConnections)].GetPosition()).Magnitude();
-			m_distances[m_numConnections] = dist;
-			m_connectionFlags[m_numConnections].flags = 0;
+			m_distances[m_numConnections] = Min(dist, 255);
+			if(tempnodes[j].isCross)
+				m_connections[j] |= 0x8000;	// crosses road flag
 
 			if(type == PATH_CAR){
 				// IMPROVE: use a goto here
 				// Find existing car path link
 				for(k = 0; k < m_numCarPathLinks; k++){
-					if(m_carPathLinks[k].dir.x == tempnodes[j].dirX &&
-					   m_carPathLinks[k].dir.y == tempnodes[j].dirY &&
-					   m_carPathLinks[k].pos.x == tempnodes[j].pos.x &&
-					   m_carPathLinks[k].pos.y == tempnodes[j].pos.y){
+					if(m_carPathLinks[k].dirX == tempnodes[j].dirX &&
+					   m_carPathLinks[k].dirY == tempnodes[j].dirY &&
+					   m_carPathLinks[k].x == (int)(tempnodes[j].pos.x*8.0f) &&
+					   m_carPathLinks[k].y == (int)(tempnodes[j].pos.y*8.0f)){
 						m_carPathConnections[m_numConnections] = k;
 						k = m_numCarPathLinks;
 					}
 				}
 				// k is m_numCarPathLinks+1 if we found one
 				if(k == m_numCarPathLinks){
-					m_carPathLinks[m_numCarPathLinks].dir.x = tempnodes[j].dirX;
-					m_carPathLinks[m_numCarPathLinks].dir.y = tempnodes[j].dirY;
-					m_carPathLinks[m_numCarPathLinks].pos.x = tempnodes[j].pos.x;
-					m_carPathLinks[m_numCarPathLinks].pos.y = tempnodes[j].pos.y;
+					m_carPathLinks[m_numCarPathLinks].dirX = tempnodes[j].dirX;
+					m_carPathLinks[m_numCarPathLinks].dirY = tempnodes[j].dirY;
+					m_carPathLinks[m_numCarPathLinks].x = tempnodes[j].pos.x*8.0f;
+					m_carPathLinks[m_numCarPathLinks].y = tempnodes[j].pos.y*8.0f;
+					m_carPathLinks[m_numCarPathLinks].flag1 = false;
+					m_carPathLinks[m_numCarPathLinks].width = tempnodes[j].width;
 					m_carPathLinks[m_numCarPathLinks].pathNodeIndex = i;
 					m_carPathLinks[m_numCarPathLinks].numLeftLanes = tempnodes[j].numLeftLanes;
 					m_carPathLinks[m_numCarPathLinks].numRightLanes = tempnodes[j].numRightLanes;
@@ -706,6 +828,18 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 			m_numConnections++;
 		}
 
+		CPathInfoForObject *tile;
+		if(mapObjIndices[i] < 0){
+			if(type == PATH_CAR)
+				tile = &DetachedInfoForTileCars[12 * (-1 - mapObjIndices[i])];
+			else
+				tile = &DetachedInfoForTilePeds[12 * (-1 - mapObjIndices[i])];
+		}else{
+			if(type == PATH_CAR)
+				tile = &InfoForTileCars[12 * m_mapObjects[mapObjIndices[i]]->GetModelIndex()];
+			else
+				tile = &InfoForTilePeds[12 * m_mapObjects[mapObjIndices[i]]->GetModelIndex()];
+		}
 
 		// Find i inside path segment
 		iseg = 0;
@@ -713,7 +847,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 			if(OBJECTINDEX(j) == OBJECTINDEX(i))
 				iseg++;
 
-		istart = 12 * m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex();
 		// Add links to other internal nodes
 		for(j = Max(oldNumPathNodes, i-12); j < Min(m_numPathNodes, i+12); j++){
 			if(OBJECTINDEX(i) != OBJECTINDEX(j) || i == j)
@@ -721,14 +854,13 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 			// N.B.: in every path segment, the externals have to be at the end
 			jseg = j-i + iseg;
 
-			jstart = 12 * m_mapObjects[m_pathNodes[j].objectIndex]->GetModelIndex();
-			if(objectpathinfo[istart + iseg].next == jseg ||
-			   objectpathinfo[jstart + jseg].next == iseg){
+			if(tile[iseg].next == jseg ||
+			   tile[jseg].next == iseg){
 				// Found a link between i and jConnectionSetCrossesRoad
 				// NB this clears the flags in MIAMI
 				m_connections[m_numConnections] = j;
 				dist = (m_pathNodes[i].GetPosition() - m_pathNodes[j].GetPosition()).Magnitude();
-				m_distances[m_numConnections] = dist;
+				m_distances[m_numConnections] = Min(dist, 255);
 
 				if(type == PATH_CAR){
 					posx = (m_pathNodes[i].GetX() + m_pathNodes[j].GetX())*0.5f;
@@ -738,6 +870,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 					mag = Sqrt(dx*dx + dy*dy);
 					dx /= mag;
 					dy /= mag;
+					int width = Max(m_pathNodes[i].width, m_pathNodes[j].width);
 					if(i < j){
 						dx = -dx;
 						dy = -dy;
@@ -745,20 +878,22 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 					// IMPROVE: use a goto here
 					// Find existing car path link
 					for(k = 0; k < m_numCarPathLinks; k++){
-						if(m_carPathLinks[k].dir.x == dx &&
-						   m_carPathLinks[k].dir.y == dy &&
-						   m_carPathLinks[k].pos.x == posx &&
-						   m_carPathLinks[k].pos.y == posy){
+						if(m_carPathLinks[k].dirX == (int)(dx*100.0f) &&
+						   m_carPathLinks[k].dirY == (int)(dy*100.0f) &&
+						   m_carPathLinks[k].x == (int)(posx*8.0f) &&
+						   m_carPathLinks[k].y == (int)(posy*8.0f)){
 							m_carPathConnections[m_numConnections] = k;
 							k = m_numCarPathLinks;
 						}
 					}
 					// k is m_numCarPathLinks+1 if we found one
 					if(k == m_numCarPathLinks){
-						m_carPathLinks[m_numCarPathLinks].dir.x = dx;
-						m_carPathLinks[m_numCarPathLinks].dir.y = dy;
-						m_carPathLinks[m_numCarPathLinks].pos.x = posx;
-						m_carPathLinks[m_numCarPathLinks].pos.y = posy;
+						m_carPathLinks[m_numCarPathLinks].dirX = dx*100.0f;
+						m_carPathLinks[m_numCarPathLinks].dirY = dy*100.0f;
+						m_carPathLinks[m_numCarPathLinks].x = posx*8.0f;
+						m_carPathLinks[m_numCarPathLinks].y = posy*8.0f;
+						m_carPathLinks[m_numCarPathLinks].flag1 = false;
+						m_carPathLinks[m_numCarPathLinks].width = width;
 						m_carPathLinks[m_numCarPathLinks].pathNodeIndex = i;
 						m_carPathLinks[m_numCarPathLinks].numLeftLanes = -1;
 						m_carPathLinks[m_numCarPathLinks].numRightLanes = -1;
@@ -768,11 +903,9 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 					}
 				}else{
 					// Crosses road
-					if(objectpathinfo[istart + iseg].next == jseg && objectpathinfo[istart + iseg].crossing ||
-					   objectpathinfo[jstart + jseg].next == iseg && objectpathinfo[jstart + jseg].crossing)
-						m_connectionFlags[m_numConnections].bCrossesRoad = true;
-					else
-						m_connectionFlags[m_numConnections].bCrossesRoad = false;
+					if(tile[iseg].next == jseg && tile[iseg].crossing ||
+					   tile[jseg].next == iseg && tile[jseg].crossing)
+						m_connections[m_numConnections] |= 0x8000;	// crosses road flag
 				}
 
 				m_pathNodes[i].numLinks++;
@@ -785,7 +918,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 		done = 0;
 		// Set number of lanes for all nodes somehow
 		// very strange code
-		for(k = 0; !done && k < 10; k++){
+		for(k = 0; !done && k < 12; k++){
 			done = 1;
 			for(i = 0; i < m_numPathNodes; i++){
 				if(m_pathNodes[i].numLinks != 2)
@@ -793,33 +926,50 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 				l1 = m_carPathConnections[m_pathNodes[i].firstLink];
 				l2 = m_carPathConnections[m_pathNodes[i].firstLink+1];
 
-				if(m_carPathLinks[l1].numLeftLanes == -1 &&
-				   m_carPathLinks[l2].numLeftLanes != -1){
+				int8 l1Left = m_carPathLinks[l1].numLeftLanes;
+				int8 l1Right = m_carPathLinks[l1].numRightLanes;
+				int8 l2Left = m_carPathLinks[l2].numLeftLanes;
+				int8 l2Right = m_carPathLinks[l2].numRightLanes;
+				int8 *l1Leftp, *l1Rightp;
+				int8 *l2Leftp, *l2Rightp;
+				if(m_carPathLinks[l1].pathNodeIndex == i){
+					l1Leftp = &l1Left;
+					l1Rightp = &l1Right;
+				}else{
+					l1Leftp = &l1Right;
+					l1Rightp = &l1Left;
+				}
+				if(m_carPathLinks[l2].pathNodeIndex == i){
+					l2Leftp = &l2Left;
+					l2Rightp = &l2Right;
+				}else{
+					l2Leftp = &l2Right;
+					l2Rightp = &l2Left;
+				}
+				if(*l1Leftp == -1 && *l2Rightp != -1){
+					*l1Leftp = *l2Rightp;
 					done = 0;
-					if(m_carPathLinks[l2].pathNodeIndex == i){
-						// why switch left and right here?
-						m_carPathLinks[l1].numLeftLanes = m_carPathLinks[l2].numRightLanes;
-						m_carPathLinks[l1].numRightLanes = m_carPathLinks[l2].numLeftLanes;
-					}else{
-						m_carPathLinks[l1].numLeftLanes = m_carPathLinks[l2].numLeftLanes;
-						m_carPathLinks[l1].numRightLanes = m_carPathLinks[l2].numRightLanes;
-					}
-					m_carPathLinks[l1].pathNodeIndex = i;
-				}else if(m_carPathLinks[l1].numLeftLanes != -1 &&
-				         m_carPathLinks[l2].numLeftLanes == -1){
+				}
+				if(*l1Rightp == -1 && *l2Leftp != -1){
+					*l1Rightp = *l2Leftp;
 					done = 0;
-					if(m_carPathLinks[l1].pathNodeIndex == i){
-						// why switch left and right here?
-						m_carPathLinks[l2].numLeftLanes = m_carPathLinks[l1].numRightLanes;
-						m_carPathLinks[l2].numRightLanes = m_carPathLinks[l1].numLeftLanes;
-					}else{
-						m_carPathLinks[l2].numLeftLanes = m_carPathLinks[l1].numLeftLanes;
-						m_carPathLinks[l2].numRightLanes = m_carPathLinks[l1].numRightLanes;
-					}
-					m_carPathLinks[l2].pathNodeIndex = i;
-				}else if(m_carPathLinks[l1].numLeftLanes == -1 &&
-				         m_carPathLinks[l2].numLeftLanes == -1)
+				}
+				if(*l2Leftp == -1 && *l1Rightp != -1){
+					*l2Leftp = *l1Rightp;
 					done = 0;
+				}
+				if(*l2Rightp == -1 && *l1Leftp != -1){
+					*l2Rightp = *l1Leftp;
+					done = 0;
+				}
+				if(*l1Leftp == -1 && *l2Rightp == -1)
+					done = 0;
+				if(*l2Leftp == -1 && *l1Rightp == -1)
+					done = 0;
+				m_carPathLinks[l1].numLeftLanes = l1Left;
+				m_carPathLinks[l1].numRightLanes = l1Right;
+				m_carPathLinks[l2].numLeftLanes = l2Left;
+				m_carPathLinks[l2].numRightLanes = l2Right;
 			}
 		}
 
@@ -827,10 +977,10 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 		for(i = 0; i < m_numPathNodes; i++)
 			for(j = 0; j < m_pathNodes[i].numLinks; j++){
 				k = m_carPathConnections[m_pathNodes[i].firstLink + j];
-				if(m_carPathLinks[k].numLeftLanes < 0)
-					m_carPathLinks[k].numLeftLanes = 1;
-				if(m_carPathLinks[k].numRightLanes < 0)
-					m_carPathLinks[k].numRightLanes = 1;
+				if(m_carPathLinks[k].numLeftLanes == -1)
+					m_carPathLinks[k].numLeftLanes = 0;
+				if(m_carPathLinks[k].numRightLanes == -1)
+					m_carPathLinks[k].numRightLanes = 0;
 			}
 	}
 
@@ -839,8 +989,6 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 		do{
 			cont = 0;
 			for(i = 0; i < m_numPathNodes; i++){
-				m_pathNodes[i].bDisabled = false;
-				m_pathNodes[i].bBetweenLevels = false;
 				// See if node is a dead end, if so, we're not done yet
 				if(!m_pathNodes[i].bDeadEnd){
 					k = 0;
@@ -873,23 +1021,14 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
 					m_connections[j] = node-1;
 			}
 
-			// Also in treadables
-			for(j = 0; j < m_numMapObjects; j++)
-				for(k = 0; k < 12; k++){
-					if(m_mapObjects[j]->m_nodeIndices[PATH_PED][k] == i){
-						// remove this one
-						for(l = k; l < 12-1; l++)
-							m_mapObjects[j]->m_nodeIndices[PATH_PED][l] = m_mapObjects[j]->m_nodeIndices[PATH_PED][l+1];
-						m_mapObjects[j]->m_nodeIndices[PATH_PED][11] = -1;
-					}else if(m_mapObjects[j]->m_nodeIndices[PATH_PED][k] > i)
-						m_mapObjects[j]->m_nodeIndices[PATH_PED][k]--;
-				}
-
 			i--;
 			m_numPathNodes--;
 		}
+
+	delete[] mapObjIndices;
 }
 
+//--MIAMI: done
 float
 CPathFind::CalcRoadDensity(float x, float y)
 {
@@ -906,21 +1045,13 @@ CPathFind::CalcRoadDensity(float x, float y)
 				next = m_carPathConnections[m_pathNodes[i].firstLink + j];
 				density += m_carPathLinks[next].numLeftLanes * dist;
 				density += m_carPathLinks[next].numRightLanes * dist;
-
-				if(m_carPathLinks[next].numLeftLanes < 0)
-					printf("Link from object %d to %d (MIs)\n",
-						m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex(),
-						m_mapObjects[m_pathNodes[ConnectedNode(m_pathNodes[i].firstLink + j)].objectIndex]->GetModelIndex());
-				if(m_carPathLinks[next].numRightLanes < 0)
-					printf("Link from object %d to %d (MIs)\n",
-						m_mapObjects[m_pathNodes[i].objectIndex]->GetModelIndex(),
-						m_mapObjects[m_pathNodes[ConnectedNode(m_pathNodes[i].firstLink + j)].objectIndex]->GetModelIndex());
 			}
 		}
 	}
 	return density/2500.0f;
 }
 
+//--MIAMI: done
 bool
 CPathFind::TestForPedTrafficLight(CPathNode *n1, CPathNode *n2)
 {
@@ -931,6 +1062,7 @@ CPathFind::TestForPedTrafficLight(CPathNode *n1, CPathNode *n2)
 	return false;
 }
 
+//--MIAMI: done
 bool
 CPathFind::TestCrossesRoad(CPathNode *n1, CPathNode *n2)
 {
@@ -941,6 +1073,7 @@ CPathFind::TestCrossesRoad(CPathNode *n1, CPathNode *n2)
 	return false;
 }
 
+//--MIAMI: done
 void
 CPathFind::AddNodeToList(CPathNode *node, int32 listId)
 {
@@ -953,6 +1086,7 @@ CPathFind::AddNodeToList(CPathNode *node, int32 listId)
 	node->distance = listId;
 }
 
+//--MIAMI: done
 void
 CPathFind::RemoveNodeFromList(CPathNode *node)
 {
@@ -961,6 +1095,7 @@ CPathFind::RemoveNodeFromList(CPathNode *node)
 		node->GetNext()->SetPrev(node->GetPrev());
 }
 
+//--MIAMI: done
 void
 CPathFind::RemoveBadStartNode(CVector pos, CPathNode **nodes, int16 *n)
 {
@@ -974,6 +1109,7 @@ CPathFind::RemoveBadStartNode(CVector pos, CPathNode **nodes, int16 *n)
 	}
 }
 
+#ifdef GTA_BRIDGE
 void
 CPathFind::SetLinksBridgeLights(float x1, float x2, float y1, float y2, bool enable)
 {
@@ -985,7 +1121,9 @@ CPathFind::SetLinksBridgeLights(float x1, float x2, float y1, float y2, bool ena
 			m_carPathLinks[i].bBridgeLights = enable;
 	}
 }
+#endif
 
+//--MIAMI: done
 void
 CPathFind::SwitchOffNodeAndNeighbours(int32 nodeId, bool disable)
 {
@@ -1001,6 +1139,7 @@ CPathFind::SwitchOffNodeAndNeighbours(int32 nodeId, bool disable)
 		}
 }
 
+//--MIAMI: done
 void
 CPathFind::SwitchRoadsOffInArea(float x1, float x2, float y1, float y2, float z1, float z2, bool disable)
 {
@@ -1016,6 +1155,7 @@ CPathFind::SwitchRoadsOffInArea(float x1, float x2, float y1, float y2, float z1
 	}
 }
 
+//--MIAMI: done
 void
 CPathFind::SwitchPedRoadsOffInArea(float x1, float x2, float y1, float y2, float z1, float z2, bool disable)
 {
@@ -1031,6 +1171,7 @@ CPathFind::SwitchPedRoadsOffInArea(float x1, float x2, float y1, float y2, float
 	}
 }
 
+//--MIAMI: unused (still needed for script here)
 void
 CPathFind::SwitchRoadsInAngledArea(float x1, float y1, float z1, float x2, float y2, float z2, float length, uint8 type, uint8 mode)
 {
@@ -1082,6 +1223,7 @@ CPathFind::SwitchRoadsInAngledArea(float x1, float y1, float z1, float x2, float
 	}
 }
 
+//--MIAMI: unused (still needed for script here)
 void
 CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId)
 {
@@ -1097,6 +1239,7 @@ CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId)
 		}
 }
 
+//--MIAMI: unused (still needed for script here)
 void
 CPathFind::MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
 {
@@ -1111,6 +1254,7 @@ CPathFind::MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2,
 	}
 }
 
+//--MIAMI: unused (still needed for script here)
 void
 CPathFind::PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
 {
@@ -1125,8 +1269,9 @@ CPathFind::PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y
 	}
 }
 
+//--MIAMI: done
 int32
-CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled, bool ignoreBetweenLevels)
+CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled, bool ignoreBetweenLevels, bool ignoreFlagB4, bool bWaterPath)
 {
 	int i;
 	int firstNode, lastNode;
@@ -1148,22 +1293,20 @@ CPathFind::FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bo
 	for(i = firstNode; i < lastNode; i++){
 		if(ignoreDisabled && m_pathNodes[i].bDisabled) continue;
 		if(ignoreBetweenLevels && m_pathNodes[i].bBetweenLevels) continue;
-		switch(m_pathNodes[i].unkBits){
-		case 1:
-		case 2:
-			dist = Abs(m_pathNodes[i].GetX() - coors.x) +
-			       Abs(m_pathNodes[i].GetY() - coors.y) +
-			       3.0f*Abs(m_pathNodes[i].GetZ() - coors.z);
-			if(dist < closestDist){
-				closestDist = dist;
-				closestNode = i;
-			}
-			break;
+		if(ignoreFlagB4 && m_pathNodes[i].flagB4) continue;
+		if(bWaterPath != m_pathNodes[i].bWaterPath) continue;
+		dist = Abs(m_pathNodes[i].GetX() - coors.x) +
+		       Abs(m_pathNodes[i].GetY() - coors.y) +
+		       3.0f*Abs(m_pathNodes[i].GetZ() - coors.z);
+		if(dist < closestDist){
+			closestDist = dist;
+			closestNode = i;
 		}
 	}
 	return closestDist < distLimit ? closestNode : -1;
 }
 
+//--MIAMI: done
 int32
 CPathFind::FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, float dirX, float dirY)
 {
@@ -1186,27 +1329,23 @@ CPathFind::FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, floa
 	}
 
 	for(i = firstNode; i < lastNode; i++){
-		switch(m_pathNodes[i].unkBits){
-		case 1:
-		case 2:
-			dX = m_pathNodes[i].GetX() - coors.x;
-			dY = m_pathNodes[i].GetY() - coors.y;
-			dist = Abs(dX) + Abs(dY) +
-			       3.0f*Abs(m_pathNodes[i].GetZ() - coors.z);
+		dX = m_pathNodes[i].GetX() - coors.x;
+		dY = m_pathNodes[i].GetY() - coors.y;
+		dist = Abs(dX) + Abs(dY) +
+		       3.0f*Abs(m_pathNodes[i].GetZ() - coors.z);
+		if(dist < closestDist){
+			NormalizeXY(dX, dY);
+			dist -= (dX*dirX + dY*dirY - 1.0f)*20.0f;
 			if(dist < closestDist){
-				NormalizeXY(dX, dY);
-				dist -= (dX*dirX + dY*dirY - 1.0f)*20.0f;
-				if(dist < closestDist){
-					closestDist = dist;
-					closestNode = i;
-				}
+				closestDist = dist;
+				closestNode = i;
 			}
-			break;
 		}
 	}
 	return closestNode;
 }
 
+//--MIAMI: done
 float
 CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
 {
@@ -1218,6 +1357,7 @@ CPathFind::FindNodeOrientationForCarPlacement(int32 nodeId)
 	return RADTODEG(dir.Heading());
 }
 
+//--MIAMI: unused (still needed for script here)
 float
 CPathFind::FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, float x, float y, bool towards)
 {
@@ -1261,6 +1401,8 @@ CPathFind::FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, flo
 	return RADTODEG(dir.Heading());
 }
 
+// no "New" in MIAMI
+//--MIAMI: TODO
 bool
 CPathFind::NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY, float spawnDist, float angleLimit, bool forward, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, bool ignoreDisabled)
 {
@@ -1276,14 +1418,14 @@ CPathFind::NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY,
 		if(m_pathNodes[node1].bDisabled && !ignoreDisabled)
 			continue;
 		dist1 = Distance2D(m_pathNodes[node1].GetPosition(), x, y);
-		if(dist1 < spawnDist + 60.0f){
-			d1 = dist1 - spawnDist;
+		if(dist1 < Max(spawnDist + 70.0f, spawnDist * 1.7f)){
+			d1 = m_pathNodes[node1].bWaterPath ? (dist1 - spawnDist * 1.5f) : (dist1 - spawnDist);
 			for(j = 0; j < m_pathNodes[node1].numLinks; j++){
 				node2 = ConnectedNode(m_pathNodes[node1].firstLink + j);
 				if(m_pathNodes[node2].bDisabled && !ignoreDisabled)
 					continue;
 				dist2 = Distance2D(m_pathNodes[node2].GetPosition(), x, y);
-				d2 = dist2 - spawnDist;
+				d2 = m_pathNodes[node2].bWaterPath ? (dist2 - spawnDist * 1.5f) : (dist2 - spawnDist);
 				if(d1*d2 < 0.0f){
 					// nodes are on different sides of spawn distance
 					float f2 = Abs(d1)/(Abs(d1) + Abs(d2));
@@ -1315,6 +1457,7 @@ CPathFind::NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY,
 	return false;
 }
 
+//--MIAMI: TODO
 bool
 CPathFind::GeneratePedCreationCoors(float x, float y, float minDist, float maxDist, float minDistOffScreen, float maxDistOffScreen, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, CMatrix *camMatrix)
 {
@@ -1374,42 +1517,7 @@ CPathFind::GeneratePedCreationCoors(float x, float y, float minDist, float maxDi
 	return false;
 }
 
-CTreadable*
-CPathFind::FindRoadObjectClosestToCoors(CVector coors, uint8 type)
-{
-	int i, j, k;
-	int node1, node2;
-	CTreadable *closestMapObj = nil;
-	float closestDist = 10000.0f;
-
-	for(i = 0; i < m_numMapObjects; i++){
-		CTreadable *mapObj = m_mapObjects[i];
-		if(mapObj->m_nodeIndices[type][0] < 0)
-			continue;
-		CVector vDist = mapObj->GetPosition() - coors;
-		float fDist = Abs(vDist.x) + Abs(vDist.y) + Abs(vDist.z);
-		if(fDist < 200.0f || fDist < closestDist)
-			for(j = 0; j < 12; j++){
-				node1 = mapObj->m_nodeIndices[type][j];
-				if(node1 < 0)
-					break;
-				// FIX: game uses ThePaths here explicitly
-				for(k = 0; k < m_pathNodes[node1].numLinks; k++){
-					node2 = ConnectedNode(m_pathNodes[node1].firstLink + k);
-					float lineDist = CCollision::DistToLine(&m_pathNodes[node1].GetPosition(), &m_pathNodes[node2].GetPosition(), &coors);
-					if(lineDist < closestDist){
-						closestDist = lineDist;
-						if((coors - m_pathNodes[node1].GetPosition()).MagnitudeSqr() < (coors - m_pathNodes[node2].GetPosition()).MagnitudeSqr())
-							closestMapObj = m_mapObjects[m_pathNodes[node1].objectIndex];
-						else
-							closestMapObj = m_mapObjects[m_pathNodes[node2].objectIndex];
-					}
-				}
-			}
-	}
-	return closestMapObj;
-}
-
+//--MIAMI: done
 void
 CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode, CPathNode **nextNode, uint8 curDir, uint8 *nextDir)
 {
@@ -1417,19 +1525,8 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
 	CPathNode *node;
 
 	if(lastNode == nil || (node = *lastNode) == nil || (coors - (*lastNode)->GetPosition()).MagnitudeSqr() > 7.0f){
-		// need to find the node we're coming from
-		node = nil;
-		CTreadable *obj = FindRoadObjectClosestToCoors(coors, type);
-		float nodeDist = 1000000000.0f;
-		for(i = 0; i < 12; i++){
-			if(obj->m_nodeIndices[type][i] < 0)
-				break;
-			float dist = (coors - m_pathNodes[obj->m_nodeIndices[type][i]].GetPosition()).MagnitudeSqr();
-			if(dist < nodeDist){
-				nodeDist = dist;
-				node = &m_pathNodes[obj->m_nodeIndices[type][i]];
-			}
-		}
+		int32 nodeIdx = FindNodeClosestToCoors(coors, type, 999999.88f);
+		node = &m_pathNodes[nodeIdx];
 	}
 
 	CVector2D vCurDir(Sin(curDir*PI/4.0f), Cos(curDir * PI / 4.0f));
@@ -1485,8 +1582,9 @@ CPathFind::FindNextNodeWandering(uint8 type, CVector coors, CPathNode **lastNode
 	}
 }
 
-static CPathNode *apNodesToBeCleared[4995];
+static CPathNode *apNodesToBeCleared[6525];
 
+//--MIAMI: done
 void
 CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target, CPathNode **nodes, int16 *pNumNodes, int16 maxNumNodes, CVehicle *vehicle, float *pDist, float distLimit, int32 targetNodeId)
 {
@@ -1502,42 +1600,22 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 	}
 
 	// Find start
-	int numPathsToTry;
-	CTreadable *startObj;
-	if(startNodeId < 0){
-		if(vehicle == nil || (startObj = vehicle->m_treadable[type]) == nil)
-			startObj = FindRoadObjectClosestToCoors(start, type);
-		numPathsToTry = 0;
-		for(i = 0; i < 12; i++){
-			if(startObj->m_nodeIndices[type][i] < 0)
-				break;
-			if(m_pathNodes[startObj->m_nodeIndices[type][i]].group == m_pathNodes[targetNodeId].group)
-				numPathsToTry++;
-		}
-	}else{
-		numPathsToTry = 1;
-		startObj = m_mapObjects[m_pathNodes[startNodeId].objectIndex];
-	}
-	if(numPathsToTry == 0) {
+	if(startNodeId < 0)
+		startNodeId = FindNodeClosestToCoors(start, type, 999999.88f);
+	if(startNodeId < 0) {
 		*pNumNodes = 0;
 		if(pDist) *pDist = 100000.0f;
 		return;
 	}
-
-	if(startNodeId < 0){
-		// why only check node 0?
-		if(m_pathNodes[startObj->m_nodeIndices[type][0]].group !=
-		   m_pathNodes[targetNodeId].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
-	}else{
-		if(m_pathNodes[startNodeId].group != m_pathNodes[targetNodeId].group) {
-			*pNumNodes = 0;
-			if(pDist) *pDist = 100000.0f;
-			return;
-		}
+	if(startNodeId == targetNodeId){
+		*pNumNodes = 0;
+		if(pDist) *pDist = 0.0f;
+		return;
+	}
+	if(m_pathNodes[startNodeId].group != m_pathNodes[targetNodeId].group) {
+		*pNumNodes = 0;
+		if(pDist) *pDist = 100000.0f;
+		return;
 	}
 
 	for(i = 0; i < ARRAY_SIZE(m_searchNodes); i++)
@@ -1549,14 +1627,11 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 	// Dijkstra's algorithm
 	// Find distances
 	int numPathsFound = 0;
-	if(startNodeId < 0 && m_mapObjects[m_pathNodes[targetNodeId].objectIndex] == startObj)
-		numPathsFound++;
-	for(i = 0; numPathsFound < numPathsToTry; i = (i+1) & 0x1FF){
+	for(i = 0; numPathsFound == 0; i = (i+1) & 0x1FF){
 		CPathNode *node;
 		for(node = m_searchNodes[i].GetNext(); node; node = node->GetNext()){
-			if(m_mapObjects[node->objectIndex] == startObj &&
-			   (startNodeId < 0 || node == &m_pathNodes[startNodeId]))
-				numPathsFound++;
+			if(node == &m_pathNodes[startNodeId])
+				numPathsFound = 1;
 
 			for(j = 0; j < node->numLinks; j++){
 				int next = ConnectedNode(node->firstLink + j);
@@ -1576,34 +1651,12 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 
 	// Find out whence to start tracing back
 	CPathNode *curNode;
-	if(startNodeId < 0){
-		int minDist = MAX_DIST;
-		*pNumNodes = 1;
-		for(i = 0; i < 12; i++){
-			if(startObj->m_nodeIndices[type][i] < 0)
-				break;
-			int dist = (m_pathNodes[startObj->m_nodeIndices[type][i]].GetPosition() - start).Magnitude();
-			if(m_pathNodes[startObj->m_nodeIndices[type][i]].distance + dist < minDist){
-				minDist = m_pathNodes[startObj->m_nodeIndices[type][i]].distance + dist;
-				curNode = &m_pathNodes[startObj->m_nodeIndices[type][i]];
-			}
-		}
-		if(maxNumNodes == 0){
-			*pNumNodes = 0;
-		}else{
-			nodes[0] = curNode;
-			*pNumNodes = 1;
-		}
-		if(pDist)
-			*pDist = minDist;
-	}else
-	{
-		curNode = &m_pathNodes[startNodeId];
-		*pNumNodes = 0;
-		if(pDist)
-			*pDist = m_pathNodes[startNodeId].distance;
-	}
+	curNode = &m_pathNodes[startNodeId];
+	*pNumNodes = 0;
+	if(pDist)
+		*pDist = m_pathNodes[startNodeId].distance;
 
+	nodes[(*pNumNodes)++] = curNode;
 	// Trace back to target and update list of nodes
 	while(*pNumNodes < maxNumNodes && curNode != &m_pathNodes[targetNodeId])
 		for(i = 0; i < curNode->numLinks; i++){
@@ -1617,13 +1670,13 @@ CPathFind::DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector ta
 
 	for(i = 0; i < numNodesToBeCleared; i++)
 		apNodesToBeCleared[i]->distance = MAX_DIST;
-	return;
 }
 
 static CPathNode *pNodeList[32];
 static int16 DummyResult;
 static int16 DummyResult2;
 
+//--MIAMI: done
 bool
 CPathFind::TestCoorsCloseness(CVector target, uint8 type, CVector start)
 {
@@ -1634,11 +1687,12 @@ CPathFind::TestCoorsCloseness(CVector target, uint8 type, CVector start)
 	else
 		DoPathSearch(type, start, -1, target, nil, &DummyResult2, 0, nil, &dist, 50.0f, -1);
 	if(type == PATH_CAR)
-		return dist < 160.0f;
+		return dist < 150.0f;
 	else
 		return dist < 100.0f;
 }
 
+//--MIAMI: done
 void
 CPathFind::Save(uint8 *buf, uint32 *size)
 {
@@ -1660,6 +1714,7 @@ CPathFind::Save(uint8 *buf, uint32 *size)
 			buf[i/8 + n] &= ~(1 << i%8);
 }
 
+//--MIAMI: done
 void
 CPathFind::Load(uint8 *buf, uint32 size)
 {
@@ -1804,3 +1859,32 @@ CPathFind::DisplayPathData(void)
 		}
 	}
 }
+
+CVector
+CPathFind::TakeWidthIntoAccountForWandering(CPathNode* nextNode, uint16 random)
+{
+	CVector pos = nextNode->GetPosition();
+	float newX = (nextNode->GetPedNodeWidth() * ((random % 16) - 7)) + pos.x;
+	float newY = (nextNode->GetPedNodeWidth() * (((random / 16) % 16) - 7)) + pos.y;
+	return CVector(newX, newY, pos.z);
+}
+
+CPathNode*
+CPathFind::GetNode(int16 index)
+{
+	if(index < 0)
+		return nil;
+	if(index < ARRAY_SIZE(ThePaths.m_searchNodes))
+		return &ThePaths.m_searchNodes[index];
+	return &ThePaths.m_pathNodes[index - ARRAY_SIZE(ThePaths.m_searchNodes)];
+}
+int16
+CPathFind::GetIndex(CPathNode *node)
+{
+	if(node == nil)
+		return -1;
+	if(node >= &ThePaths.m_searchNodes[0] && node < &ThePaths.m_searchNodes[ARRAY_SIZE(ThePaths.m_searchNodes)])
+		return node - ThePaths.m_searchNodes;
+	else
+		return (node - ThePaths.m_pathNodes) + ARRAY_SIZE(ThePaths.m_searchNodes);
+}
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index bbfdf7b7..2896237a 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -5,13 +5,12 @@
 class CVehicle;
 class CPtrList;
 
+#define LANE_WIDTH 5.0f
+
 enum
 {
 	NodeTypeExtern = 1,
 	NodeTypeIntern = 2,
-
-	UseInRoadBlock = 1,
-	ObjectEastWest = 2,
 };
 
 enum
@@ -56,31 +55,45 @@ public:
 
 struct CPathNode
 {
-	CVector pos;
-	CPathNode *prev;
-	CPathNode *next;
+	int16 prevIndex;
+	int16 nextIndex;
+	int16 x;
+	int16 y;
+	int16 z;
 	int16 distance;		// in path search
-	int16 objectIndex;
 	int16 firstLink;
-	uint8 numLinks;
+	uint8 width;
+	int8 group;
 
-	uint8 unkBits : 2;
+	uint8 numLinks : 4;
 	uint8 bDeadEnd : 1;
 	uint8 bDisabled : 1;
 	uint8 bBetweenLevels : 1;
-
-	int8 group;
-
-	CVector &GetPosition(void) { return pos; }
-	void SetPosition(const CVector &p) { pos = p; }
-	float GetX(void) { return pos.x; }
-	float GetY(void) { return pos.y; }
-	float GetZ(void) { return pos.z; }
-
-	CPathNode *GetPrev(void) { return prev; }
-	CPathNode *GetNext(void) { return next; }
-	void SetPrev(CPathNode *node) { prev = node; }
-	void SetNext(CPathNode *node) { next = node; }
+	uint8 bUseInRoadBlock : 1;
+
+	uint8 bWaterPath : 1;
+	uint8 bOnlySmallBoats : 1;
+	uint8 flagB4 : 1;	// where is this set?
+	uint8 speedLimit : 2;
+	//uint8 flagB20 : 1;
+	//uint8 flagB40 : 1;
+	//uint8 flagB80 : 1;
+
+	uint8 spawnRate : 4;
+	uint8 flagsC : 4;
+
+	CVector GetPosition(void) { return CVector(x/8.0f, y/8.0f, z/8.0f); }
+	void SetPosition(const CVector &p) { x = p.x*8.0f; y = p.y*8.0f; z = p.z*8.0f; }
+	float GetX(void) { return x/8.0f; }
+	float GetY(void) { return y/8.0f; }
+	float GetZ(void) { return z/8.0f; }
+	bool HasDivider(void) { return width != 0; }
+	float GetDividerWidth(void) { return width/(2*8.0f); }
+	float GetPedNodeWidth(void) { return width*(31.f/(500.f * 8.f)); }
+	CPathNode *GetPrev(void);
+	CPathNode *GetNext(void);
+	void SetPrev(CPathNode *node);
+	void SetNext(CPathNode *node);
 };
 
 union CConnectionFlags
@@ -94,22 +107,25 @@ union CConnectionFlags
 
 struct CCarPathLink
 {
-	CVector2D pos;
-	CVector2D dir;
+	int16 x;
+	int16 y;
 	int16 pathNodeIndex;
-	int8 numLeftLanes;
-	int8 numRightLanes;
-	uint8 trafficLightType;
-
-	uint8 bBridgeLights : 1;
-	// more?
-
-	CVector2D &GetPosition(void) { return pos; }
-	CVector2D &GetDirection(void) { return dir; }
-	float GetX(void) { return pos.x; }
-	float GetY(void) { return pos.y; }
-	float GetDirX(void) { return dir.x; }
-	float GetDirY(void) { return dir.y; }
+	int8 dirX;
+	int8 dirY;
+	int8 numLeftLanes : 3;
+	int8 numRightLanes : 3;
+	uint8 flag1 : 1;
+	uint8 trafficLightType : 2;
+	uint8 bBridgeLights : 1;	// at least in LCS...
+	int8 width;
+
+	CVector2D GetPosition(void) { return CVector2D(x/8.0f, y/8.0f); }
+	CVector2D GetDirection(void) { return CVector2D(dirX/100.0f, dirY/100.0f); }
+	float GetX(void) { return x/8.0f; }
+	float GetY(void) { return y/8.0f; }
+	float GetDirX(void) { return dirX/100.0f; }
+	float GetDirY(void) { return dirY/100.0f; }
+	float GetLaneOffset(void) { return width/(2*8.0f*LANE_WIDTH); }
 
 	float OneWayLaneOffset()
 	{
@@ -117,21 +133,33 @@ struct CCarPathLink
 			return 0.5f - 0.5f * numRightLanes;
 		if (numRightLanes == 0)
 			return 0.5f - 0.5f * numLeftLanes;
-		return 0.5f;
+		return 0.5f + GetLaneOffset();
 	}
 };
 
 // This is what we're reading from the files, only temporary
 struct CPathInfoForObject
 {
-	int16 x;
-	int16 y;
-	int16 z;
+	float x;
+	float y;
+	float z;
 	int8 type;
 	int8 next;
 	int8 numLeftLanes;
 	int8 numRightLanes;
+	int8 speedLimit;
+	int8 width;
+
 	uint8 crossing : 1;
+	uint8 onlySmallBoats : 1;
+	uint8 roadBlock : 1;
+	uint8 disabled : 1;
+	uint8 waterPath : 1;
+	uint8 betweenLevels : 1;
+
+	uint8 spawnRate : 4;
+
+	void SwapConnectionsToBeRightWayRound(void);
 };
 extern CPathInfoForObject *InfoForTileCars;
 extern CPathInfoForObject *InfoForTilePeds;
@@ -139,18 +167,25 @@ extern CPathInfoForObject *InfoForTilePeds;
 struct CTempNode
 {
 	CVector pos;
-	float dirX;
-	float dirY;
+	int8 dirX;	// *100
+	int8 dirY;
 	int16 link1;
 	int16 link2;
 	int8 numLeftLanes;
 	int8 numRightLanes;
+	int8 width;
+	bool isCross;
 	int8 linkState;
 };
 
-struct CTempDetachedNode	// unused
+struct CTempNodeExternal	// made up name
 {
-	uint8 foo[20];
+	CVector pos;
+	int16 next;
+	int8 numLeftLanes;
+	int8 numRightLanes;
+	int8 width;
+	bool isCross;
 };
 
 class CPathFind
@@ -159,10 +194,8 @@ public:
 	CPathNode m_pathNodes[NUM_PATHNODES];
 	CCarPathLink m_carPathLinks[NUM_CARPATHLINKS];
 	CTreadable *m_mapObjects[NUM_MAPOBJECTS];
-	uint8 m_objectFlags[NUM_MAPOBJECTS];
-	int16 m_connections[NUM_PATHCONNECTIONS];
-	int16 m_distances[NUM_PATHCONNECTIONS];
-	CConnectionFlags m_connectionFlags[NUM_PATHCONNECTIONS];
+	uint16 m_connections[NUM_PATHCONNECTIONS];	// and flags
+	uint8 m_distances[NUM_PATHCONNECTIONS];
 	int16 m_carPathConnections[NUM_PATHCONNECTIONS];
 
 	int32 m_numPathNodes;
@@ -178,14 +211,19 @@ public:
 	void Init(void);
 	void AllocatePathFindInfoMem(int16 numPathGroups);
 	void RegisterMapObject(CTreadable *mapObject);
-	void StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, bool crossing);
-	void StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, int16 width, int8 numLeft, int8 numRight);
-	void CalcNodeCoors(int16 x, int16 y, int16 z, int32 id, CVector *out);
+	void StoreNodeInfoPed(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, float width, bool crossing, uint8 spawnRate);
+	void StoreNodeInfoCar(int16 id, int16 node, int8 type, int8 next, int16 x, int16 y, int16 z, float width, int8 numLeft, int8 numRight,
+		bool disabled, bool betweenLevels, uint8 speedLimit, bool roadBlock, bool waterPath, uint8 spawnRate);
+	void StoreDetachedNodeInfoPed(int32 node, int8 type, int32 next, float x, float y, float z, float width, bool crossing,
+		bool disabled, bool betweenLevels, uint8 spawnRate);
+	void StoreDetachedNodeInfoCar(int32 node, int8 type, int32 next, float x, float y, float z, float width, int8 numLeft, int8 numRight,
+		bool disabled, bool betweenLevels, uint8 speedLimit, bool roadBlock, bool waterPath, uint8 spawnRate, bool unk);
+	void CalcNodeCoors(float x, float y, float z, int32 id, CVector *out);
 	bool LoadPathFindData(void);
 	void PreparePathData(void);
 	void CountFloodFillGroups(uint8 type);
 	void PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoForObject *objectpathinfo,
-		float maxdist, CTempDetachedNode *detachednodes, int32 numDetached);
+		float maxdist, CPathInfoForObject *detachednodes, int32 numDetached);
 
 	bool IsPathObject(int id) { return id < PATHNODESIZE && (InfoForTileCars[id*12].type != 0 || InfoForTilePeds[id*12].type != 0); }
 
@@ -203,30 +241,39 @@ public:
 	void MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId);
 	void MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
 	void PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
-	int32 FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled = false, bool ignoreBetweenLevels = false);
+// TODO(MIAMI): check callers for new arguments
+	int32 FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled = false, bool ignoreBetweenLevels = false, bool ignoreFlagB4 = false, bool bWaterPath = false);
 	int32 FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, float dirX, float dirY);
 	float FindNodeOrientationForCarPlacement(int32 nodeId);
 	float FindNodeOrientationForCarPlacementFacingDestination(int32 nodeId, float x, float y, bool towards);
 	bool NewGenerateCarCreationCoors(float x, float y, float dirX, float dirY, float spawnDist, float angleLimit, bool forward, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, bool ignoreDisabled = false);
 	bool GeneratePedCreationCoors(float x, float y, float minDist, float maxDist, float minDistOffScreen, float maxDistOffScreen, CVector *pPosition, int32 *pNode1, int32 *pNode2, float *pPositionBetweenNodes, CMatrix *camMatrix);
-	CTreadable *FindRoadObjectClosestToCoors(CVector coors, uint8 type);
 	void FindNextNodeWandering(uint8, CVector, CPathNode**, CPathNode**, uint8, uint8*);
 	void DoPathSearch(uint8 type, CVector start, int32 startNodeId, CVector target, CPathNode **nodes, int16 *numNodes, int16 maxNumNodes, CVehicle *vehicle, float *dist, float distLimit, int32 forcedTargetNode);
 	bool TestCoorsCloseness(CVector target, uint8 type, CVector start);
 	void Save(uint8 *buf, uint32 *size);
 	void Load(uint8 *buf, uint32 size);
-	uint16 ConnectedNode(int id) { return m_connections[id]; }
-	bool ConnectionCrossesRoad(int id) { return m_connectionFlags[id].bCrossesRoad; }
-	bool ConnectionHasTrafficLight(int id) { return m_connectionFlags[id].bTrafficLight; }
-	void ConnectionSetTrafficLight(int id) { m_connectionFlags[id].bTrafficLight = true; }
+
+	static CVector TakeWidthIntoAccountForWandering(CPathNode*, uint16);
+
+	CPathNode *GetNode(int16 index);
+	int16 GetIndex(CPathNode *node);
+
+	uint16 ConnectedNode(int id) { return m_connections[id] & 0x3FFF; }
+	bool ConnectionCrossesRoad(int id) { return !!(m_connections[id] & 0x8000); }
+	bool ConnectionHasTrafficLight(int id) { return !!(m_connections[id] & 0x4000); }
+	void ConnectionSetTrafficLight(int id) { m_connections[id] |= 0x4000; }
 
 	void DisplayPathData(void);
 };
 
-VALIDATE_SIZE(CPathFind, 0x49bf4);
-
 extern CPathFind ThePaths;
 
+inline CPathNode *CPathNode::GetPrev(void) { return ThePaths.GetNode(prevIndex); }
+inline CPathNode *CPathNode::GetNext(void) { return ThePaths.GetNode(nextIndex); }
+inline void CPathNode::SetPrev(CPathNode *node) { prevIndex = ThePaths.GetIndex(node); }
+inline void CPathNode::SetNext(CPathNode *node) { nextIndex = ThePaths.GetIndex(node); }
+
 extern bool gbShowPedPaths;
 extern bool gbShowCarPaths;
 extern bool gbShowCarPathsLinks;
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 33095036..2de30a0a 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -44,15 +44,35 @@ uint32 CPickups::StaticCamStartTime;
 
 tPickupMessage CPickups::aMessages[NUMPICKUPMESSAGES];
 
-// 20 ?! Some Miami leftover? (Originally at 0x5ED8D4)
+// TODO(Miami)
 uint16 AmmoForWeapon[20] = { 0, 1, 45, 125, 25, 150, 300, 25, 5, 250, 5, 5, 0, 500, 0, 100, 0, 0, 0, 0 };
-uint16 AmmoForWeapon_OnStreet[20] = { 0, 1, 9, 25, 5, 30, 60, 5, 1, 50, 1, 1, 0, 200, 0, 100, 0, 0, 0, 0 };
+
+// --MIAMI: Done
+uint16 AmmoForWeapon_OnStreet[WEAPONTYPE_TOTALWEAPONS] = {
+	0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 34,
+	12, 16, 14, 10, 100, 60, 60, 60, 60, 60, 20, 14,
+	4, 150, 100, 500, 1, 400, 36, 0,
+};
 uint16 CostOfWeapon[20] = { 0, 10, 250, 800, 1500, 3000, 5000, 10000, 25000, 25000, 2000, 2000, 0, 50000, 0, 3000, 0, 0, 0, 0 };
 
-uint8 aWeaponReds[] = { 255, 0, 128, 255, 255, 0, 255, 0, 128, 128, 255, 255, 128, 0, 255, 0 };
-uint8 aWeaponGreens[] = { 0, 255, 128, 255, 0, 255, 128, 255, 0, 255, 255, 0, 255, 0, 255, 0 };
-uint8 aWeaponBlues[] = { 0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255, 0, 128, 255, 0, 0 };
-float aWeaponScale[] = { 1.0f, 2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f, 1.0f, 1.0f, 1.0f };
+// TODO(Miami): Those are all placeholders!!
+uint8 aWeaponReds[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+255, 0, 128, 255, 255, 0, 255, 0, 128, 128, 255,
+255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+255, 128, 0, 255, 0 };
+uint8 aWeaponGreens[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+0, 255, 128, 255, 0, 255, 128, 255, 0, 255, 255,
+255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+0, 255, 0, 255, 0 };
+uint8 aWeaponBlues[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255,
+255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+0, 128, 255, 0, 0 };
+
+float aWeaponScale[] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f,
+1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
+1.0f, 1.0f, 1.0f, 1.0f };
 
 void
 CPickup::RemoveKeepType()
@@ -93,6 +113,7 @@ CPickup::GiveUsAPickUpObject(int32 handle)
 	object->bExplosionProof = true;
 	object->bUsesCollision = false;
 	object->bIsPickup = true;
+	object->bHasPreRenderEffects = true;
 
 	object->m_nBonusValue = m_eModelIndex == MI_PICKUP_BONUS ? m_nQuantity : 0;
 
@@ -129,12 +150,12 @@ CPickup::GiveUsAPickUpObject(int32 handle)
 }
 
 bool
-CPickup::CanBePickedUp(CPlayerPed *player)
+CPickup::CanBePickedUp(CPlayerPed *player, int playerId)
 {
 	assert(m_pObject != nil);
 	bool cannotBePickedUp =
-		(m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > 99.5f)
-		|| (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > 99.5f)
+		(m_pObject->GetModelIndex() == MI_PICKUP_BODYARMOUR && player->m_fArmour > CWorld::Players[playerId].m_nMaxArmour - 0.5f)
+		|| (m_pObject->GetModelIndex() == MI_PICKUP_HEALTH && player->m_fHealth > CWorld::Players[playerId].m_nMaxHealth - 0.5f)
 		|| (m_pObject->GetModelIndex() == MI_PICKUP_BRIBE && player->m_pWanted->m_nWantedLevel == 0)
 		|| (m_pObject->GetModelIndex() == MI_PICKUP_KILLFRENZY && (CTheScripts::IsPlayerOnAMission() || CDarkel::FrenzyOnGoing() || !CGame::nastyGame));
 	return !cannotBePickedUp;
@@ -190,7 +211,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
 		}
 
 		// if we didn't then we've got nothing to do
-		if (isPickupTouched && CanBePickedUp(player)) {
+		if (isPickupTouched && CanBePickedUp(player, playerId)) {
 			CPad::GetPad(0)->StartShake(120, 100);
 			switch (m_eType)
 			{
@@ -380,6 +401,30 @@ CPickups::Init(void)
 	CollectedPickUpIndex = 0;
 }
 
+// --MIAMI: Done
+bool
+CPickups::TestForPickupsInBubble(CVector pos, float range)
+{
+	for (int i = 0; i < NUMPICKUPS; i++) {
+		if ((aPickUps[i].m_vecPos - pos).Magnitude() < range)
+			return true;
+	}
+	return false;
+}
+
+// --MIAMI: Done
+bool
+CPickups::TryToMerge_WeaponType(CVector pos, eWeaponType weapon, uint8 type, uint32 quantity, bool unused) {
+	for (int i = 0; i < NUMPICKUPS; i++) {
+		if (aPickUps[i].m_eType == type && aPickUps[i].m_eModelIndex == ModelForWeapon(weapon))
+			if ((aPickUps[i].m_vecPos - pos).Magnitude() < 7.5f) {
+				aPickUps[i].m_nQuantity += quantity;
+				return true;
+			}
+	}
+	return false;
+}
+
 bool
 CPickups::IsPickUpPickedUp(int32 pickupId)
 {
@@ -430,14 +475,14 @@ CPickups::GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex)
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_ADRENALINE, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_BODYARMOUR) {
-		player->m_fArmour = 100.0f;
+		player->m_fArmour = CWorld::Players[playerIndex].m_nMaxArmour;
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_ARMOUR, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_INFO) {
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_BONUS, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_HEALTH) {
-		player->m_fHealth = 100.0f;
+		player->m_fHealth = CWorld::Players[playerIndex].m_nMaxHealth;
 		DMAudio.PlayFrontEndSound(SOUND_PICKUP_HEALTH, 0);
 		return true;
 	} else if (modelIndex == MI_PICKUP_BONUS) {
@@ -486,7 +531,7 @@ CPickups::RemovePickUp(int32 pickupIndex)
 }
 
 int32
-CPickups::GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity)
+CPickups::GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity, uint32 rate, bool highPriority, wchar* pText)
 {
 	bool bFreeFound = false;
 	int32 slot = 0;
@@ -561,53 +606,22 @@ CPickups::GetNewUniquePickupIndex(int32 slot)
 	return slot | (aPickUps[slot].m_nIndex << 16);
 }
 
+// --MIAMI: Done
 int32
 CPickups::ModelForWeapon(eWeaponType weaponType)
 {
-	switch (weaponType)
-	{
-	case WEAPONTYPE_BASEBALLBAT: return MI_BASEBALL_BAT;
-	case WEAPONTYPE_COLT45: return MI_COLT;
-	case WEAPONTYPE_UZI: return MI_UZI;
-	case WEAPONTYPE_SHOTGUN: return MI_SHOTGUN;
-	case WEAPONTYPE_AK47: return MI_AK47;
-	case WEAPONTYPE_M16: return MI_M16;
-	case WEAPONTYPE_SNIPERRIFLE: return MI_SNIPER;
-	case WEAPONTYPE_ROCKETLAUNCHER: return MI_ROCKETLAUNCHER;
-	case WEAPONTYPE_FLAMETHROWER: return MI_FLAMETHROWER;
-	case WEAPONTYPE_MOLOTOV: return MI_MOLOTOV;
-	case WEAPONTYPE_GRENADE: return MI_GRENADE;
-	default: break;
-	}
-	return 0;
+	return CWeaponInfo::GetWeaponInfo(weaponType)->m_nModelId;
 }
 
+// --MIAMI: Done
 eWeaponType
 CPickups::WeaponForModel(int32 model)
 {
 	if (model == MI_PICKUP_BODYARMOUR) return WEAPONTYPE_ARMOUR;
-	switch (model)
-	{
-	case MI_GRENADE: return WEAPONTYPE_GRENADE;
-	case MI_AK47: return WEAPONTYPE_AK47;
-	case MI_BASEBALL_BAT: return WEAPONTYPE_BASEBALLBAT;
-	case MI_COLT: return WEAPONTYPE_COLT45;
-	case MI_MOLOTOV: return WEAPONTYPE_MOLOTOV;
-	case MI_ROCKETLAUNCHER: return WEAPONTYPE_ROCKETLAUNCHER;
-	case MI_SHOTGUN: return WEAPONTYPE_SHOTGUN;
-	case MI_SNIPER: return WEAPONTYPE_SNIPERRIFLE;
-	case MI_UZI: return WEAPONTYPE_UZI;
-	case MI_MISSILE: return WEAPONTYPE_UNARMED;
-	case MI_M16: return WEAPONTYPE_M16;
-	case MI_FLAMETHROWER: return WEAPONTYPE_FLAMETHROWER;
-	}
-	return WEAPONTYPE_UNARMED;
-}
-
-int32
-CPickups::FindColourIndexForWeaponMI(int32 model)
-{
-	return WeaponForModel(model) - 1;
+	if (model == MI_PICKUP_HEALTH) return WEAPONTYPE_HEALTH;
+	if (model == MI_PICKUP_ADRENALINE) return WEAPONTYPE_ARMOUR;
+	if (model == -1) return WEAPONTYPE_UNARMED;
+	return (eWeaponType)((CWeaponModelInfo*)CModelInfo::GetModelInfo(model))->GetWeaponInfo();
 }
 
 void
@@ -685,15 +699,15 @@ CPickups::DoPickUpEffects(CEntity *entity)
 		int16 colorId;
 
 		if (entity->GetModelIndex() == MI_PICKUP_ADRENALINE || entity->GetModelIndex() == MI_PICKUP_CAMERA)
-			colorId = 11;
+			colorId = WEAPONTYPE_TOTALWEAPONS;
 		else if (entity->GetModelIndex() == MI_PICKUP_BODYARMOUR || entity->GetModelIndex() == MI_PICKUP_BRIBE)
-			colorId = 12;
+			colorId = WEAPONTYPE_TOTALWEAPONS + 1;
 		else if (entity->GetModelIndex() == MI_PICKUP_INFO || entity->GetModelIndex() == MI_PICKUP_KILLFRENZY)
-			colorId = 13;
+			colorId = WEAPONTYPE_TOTALWEAPONS + 2;
 		else if (entity->GetModelIndex() == MI_PICKUP_HEALTH || entity->GetModelIndex() == MI_PICKUP_BONUS)
-			colorId = 14;
+			colorId = WEAPONTYPE_TOTALWEAPONS + 3;
 		else
-			colorId = FindColourIndexForWeaponMI(entity->GetModelIndex());
+			colorId = WeaponForModel(entity->GetModelIndex());
 
 		assert(colorId >= 0);
 
@@ -826,6 +840,7 @@ CPickups::RenderPickUpText()
 				if (aMessages[i].m_weaponType == WEAPONTYPE_TOTALWEAPONS) { // unreachable code?
 					// what is this??
 					sprintf(gString, "%d/%d", CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages, 2903);
+					strToPrint = nil;
 				} else {
 					if (aMessages[i].m_bOutOfStock)
 						strToPrint = TheText.Get("STOCK");
@@ -957,6 +972,8 @@ CPickups::RenderPickUpText()
 				break;
 			}
 		}
+		if (strToPrint == nil)
+			continue;
 		CFont::SetPropOn();
 		CFont::SetBackgroundOff();
 
@@ -982,6 +999,25 @@ CPickups::RenderPickUpText()
 }
 
 void
+CPickups::CreateSomeMoney(CVector pos, int money)
+{
+	bool found;
+
+	int pickupCount = Min(money / 20 + 1, 7);
+	int moneyPerPickup = money / pickupCount;
+
+	for (int i = 0; i < pickupCount; i++) {
+		// (CGeneral::GetRandomNumber() % 256) * PI / 128 gives a float up to something TWOPI-ish.
+		pos.x += 1.5f * Sin((CGeneral::GetRandomNumber() % 256) * PI / 128);
+		pos.y += 1.5f * Cos((CGeneral::GetRandomNumber() % 256) * PI / 128);
+		pos.z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, &found) + 0.5f;
+		if (found) {
+			CPickups::GenerateNewOne(CVector(pos.x, pos.y, pos.z), MI_MONEY, PICKUP_MONEY, moneyPerPickup + (CGeneral::GetRandomNumber() & 3));
+		}
+	}
+}
+
+void
 CPickups::Load(uint8 *buf, uint32 size)
 {
 INITSAVEBUF
@@ -1126,45 +1162,6 @@ CPacManPickups::Update()
 void
 CPacManPickups::GeneratePMPickUps(CVector pos, float scrambleMult, int16 count, uint8 type)
 {
-	int i = 0;
-	while (count > 0) {
-		while (aPMPickUps[i].m_eType != PACMAN_NONE)
-			i++;
-
-		bool bPickupCreated = false;
-		while (!bPickupCreated) {
-			CVector newPos = pos;
-			CColPoint colPoint;
-			CEntity *pRoad;
-			uint16 nRand = CGeneral::GetRandomNumber();
-			newPos.x += ((nRand & 0xFF) - 128) * scrambleMult / 128.0f;
-			newPos.y += (((nRand >> 8) & 0xFF) - 128) * scrambleMult / 128.0f;
-			newPos.z = 1000.0f;
-			if (CWorld::ProcessVerticalLine(newPos, -1000.0f, colPoint, pRoad, true, false, false, false, true, false, nil) && pRoad->IsBuilding() && ((CBuilding*)pRoad)->GetIsATreadable()) {
-				newPos.z = 0.7f + colPoint.point.z;
-				aPMPickUps[i].m_eType = type;
-				aPMPickUps[i].m_vecPosn = newPos;
-				CObject *obj = new CObject(MI_BULLION, true);
-				if (obj != nil) {
-					obj->ObjectCreatedBy = MISSION_OBJECT;
-					obj->SetPosition(aPMPickUps[i].m_vecPosn);
-					obj->SetOrientation(0.0f, 0.0f, -HALFPI);
-					obj->GetMatrix().UpdateRW();
-					obj->UpdateRwFrame();
-
-					obj->bAffectedByGravity = false;
-					obj->bExplosionProof = true;
-					obj->bUsesCollision = false;
-					obj->bIsPickup = false;
-					CWorld::Add(obj);
-				}
-				aPMPickUps[i].m_pObject = obj;
-				bPickupCreated = true;
-			}
-		}
-		count--;
-	}
-	bPMActive = true;
 }
 
 // diablo porn mission pickups
@@ -1281,40 +1278,6 @@ static const CVector aRacePoints1[] = {
 void
 CPacManPickups::GeneratePMPickUpsForRace(int32 race)
 {
-	const CVector *pPos = nil;
-	int i = 0;
-
-	if (race == 0) pPos = aRacePoints1; // there's only one available
-	assert(pPos != nil);
-
-	while (!pPos->IsZero()) {
-		while (aPMPickUps[i].m_eType != PACMAN_NONE)
-			i++;
-
-		aPMPickUps[i].m_eType = PACMAN_RACE;
-		aPMPickUps[i].m_vecPosn = *(pPos++);
-		if (race == 0) {
-			CObject* obj = new CObject(MI_DONKEYMAG, true);
-			if (obj != nil) {
-				obj->ObjectCreatedBy = MISSION_OBJECT;
-
-				obj->SetPosition(aPMPickUps[i].m_vecPosn);
-				obj->SetOrientation(0.0f, 0.0f, -HALFPI);
-				obj->GetMatrix().UpdateRW();
-				obj->UpdateRwFrame();
-
-				obj->bAffectedByGravity = false;
-				obj->bExplosionProof = true;
-				obj->bUsesCollision = false;
-				obj->bIsPickup = false;
-
-				CWorld::Add(obj);
-			}
-			aPMPickUps[i].m_pObject = obj;
-		} else
-			aPMPickUps[i].m_pObject = nil;
-	}
-	bPMActive = true;
 }
 
 void
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index b05f5db7..0a73696a 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -8,6 +8,7 @@ enum ePickupType : uint8
 	PICKUP_ON_STREET,
 	PICKUP_ONCE,
 	PICKUP_ONCE_TIMEOUT,
+	PICKUP_ONCE_TIMEOUT_SLOW,
 	PICKUP_COLLECTABLE1,
 	PICKUP_IN_SHOP_OUT_OF_STOCK,
 	PICKUP_MONEY,
@@ -18,6 +19,9 @@ enum ePickupType : uint8
 	PICKUP_FLOATINGPACKAGE,
 	PICKUP_FLOATINGPACKAGE_FLOATING,
 	PICKUP_ON_STREET_SLOW,
+	PICKUP_ASSET_REVENUE,
+	PICKUP_PROPERTY_LOCKED,
+	PICKUP_PROPERTY_FORSALE,
 	PICKUP_NUMOFTYPES
 };
 
@@ -42,7 +46,7 @@ public:
 	bool Update(CPlayerPed *player, CVehicle *vehicle, int playerId);
 private:
 	bool IsMine() { return m_eType >= PICKUP_MINE_INACTIVE && m_eType <= PICKUP_FLOATINGPACKAGE_FLOATING; }
-	inline bool CanBePickedUp(CPlayerPed *player);
+	inline bool CanBePickedUp(CPlayerPed *player, int playerId);
 	void RemoveKeepType();
 	void Remove();
 };
@@ -73,7 +77,7 @@ public:
 	static void DoMoneyEffects(CEntity *ent);
 	static void DoMineEffects(CEntity *ent);
 	static void DoPickUpEffects(CEntity *ent);
-	static int32 GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity);
+	static int32 GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity, uint32 rate = 0, bool highPriority = false, wchar* pText = nil);
 	static int32 GenerateNewOne_WeaponType(CVector pos, eWeaponType weaponType, uint8 type, uint32 quantity);
 	static void RemovePickUp(int32 pickupIndex);
 	static void RemoveAllFloatingPickups();
@@ -81,11 +85,13 @@ public:
 	static bool IsPickUpPickedUp(int32 pickupId);
 	static int32 ModelForWeapon(eWeaponType weaponType);
 	static enum eWeaponType WeaponForModel(int32 model);
-	static int32 FindColourIndexForWeaponMI(int32 model);
 	static int32 GetActualPickupIndex(int32 index);
 	static int32 GetNewUniquePickupIndex(int32 slot);
 	static void PassTime(uint32 time);
 	static bool GivePlayerGoodiesWithPickUpMI(int16 modelIndex, int playerIndex);
+	static bool TestForPickupsInBubble(CVector pos, float range);
+	static bool TryToMerge_WeaponType(CVector pos, eWeaponType weapon, uint8 type, uint32 quantity, bool unused);
+	static void CreateSomeMoney(CVector, int);
 	static void Load(uint8 *buf, uint32 size);
 	static void Save(uint8 *buf, uint32 *size);
 
@@ -99,7 +105,7 @@ public:
 };
 
 extern uint16 AmmoForWeapon[20];
-extern uint16 AmmoForWeapon_OnStreet[20];
+extern uint16 AmmoForWeapon_OnStreet[WEAPONTYPE_TOTALWEAPONS];
 extern uint16 CostOfWeapon[20];
 
 enum ePacmanPickupType
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index d086543f..5e6c7cdb 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -11,513 +11,97 @@
 #include "World.h"
 
 uint16 CRecordDataForGame::RecordingState;
-uint8* CRecordDataForGame::pDataBuffer;
-uint8* CRecordDataForGame::pDataBufferPointer;
-int CRecordDataForGame::FId;
-tGameBuffer CRecordDataForGame::pDataBufferForFrame;
-
-#define MEMORY_FOR_GAME_RECORD (150000)
 
 void CRecordDataForGame::Init(void)
 {
 	RecordingState = STATE_NONE;
-	delete[] pDataBuffer;
-	pDataBufferPointer = nil;
-	pDataBuffer = nil;
-#ifndef GTA_PS2 // this stuff is not present on PS2
-	FId = CFileMgr::OpenFile("playback.dat", "r");
-	if (FId <= 0) {
-		if ((FId = CFileMgr::OpenFile("record.dat", "r")) <= 0)
-			RecordingState = STATE_NONE;
-		else {
-			CFileMgr::CloseFile(FId);
-			FId = CFileMgr::OpenFileForWriting("record.dat");
-			RecordingState = STATE_RECORD;
-		}
-	}
-	else {
-		RecordingState = STATE_PLAYBACK;
-	}
-	if (RecordingState == STATE_PLAYBACK) {
-		pDataBufferPointer = new uint8[MEMORY_FOR_GAME_RECORD];
-		pDataBuffer = pDataBufferPointer;
-		pDataBuffer[CFileMgr::Read(FId, (char*)pDataBufferPointer, MEMORY_FOR_GAME_RECORD) + 8] = (uint8)-1;
-		CFileMgr::CloseFile(FId);
-	}
-#else
-	RecordingState = STATE_NONE; // second time to make sure
-#endif
 }
 
 void CRecordDataForGame::SaveOrRetrieveDataForThisFrame(void)
 {
-	switch (RecordingState) {
-	case STATE_RECORD:
-	{
-		pDataBufferForFrame.m_fTimeStep = CTimer::GetTimeStep();
-		pDataBufferForFrame.m_nTimeInMilliseconds = CTimer::GetTimeInMilliseconds();
-		pDataBufferForFrame.m_nSizeOfPads[0] = 0;
-		pDataBufferForFrame.m_nSizeOfPads[1] = 0;
-		pDataBufferForFrame.m_nChecksum = CalcGameChecksum();
-		uint8* pController1 = PackCurrentPadValues(pDataBufferForFrame.m_ControllerBuffer, &CPad::GetPad(0)->OldState, &CPad::GetPad(0)->NewState);
-		pDataBufferForFrame.m_nSizeOfPads[0] = (pController1 - pDataBufferForFrame.m_ControllerBuffer) / 2;
-		uint8* pController2 = PackCurrentPadValues(pController1, &CPad::GetPad(1)->OldState, &CPad::GetPad(1)->NewState);
-		pDataBufferForFrame.m_nSizeOfPads[1] = (pController2 - pController1) / 2;
-		uint8* pEndPtr = pController2;
-		if ((pDataBufferForFrame.m_nSizeOfPads[0] + pDataBufferForFrame.m_nSizeOfPads[1]) & 1)
-			pEndPtr += 2;
-		CFileMgr::Write(FId, (char*)&pDataBufferForFrame, pEndPtr - (uint8*)&pDataBufferForFrame);
-		break;
-	}
-	case STATE_PLAYBACK:
-		if (pDataBufferPointer[8] == (uint8)-1)
-			CPad::GetPad(0)->NewState.Clear();
-		else {
-			tGameBuffer* pData = (tGameBuffer*)pDataBufferPointer;
-			CTimer::SetTimeInMilliseconds(pData->m_nTimeInMilliseconds);
-			CTimer::SetTimeStep(pData->m_fTimeStep);
-			uint8 size1 = pData->m_nSizeOfPads[0];
-			uint8 size2 = pData->m_nSizeOfPads[1];
-			pDataBufferPointer = (uint8*)&pData->m_ControllerBuffer;
-			pDataBufferPointer = UnPackCurrentPadValues(pDataBufferPointer, size1, &CPad::GetPad(0)->NewState);
-			pDataBufferPointer = UnPackCurrentPadValues(pDataBufferPointer, size2, &CPad::GetPad(1)->NewState);
-			if ((size1 + size2) & 1)
-				pDataBufferPointer += 2;
-			if (pData->m_nChecksum != CalcGameChecksum())
-				printf("Playback out of sync\n");
-		}
-	}
 }
 
-#define PROCESS_BUTTON_STATE_STORE(buf, os, ns, field, id) \
-	do { \
-		if (os->field != ns->field){ \
-			*buf++ = id; \
-			*buf++ = ns->field; \
-		} \
-	} while (0);
-
 uint8* CRecordDataForGame::PackCurrentPadValues(uint8* buf, CControllerState* os, CControllerState* ns)
 {
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, LeftStickX, 0);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, LeftStickY, 1);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, RightStickX, 2);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, RightStickY, 3);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, LeftShoulder1, 4);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, LeftShoulder2, 5);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, RightShoulder1, 6);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, RightShoulder2, 7);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, DPadUp, 8);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, DPadDown, 9);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, DPadLeft, 10);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, DPadRight, 11);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Start, 12);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Select, 13);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Square, 14);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Triangle, 15);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Cross, 16);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, Circle, 17);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, LeftShock, 18);
-	PROCESS_BUTTON_STATE_STORE(buf, os, ns, RightShock, 19);
-	return buf;
+	return nil;
 }
-#undef PROCESS_BUTTON_STATE_STORE
-
-#define PROCESS_BUTTON_STATE_RESTORE(buf, state, field, id) case id: state->field = *buf++; break;
 
 uint8* CRecordDataForGame::UnPackCurrentPadValues(uint8* buf, uint8 total, CControllerState* state)
 {
-	for (uint8 i = 0; i < total; i++) {
-		switch (*buf++) {
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, LeftStickX, 0);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, LeftStickY, 1);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, RightStickX, 2);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, RightStickY, 3);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, LeftShoulder1, 4);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, LeftShoulder2, 5);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, RightShoulder1, 6);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, RightShoulder2, 7);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, DPadUp, 8);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, DPadDown, 9);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, DPadLeft, 10);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, DPadRight, 11);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Start, 12);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Select, 13);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Square, 14);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Triangle, 15);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Cross, 16);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, Circle, 17);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, LeftShock, 18);
-			PROCESS_BUTTON_STATE_RESTORE(buf, state, RightShock, 19);
-		}
-	}
-	return buf;
+	return nil;
 }
 
-#undef PROCESS_BUTTON_STATE_RESTORE
-
 uint16 CRecordDataForGame::CalcGameChecksum(void)
 {
-	uint32 checksum = 0;
-	int i = CPools::GetPedPool()->GetSize();
-	while (i--) {
-		CPed* pPed = CPools::GetPedPool()->GetSlot(i);
-		if (!pPed)
-			continue;
-		checksum ^= pPed->GetModelIndex() ^ *(uint32*)&pPed->GetPosition().z ^ *(uint32*)&pPed->GetPosition().y ^ *(uint32*)&pPed->GetPosition().x;
-	}
-	i = CPools::GetVehiclePool()->GetSize();
-	while (i--) {
-		CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
-		if (!pVehicle)
-			continue;
-		checksum ^= pVehicle->GetModelIndex() ^ *(uint32*)&pVehicle->GetPosition().z ^ *(uint32*)&pVehicle->GetPosition().y ^ *(uint32*)&pVehicle->GetPosition().x;
-	}
-	return checksum ^ checksum >> 16;
+	return 0;
 }
 
 uint8 CRecordDataForChase::Status;
-int CRecordDataForChase::PositionChanges;
-uint8 CRecordDataForChase::CurrentCar;
-CAutomobile* CRecordDataForChase::pChaseCars[NUM_CHASE_CARS];
-uint32 CRecordDataForChase::AnimStartTime;
-float CRecordDataForChase::AnimTime;
-CCarStateEachFrame* CRecordDataForChase::pBaseMemForCar[NUM_CHASE_CARS];
-float CRecordDataForChase::TimeMultiplier;
-int CRecordDataForChase::FId2;
-
-#define CHASE_SCENE_LENGTH_IN_SECONDS (80)
-#define CHASE_SCENE_FRAMES_PER_SECOND (15) // skipping every second frame
-#define CHASE_SCENE_FRAMES_IN_RECORDING (CHASE_SCENE_LENGTH_IN_SECONDS * CHASE_SCENE_FRAMES_PER_SECOND)
-#define CHASE_SCENE_LENGTH_IN_FRAMES (CHASE_SCENE_FRAMES_IN_RECORDING * 2)
 
 void CRecordDataForChase::Init(void)
 {
 	Status = STATE_NONE;
-	PositionChanges = 0;
-	CurrentCar = 0;
-	for (int i = 0; i < NUM_CHASE_CARS; i++)
-		pChaseCars[i] = nil;
-	AnimStartTime = 0;
 }
 
 void CRecordDataForChase::SaveOrRetrieveDataForThisFrame(void)
 {
-	switch (Status) {
-	case STATE_NONE:
-		return;
-	case STATE_RECORD:
-	{
-		if ((CTimer::GetFrameCounter() & 1) == 0)
-			StoreInfoForCar(pChaseCars[CurrentCar], &pBaseMemForCar[CurrentCar][CTimer::GetFrameCounter() / 2]);
-		if (CTimer::GetFrameCounter() < CHASE_SCENE_LENGTH_IN_FRAMES * 2)
-			return;
-		CFileMgr::SetDir("data\\paths");
-		sprintf(gString, "chase%d.dat", CurrentCar);
-		int fid = CFileMgr::OpenFileForWriting(gString);
-		uint32 fs = CHASE_SCENE_LENGTH_IN_FRAMES * sizeof(CCarStateEachFrame);
-		printf("FileSize:%d\n", fs);
-		CFileMgr::Write(fid, (char*)pBaseMemForCar[CurrentCar], fs);
-		CFileMgr::CloseFile(fid);
-		CFileMgr::SetDir("");
-		sprintf(gString, "car%d.max", CurrentCar);
-		int fid2 = CFileMgr::OpenFileForWriting(gString);
-		for (int i = 0; i < CHASE_SCENE_FRAMES_IN_RECORDING; i++) {
-			// WTF? Was it ever used?
-#ifdef FIX_BUGS
-			CCarStateEachFrame* pState = pBaseMemForCar[CurrentCar];
-#else
-			CCarStateEachFrame* pState = (CCarStateEachFrame*)pChaseCars[CurrentCar];
-#endif
-			CVector right = CVector(pState->rightX, pState->rightY, pState->rightZ) / INT8_MAX;
-			CVector forward = CVector(pState->forwardX, pState->forwardY, pState->forwardZ) / INT8_MAX;
-			CVector up = CrossProduct(right, forward);
-			sprintf(gString, "%f %f %f\n", pState->pos.x, pState->pos.y, pState->pos.z);
-			CFileMgr::Write(fid2, gString, strlen(gString) - 1);
-			sprintf(gString, "%f %f %f\n", right.x, right.y, right.z);
-			CFileMgr::Write(fid2, gString, strlen(gString) - 1);
-			sprintf(gString, "%f %f %f\n", forward.x, forward.y, forward.z);
-			CFileMgr::Write(fid2, gString, strlen(gString) - 1);
-			sprintf(gString, "%f %f %f\n", up.x, up.y, up.z);
-			CFileMgr::Write(fid2, gString, strlen(gString) - 1);
-		}
-		CFileMgr::CloseFile(fid2);
-	}
-	case STATE_PLAYBACK:
-	case STATE_PLAYBACK_BEFORE_RECORDING:
-	case STATE_PLAYBACK_INIT:
-		break;
-	}
 }
 
-struct tCoors {
-	CVector pos;
-	float angle;
-};
-
-// I guess developer was filling this with actual data before running the game
-tCoors NewCoorsForRecordedCars[7];
-
 void CRecordDataForChase::SaveOrRetrieveCarPositions(void)
 {
-	switch (Status) {
-	case STATE_NONE:
-		return;
-	case STATE_RECORD:
-	case STATE_PLAYBACK_BEFORE_RECORDING:
-		for (int i = 0; i < NUM_CHASE_CARS; i++) {
-			if (i != CurrentCar && CTimer::GetFrameCounter()) {
-				RestoreInfoForCar(pChaseCars[i], &pBaseMemForCar[i][CTimer::GetFrameCounter() / 2], false);
-				pChaseCars[i]->GetMatrix().UpdateRW();
-				pChaseCars[i]->UpdateRwFrame();
-			}
-		}
-		if (Status == STATE_PLAYBACK_BEFORE_RECORDING && CTimer::GetFrameCounter()) {
-			RestoreInfoForCar(pChaseCars[CurrentCar], &pBaseMemForCar[CurrentCar][CTimer::GetFrameCounter() / 2], false);
-			pChaseCars[CurrentCar]->GetMatrix().UpdateRW();
-			pChaseCars[CurrentCar]->UpdateRwFrame();
-		}
-		if (CPad::GetPad(0)->GetLeftShockJustDown() && CPad::GetPad(0)->GetRightShockJustDown()) {
-			if (!CPad::GetPad(0)->GetRightShockJustDown()) {
-				pChaseCars[CurrentCar]->SetPosition(NewCoorsForRecordedCars[PositionChanges].pos);
-				pChaseCars[CurrentCar]->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-				pChaseCars[CurrentCar]->GetMatrix().SetRotateZOnly(DEGTORAD(NewCoorsForRecordedCars[PositionChanges].angle));
-				++PositionChanges;
-			}
-			if (Status == STATE_PLAYBACK_BEFORE_RECORDING) {
-				Status = STATE_RECORD;
-				pChaseCars[CurrentCar]->SetStatus(STATUS_PLAYER);
-			}
-		}
-		break;
-	case STATE_PLAYBACK_INIT:
-		Status = STATE_PLAYBACK;
-		break;
-	case STATE_PLAYBACK:
-	{
-		TimeMultiplier += CTimer::GetTimeStepNonClippedInSeconds();
-		float EndOfFrameTime = CHASE_SCENE_FRAMES_PER_SECOND * Min(CHASE_SCENE_LENGTH_IN_SECONDS, TimeMultiplier);
-		for (int i = 0; i < NUM_CHASE_CARS; i++) {
-			if (!pBaseMemForCar[i])
-				continue;
-			if (!pChaseCars[i])
-				continue;
-			if (EndOfFrameTime < CHASE_SCENE_FRAMES_IN_RECORDING - 1) {
-				int FlooredEOFTime = EndOfFrameTime;
-				RestoreInfoForCar(pChaseCars[i], &pBaseMemForCar[i][FlooredEOFTime], false);
-				CMatrix tmp;
-				float dp = EndOfFrameTime - FlooredEOFTime;
-				RestoreInfoForMatrix(tmp, &pBaseMemForCar[i][FlooredEOFTime + 1]);
-				pChaseCars[i]->GetRight() += (tmp.GetRight() - pChaseCars[i]->GetRight()) * dp;
-				pChaseCars[i]->GetForward() += (tmp.GetForward() - pChaseCars[i]->GetForward()) * dp;
-				pChaseCars[i]->GetUp() += (tmp.GetUp() - pChaseCars[i]->GetUp()) * dp;
-				pChaseCars[i]->GetMatrix().GetPosition() += (tmp.GetPosition() - pChaseCars[i]->GetPosition()) * dp;
-			}
-			else{
-				RestoreInfoForCar(pChaseCars[i], &pBaseMemForCar[i][CHASE_SCENE_FRAMES_IN_RECORDING - 1], true);
-				if (i == 0)
-					pChaseCars[i]->GetMatrix().GetPosition().z += 0.2f;
-			}
-			pChaseCars[i]->GetMatrix().UpdateRW();
-			pChaseCars[i]->UpdateRwFrame();
-			pChaseCars[i]->RemoveAndAdd();
-		}
-		break;
-	}
-	}
 }
 
 void CRecordDataForChase::StoreInfoForCar(CAutomobile* pCar, CCarStateEachFrame* pState)
 {
-	pState->rightX = INT8_MAX * pCar->GetRight().x;
-	pState->rightY = INT8_MAX * pCar->GetRight().y;
-	pState->rightZ = INT8_MAX * pCar->GetRight().z;
-	pState->forwardX = INT8_MAX * pCar->GetForward().x;
-	pState->forwardY = INT8_MAX * pCar->GetForward().y;
-	pState->forwardZ = INT8_MAX * pCar->GetForward().z;
-	pState->pos = pCar->GetPosition();
-	pState->velX = 0.5f * INT16_MAX * pCar->GetMoveSpeed().x;
-	pState->velY = 0.5f * INT16_MAX * pCar->GetMoveSpeed().y;
-	pState->velZ = 0.5f * INT16_MAX * pCar->GetMoveSpeed().z;
-	pState->wheel = 20 * pCar->m_fSteerAngle;
-	pState->gas = 100 * pCar->m_fGasPedal;
-	pState->brake = 100 * pCar->m_fBrakePedal;
-	pState->handbrake = pCar->bIsHandbrakeOn;
 }
 
 void CRecordDataForChase::RestoreInfoForMatrix(CMatrix& matrix, CCarStateEachFrame* pState)
 {
-	matrix.GetRight() = CVector(pState->rightX, pState->rightY, pState->rightZ) / INT8_MAX;
-	matrix.GetForward() = CVector(pState->forwardX, pState->forwardY, pState->forwardZ) / INT8_MAX;
-	matrix.GetUp() = CrossProduct(matrix.GetRight(), matrix.GetForward());
-	matrix.GetPosition() = pState->pos;
 }
 
 void CRecordDataForChase::RestoreInfoForCar(CAutomobile* pCar, CCarStateEachFrame* pState, bool stop)
 {
-	CVector oldPos = pCar->GetPosition();
-	RestoreInfoForMatrix(pCar->GetMatrix(), pState);
-	pCar->SetMoveSpeed(CVector(pState->velX, pState->velY, pState->velZ) / INT16_MAX / 0.5f);
-	pCar->SetTurnSpeed(0.0f, 0.0f, 0.0f);
-	pCar->m_fSteerAngle = pState->wheel / 20.0f;
-	pCar->m_fGasPedal = pState->gas / 100.0f;
-	pCar->m_fBrakePedal = pState->brake / 100.0f;
-	pCar->bIsHandbrakeOn = pState->handbrake;
-	if ((oldPos - pCar->GetPosition()).Magnitude() > 15.0f) {
-		if (pCar == pChaseCars[14]) {
-			pCar->m_currentColour1 = 58;
-			pCar->m_currentColour2 = 1;
-		}
-		else
-			pCar->GetModelInfo()->ChooseVehicleColour(pCar->m_currentColour1, pCar->m_currentColour2);
-	}
-	pCar->m_fHealth = Min(pCar->m_fHealth, 500.0f);
-	if (stop) {
-		pCar->m_fGasPedal = 0.0f;
-		pCar->m_fBrakePedal = 0.0f;
-		pCar->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-		pCar->bIsHandbrakeOn = false;
-	}
 }
 
 void CRecordDataForChase::ProcessControlCars(void)
 {
-	if (Status != STATE_PLAYBACK)
-		return;
-	for (int i = 0; i < NUM_CHASE_CARS; i++) {
-		if (pChaseCars[i])
-			pChaseCars[i]->ProcessControl();
-	}
 }
 
-#if (defined(GTA_PS2) || defined(FIX_BUGS))
 bool CRecordDataForChase::ShouldThisPadBeLeftAlone(uint8 pad)
 {
-	// may be wrong
-	if (Status == STATE_NONE || Status == STATE_PLAYBACK)
-		return false;
-	return pad != 0;
+	return false;
 }
-#endif
 
 void CRecordDataForChase::GiveUsACar(int32 mi, CVector pos, float angle, CAutomobile** ppCar, uint8 colour1, uint8 colour2)
 {
-	CStreaming::RequestModel(mi, STREAMFLAGS_DEPENDENCY);
-	CStreaming::LoadAllRequestedModels(false);
-	if (!CStreaming::HasModelLoaded(mi))
-		return;
-	CAutomobile* pCar = new CAutomobile(mi, MISSION_VEHICLE);
-	pCar->SetPosition(pos);
-	pCar->SetStatus(STATUS_PLAYER_PLAYBACKFROMBUFFER);
-	pCar->GetMatrix().SetRotateZOnly(DEGTORAD(angle));
-	pCar->pDriver = nil;
-	pCar->m_currentColour1 = colour1;
-	pCar->m_currentColour2 = colour2;
-	CWorld::Add(pCar);
-	*ppCar = pCar;
 }
 
 void RemoveUnusedCollision(void)
 {
-	static const char* dontDeleteArray[] = {
-		"rd_SrRoad2A50", "rd_SrRoad2A20", "rd_CrossRda1w22", "rd_CrossRda1rw22",
-		"road_broadway02", "road_broadway01", "com_21way5", "com_21way50",
-		"cm1waycrosscom", "com_21way20", "com_21way10", "road_broadway04",
-		"com_rvroads52", "com_roadsrv", "com_roadkb23", "com_roadkb22"
-	};
-	for (int i = 0; i < ARRAY_SIZE(dontDeleteArray); i++)
-		CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_NONE;
-	CModelInfo::RemoveColModelsFromOtherLevels(LEVEL_NONE);
-	for (int i = 0; i < ARRAY_SIZE(dontDeleteArray); i++)
-		CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_COMMERCIAL;
 }
 
 void CRecordDataForChase::StartChaseScene(float startTime)
 {
-	char filename[28];
-	SetUpCarsForChaseScene();
-	Status = STATE_PLAYBACK;
-	AnimTime = startTime;
-	AnimStartTime = CTimer::GetTimeInMilliseconds();
-	RemoveUnusedCollision();
-	CStreaming::RemoveIslandsNotUsed(LEVEL_SUBURBAN);
-	CGame::TidyUpMemory(true, true);
-	CStreaming::ImGonnaUseStreamingMemory();
-	CFileMgr::SetDir("data\\paths");
-	for (int i = 0; i < NUM_CHASE_CARS; i++) {
-		if (!pChaseCars[i]) {
-			pBaseMemForCar[i] = nil;
-			continue;
-		}
-		sprintf(filename, "chase%d.dat", i);
-		FId2 = CFileMgr::OpenFile(filename, "rb");
-		if (FId2 <= 0) {
-			pBaseMemForCar[i] = nil;
-			continue;
-		}
-		pBaseMemForCar[i] = new CCarStateEachFrame[CHASE_SCENE_FRAMES_IN_RECORDING];
-		for (int j = 0; j < CHASE_SCENE_FRAMES_IN_RECORDING; j++) {
-			CFileMgr::Read(FId2, (char*)&pBaseMemForCar[i][j], sizeof(CCarStateEachFrame));
-			CFileMgr::Seek(FId2, sizeof(CCarStateEachFrame), 1);
-		}
-		CFileMgr::CloseFile(FId2);
-	}
-	CFileMgr::SetDir("");
-	CStreaming::IHaveUsedStreamingMemory();
-	TimeMultiplier = 0.0f;
 }
 
 void CRecordDataForChase::CleanUpChaseScene(void)
 {
-	if (Status != STATE_PLAYBACK_INIT && Status != STATE_PLAYBACK)
-		return;
-	Status = STATE_NONE;
-	CleanUpCarsForChaseScene();
-	for (int i = 0; i < NUM_CHASE_CARS; i++) {
-		if (pBaseMemForCar[i]) {
-			delete[] pBaseMemForCar[i];
-			pBaseMemForCar[i] = nil;
-		}
-	}
 }
 
 void CRecordDataForChase::SetUpCarsForChaseScene(void)
 {
-	GiveUsACar(MI_POLICE, CVector(273.54221f, -1167.1907f, 24.880601f), 63.0f, &pChaseCars[0], 2, 1);
-	GiveUsACar(MI_ENFORCER, CVector(231.1783f, -1388.8322f, 25.978201f), 90.0f, &pChaseCars[1], 2, 1);
-	GiveUsACar(MI_TAXI, CVector(184.3156f, -1473.251f, 25.978201f), 0.0f, &pChaseCars[4], 6, 6);
-	GiveUsACar(MI_CHEETAH, CVector(173.8868f, -1377.6514f, 25.978201f), 0.0f, &pChaseCars[6], 4, 5);
-	GiveUsACar(MI_STINGER, CVector(102.5946f, -943.93628f, 25.9781f), 270.0f, &pChaseCars[7], 53, 53);
-	GiveUsACar(MI_CHEETAH, CVector(-177.7157f, -862.18652f, 25.978201f), 155.0f, &pChaseCars[10], 41, 1);
-	GiveUsACar(MI_STINGER, CVector(-170.56979f, -889.02362f, 25.978201f), 154.0f, &pChaseCars[11], 10, 10);
-	GiveUsACar(MI_KURUMA, CVector(402.60809f, -917.49628f, 37.381001f), 90.0f, &pChaseCars[14], 34, 1);
-	GiveUsACar(MI_TAXI, CVector(-33.496201f, -938.4563f, 25.9781f), 266.0f, &pChaseCars[16], 6, 6);
-	GiveUsACar(MI_KURUMA, CVector(49.363098f, -987.60498f, 25.9781f), 0.0f, &pChaseCars[18], 51, 1);
-	GiveUsACar(MI_TAXI, CVector(179.0049f, -1154.6686f, 25.9781f), 0.0f, &pChaseCars[19], 6, 76);
-	GiveUsACar(MI_RUMPO, CVector(-28.9762f, -1031.3367f, 25.990601f), 242.0f, &pChaseCars[2], 1, 75);
-	GiveUsACar(MI_PATRIOT, CVector(114.1564f, -796.69379f, 24.978201f), 180.0f, &pChaseCars[3], 0, 0);
 }
 
 void CRecordDataForChase::CleanUpCarsForChaseScene(void)
 {
-	for (int i = 0; i < NUM_CHASE_CARS; i++)
-		RemoveCarFromChase(i);
 }
 
 void CRecordDataForChase::RemoveCarFromChase(int32 i)
 {
-	if (!pChaseCars[i])
-		return;
-	CWorld::Remove(pChaseCars[i]);
-	delete pChaseCars[i];
-	pChaseCars[i] = nil;
 }
 
 CVehicle* CRecordDataForChase::TurnChaseCarIntoScriptCar(int32 i)
 {
-	CVehicle* pVehicle = pChaseCars[i];
-	pChaseCars[i] = nil;
-	pVehicle->SetStatus(STATUS_PHYSICS);
-	return pVehicle;
+	return nil;
 }
 
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index b2ecf38f..6f9ad156 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -17,6 +17,7 @@
 #include "ModelInfo.h"
 #include "Object.h"
 #include "Pad.h"
+#include "PedAttractor.h"
 #include "Phones.h"
 #include "Pickups.h"
 #include "Plane.h"
@@ -47,7 +48,7 @@ CAutomobile *CReplay::pBuf1;
 uint8 *CReplay::pBuf2;
 CPlayerPed *CReplay::pBuf3;
 uint8 *CReplay::pBuf4;
-CCutsceneHead *CReplay::pBuf5;
+CCutsceneObject *CReplay::pBuf5;
 uint8 *CReplay::pBuf6;
 CPtrNode *CReplay::pBuf7;
 uint8 *CReplay::pBuf8;
@@ -510,8 +511,12 @@ void CReplay::ProcessPedUpdate(CPed *ped, float interpolation, CAddressInReplayB
 	}
 	RetrievePedAnimation(ped, &pp->anim_state);
 	ped->RemoveWeaponModel(-1);
-	if (pp->weapon_model != (uint8)-1)
-		ped->AddWeaponModel(pp->weapon_model);
+	if (pp->weapon_model != (uint16)-1) {
+		if (CStreaming::HasModelLoaded(pp->weapon_model))
+			ped->AddWeaponModel(pp->weapon_model);
+		else
+			CStreaming::RequestModel(pp->weapon_model, 0);
+	}
 	CWorld::Remove(ped);
 	CWorld::Add(ped);
 	buffer->m_nOffset += sizeof(tPedUpdatePacket);
@@ -835,13 +840,14 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo
 					CStreaming::RequestModel(mi, 0);
 				}
 				else {
+// TODO(MIAMI): don't hardcode model indices
 					if (mi == MI_DEADDODO || mi == MI_AIRTRAIN) {
 						new_v = new(vp->index << 8) CPlane(mi, 2);
 					}
 					else if (mi == MI_TRAIN) {
 						new_v = new(vp->index << 8) CTrain(mi, 2);
 					}
-					else if (mi == MI_CHOPPER || mi == MI_ESCAPE) {
+					else if (mi == MI_CHOPPER) {
 						new_v = new(vp->index << 8) CHeli(mi, 2);
 					}
 					else if (CModelInfo::IsBoatModel(mi)){
@@ -1115,6 +1121,14 @@ void CReplay::StoreStuffInMem(void)
 	for (int i = 0; i < NUMPLAYERS; i++)
 		nHandleOfPlayerPed[i] = CPools::GetPedPool()->GetIndex(CWorld::Players[i].m_pPed);
 #endif
+	int i = CPools::GetPedPool()->GetSize();
+	while (--i >= 0) {
+		CPed* ped = CPools::GetPedPool()->GetSlot(i);
+		if (!ped)
+			continue;
+		if (ped->m_attractor)
+			GetPedAttractorManager()->DeRegisterPed(ped, ped->m_attractor);
+	}
 	CPools::GetVehiclePool()->Store(pBuf0, pBuf1);
 	CPools::GetPedPool()->Store(pBuf2, pBuf3);
 	CPools::GetObjectPool()->Store(pBuf4, pBuf5);
@@ -1210,6 +1224,16 @@ void CReplay::RestoreStuffFromMem(void)
 		ped->m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, ped);
 		DMAudio.SetEntityStatus(ped->m_audioEntityId, true);
 		CPopulation::UpdatePedCount((ePedType)ped->m_nPedType, false);
+		for (int j = 0; j < TOTAL_WEAPON_SLOTS; j++) {
+			int mi1 = CWeaponInfo::GetWeaponInfo(ped->m_weapons[j].m_eWeaponType)->m_nModelId;
+			if (mi1 != -1)
+				CStreaming::RequestModel(mi1, STREAMFLAGS_DEPENDENCY);
+			int mi2 = CWeaponInfo::GetWeaponInfo(ped->m_weapons[j].m_eWeaponType)->m_nModel2Id;
+			if (mi2 != -1)
+				CStreaming::RequestModel(mi2, STREAMFLAGS_DEPENDENCY);
+			CStreaming::LoadAllRequestedModels(false);
+			ped->m_weapons[j].Initialise(ped->m_weapons[j].m_eWeaponType, ped->m_weapons[j].m_nAmmoTotal);
+		}
 		if (ped->m_wepModelID >= 0)
 			ped->AddWeaponModel(ped->m_wepModelID);
 	}
diff --git a/src/control/Replay.h b/src/control/Replay.h
index 66bee3bf..fd484017 100644
--- a/src/control/Replay.h
+++ b/src/control/Replay.h
@@ -2,6 +2,7 @@
 
 #include "Pools.h"
 #include "World.h"
+#include "ParticleType.h"
 
 #ifdef FIX_BUGS
 #ifndef DONT_FIX_REPLAY_BUGS
@@ -176,7 +177,7 @@ class CReplay
 		CStoredAnimationState anim_state;
 		CCompressedMatrixNotAligned matrix;
 		int8 assoc_group_id;
-		uint8 weapon_model;
+		uint16 weapon_model;
 	};
 	VALIDATE_SIZE(tPedUpdatePacket, 40);
 
@@ -214,7 +215,7 @@ private:
 	static uint8* pBuf2;
 	static CPlayerPed* pBuf3;
 	static uint8* pBuf4;
-	static CCutsceneHead* pBuf5;
+	static CCutsceneObject* pBuf5;
 	static uint8* pBuf6;
 	static CPtrNode* pBuf7;
 	static uint8* pBuf8;
@@ -287,6 +288,8 @@ public:
 	static bool IsPlayingBack() { return Mode == MODE_PLAYBACK; }
 	static bool IsPlayingBackFromFile() { return bPlayingBackFromFile; }
 
+	static void RecordParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, float fSize, RwRGBA const&color)
+	{ } //TODO
 private:
 	static void RecordThisFrame(void);
 	static void StorePedUpdate(CPed *ped, int id);
diff --git a/src/control/Restart.cpp b/src/control/Restart.cpp
index 5a322cdb..64cabf5d 100644
--- a/src/control/Restart.cpp
+++ b/src/control/Restart.cpp
@@ -80,13 +80,13 @@ CRestart::FindClosestHospitalRestartPoint(const CVector &pos, CVector *outPos, f
 		return;
 	}
 
-	eLevelName curlevel = CTheZones::FindZoneForPoint(pos);
+	eLevelName curlevel = CTheZones::GetLevelFromPosition(&pos);
 	float fMinDist = 16000000.0f;
 	int closestPoint = NUM_RESTART_POINTS;
 
 	// find closest point on this level
 	for (int i = 0; i < NumberOfHospitalRestarts; i++) {
-		if (CTheZones::FindZoneForPoint(HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_NONE ? OverrideHospitalLevel : curlevel)) {
+		if (CTheZones::GetLevelFromPosition(&HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_NONE ? OverrideHospitalLevel : curlevel)) {
 			float dist = (pos - HospitalRestartPoints[i]).MagnitudeSqr();
 			if (fMinDist >= dist) {
 				fMinDist = dist;
@@ -127,13 +127,13 @@ CRestart::FindClosestPoliceRestartPoint(const CVector &pos, CVector *outPos, flo
 		return;
 	}
 
-	eLevelName curlevel = CTheZones::FindZoneForPoint(pos);
+	eLevelName curlevel = CTheZones::GetLevelFromPosition(&pos);
 	float fMinDist = 16000000.0f;
 	int closestPoint = NUM_RESTART_POINTS;
 
 	// find closest point on this level
 	for (int i = 0; i < NumberOfPoliceRestarts; i++) {
-		if (CTheZones::FindZoneForPoint(PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_NONE ? OverridePoliceStationLevel : curlevel)) {
+		if (CTheZones::GetLevelFromPosition(&PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_NONE ? OverridePoliceStationLevel : curlevel)) {
 			float dist = (pos - PoliceRestartPoints[i]).MagnitudeSqr();
 			if (fMinDist >= dist) {
 				fMinDist = dist;
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index ee9ec17e..5d466be2 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -14,23 +14,28 @@
 #include "Camera.h"
 #include "CarCtrl.h"
 #include "General.h"
+#include "Object.h"
 
-#define ROADBLOCKDIST (80.0f)
+//--MIAMI: file done
+
+#define ROADBLOCKDIST (90.0f)
+#define ROADBLOCK_OBJECT_WIDTH (4.0f)
 
 int16 CRoadBlocks::NumRoadBlocks;
-int16 CRoadBlocks::RoadBlockObjects[NUMROADBLOCKS];
+int16 CRoadBlocks::RoadBlockNodes[NUMROADBLOCKS];
 bool CRoadBlocks::InOrOut[NUMROADBLOCKS];
+CScriptRoadblock CRoadBlocks::aScriptRoadBlocks[NUM_SCRIPT_ROADBLOCKS];
 
 void
 CRoadBlocks::Init(void)
 {
 	int i;
 	NumRoadBlocks = 0;
-	for (i = 0; i < ThePaths.m_numMapObjects; i++) {
-		if (ThePaths.m_objectFlags[i] & UseInRoadBlock) {
+	for(i = 0; i < ThePaths.m_numCarPathNodes; i++){
+		if(ThePaths.m_pathNodes[i].bUseInRoadBlock && ThePaths.m_pathNodes[i].numLinks == 2){
 			if (NumRoadBlocks < NUMROADBLOCKS) {
 				InOrOut[NumRoadBlocks] = true;
-				RoadBlockObjects[NumRoadBlocks] = i;
+				RoadBlockNodes[NumRoadBlocks] = i;
 				NumRoadBlocks++;
 			} else {
 #ifndef MASTER
@@ -41,10 +46,12 @@ CRoadBlocks::Init(void)
 			}
 		}
 	}
+
+	ClearScriptRoadBlocks();
 }
 
 void
-CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType, int16 roadBlockNode)
+CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType)
 {
 	static const CVector vecRoadBlockOffets[6] = { {-1.5, 1.8f, 0.0f}, {-1.5f, -1.8f, 0.0f}, {1.5f, 1.8f, 0.0f},
 	{1.5f, -1.8f, 0.0f}, {-1.5f, 0.0f, 0.0f}, {1.5, 0.0, 0.0} };
@@ -80,14 +87,11 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
 			pCopPed->SetCurrentWeapon(WEAPONTYPE_COLT45);
 		CPedPlacement::FindZCoorForPed(&posForZ);
 		pCopPed->SetPosition(posForZ);
-		CVector vecSavedPos = pCopPed->GetPosition();
-		pCopPed->m_matrix.SetRotate(0.0f, 0.0f, -HALFPI);
-		pCopPed->m_matrix.GetPosition() += vecSavedPos;
+		pCopPed->SetOrientation(0.0f, 0.0f, -HALFPI);
 		pCopPed->m_bIsDisabledCop = true;
 		pCopPed->SetIdle();
 		pCopPed->bKindaStayInSamePlace = true;
 		pCopPed->bNotAllowedToDuck = false;
-		pCopPed->m_nRoadblockNode = roadBlockNode;
 		pCopPed->bCrouchWhenShooting = roadBlockType != 2;
 		if (pEntityToAttack) {
 			pCopPed->m_pPointGunAt = pEntityToAttack;
@@ -105,92 +109,175 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
 void 
 CRoadBlocks::GenerateRoadBlocks(void) 
 { 
-	CMatrix offsetMatrix;
+	CMatrix tmp1, tmp2;
+	static int16 unk;
 	uint32 frame = CTimer::GetFrameCounter() & 0xF;
 	int16 nRoadblockNode = (int16)(NUMROADBLOCKS * frame) / 16;
 	const int16 maxRoadBlocks = (int16)(NUMROADBLOCKS * (frame + 1)) / 16;
 	for (; nRoadblockNode < Min(NumRoadBlocks, maxRoadBlocks); nRoadblockNode++) {
-		CTreadable *mapObject = ThePaths.m_mapObjects[RoadBlockObjects[nRoadblockNode]];
-		CVector2D vecDistance = FindPlayerCoors() - mapObject->GetPosition();
+		int16 node = RoadBlockNodes[nRoadblockNode];
+		CVector2D vecDistance = FindPlayerCoors() - ThePaths.m_pathNodes[node].GetPosition();
 		if (vecDistance.x > -ROADBLOCKDIST && vecDistance.x < ROADBLOCKDIST &&
 			vecDistance.y > -ROADBLOCKDIST && vecDistance.y < ROADBLOCKDIST &&
 			vecDistance.Magnitude() < ROADBLOCKDIST) {
 			if (!InOrOut[nRoadblockNode]) {
 				InOrOut[nRoadblockNode] = true;
 				if (FindPlayerVehicle() && (CGeneral::GetRandomNumber() & 0x7F) < FindPlayerPed()->m_pWanted->m_RoadblockDensity) {
-					CWanted *pPlayerWanted = FindPlayerPed()->m_pWanted;
-					float fMapObjectRadius = 2.0f * mapObject->GetColModel()->boundingBox.max.x;
-					int32 vehicleId = MI_POLICE;
-					if (pPlayerWanted->AreArmyRequired())
-						vehicleId = MI_BARRACKS;
-					else if (pPlayerWanted->AreFbiRequired())
-						vehicleId = MI_FBICAR;
-					else if (pPlayerWanted->AreSwatRequired())
-						vehicleId = MI_ENFORCER;
-					if (!CStreaming::HasModelLoaded(vehicleId))
-						vehicleId = MI_POLICE;
-					CColModel *pVehicleColModel = CModelInfo::GetModelInfo(vehicleId)->GetColModel();
-					float fModelRadius = 2.0f * pVehicleColModel->boundingSphere.radius + 0.25f;
-					int16 radius = (int16)(fMapObjectRadius / fModelRadius);
-					if (radius >= 6)
-						continue;
-					CVector2D vecDistanceToCamera = TheCamera.GetPosition() - mapObject->GetPosition();
-					float fDotProduct = DotProduct2D(vecDistanceToCamera, mapObject->GetForward());
-					float fOffset = 0.5f * fModelRadius * (float)(radius - 1);
-					for (int16 i = 0; i < radius; i++) {
-						uint8 nRoadblockType = fDotProduct < 0.0f;
-						if (CGeneral::GetRandomNumber() & 1) {
-							offsetMatrix.SetRotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f + HALFPI);
-						}
-						else {
-							nRoadblockType = !nRoadblockType;
-							offsetMatrix.SetRotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f - HALFPI);
-						}
-						if (ThePaths.m_objectFlags[RoadBlockObjects[nRoadblockNode]] & ObjectEastWest)
-							offsetMatrix.GetPosition() = CVector(0.0f, i * fModelRadius - fOffset, 0.6f);
-						else
-							offsetMatrix.GetPosition() = CVector(i * fModelRadius - fOffset, 0.0f, 0.6f);
-						CMatrix vehicleMatrix = mapObject->m_matrix * offsetMatrix;
-						float fModelRadius = CModelInfo::GetModelInfo(vehicleId)->GetColModel()->boundingSphere.radius - 0.25f;
-						int16 colliding = 0;
-						CWorld::FindObjectsKindaColliding(vehicleMatrix.GetPosition(), fModelRadius, 0, &colliding, 2, nil, false, true, true, false, false);
-						if (!colliding) {
-							CAutomobile *pVehicle = new CAutomobile(vehicleId, RANDOM_VEHICLE);
-							pVehicle->SetStatus(STATUS_ABANDONED);
-							// pVehicle->GetHeightAboveRoad(); // called but return value is ignored?
-							vehicleMatrix.GetPosition().z += fModelRadius - 0.6f;
-							pVehicle->m_matrix = vehicleMatrix;
-							pVehicle->PlaceOnRoadProperly();
-							pVehicle->bIsStatic = false;
-							pVehicle->m_matrix.UpdateRW();
-							pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-							CCarCtrl::JoinCarWithRoadSystem(pVehicle);
-							pVehicle->bIsLocked = false;
-							pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-							pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
-							pVehicle->AutoPilot.m_nCurrentLane = 0;
-							pVehicle->AutoPilot.m_nNextLane = 0;
-							pVehicle->AutoPilot.m_fMaxTrafficSpeed = 0.0f;
-							pVehicle->AutoPilot.m_nCruiseSpeed = 0.0f;
-							pVehicle->bExtendedRange = true;
-							if (pVehicle->UsesSiren(pVehicle->GetModelIndex()) && CGeneral::GetRandomNumber() & 1)
-								pVehicle->m_bSirenOrAlarm = true;
-							if (pVehicle->GetUp().z > 0.94f) {
-								CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
-								CWorld::Add(pVehicle);
-								pVehicle->bCreateRoadBlockPeds = true;
-								pVehicle->m_nRoadblockType = nRoadblockType;
-								pVehicle->m_nRoadblockNode = nRoadblockNode;
-							}
-							else {
-								delete pVehicle;
-							}
-						}
+					CCarPathLink* pLink1 = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[ThePaths.m_pathNodes[node].firstLink]];
+					CCarPathLink* pLink2 = &ThePaths.m_carPathLinks[ThePaths.m_carPathConnections[ThePaths.m_pathNodes[node].firstLink + 1]];
+					int lanes = Min(pLink1->numRightLanes + pLink1->numLeftLanes, pLink2->numLeftLanes + pLink2->numRightLanes);
+					float length = LANE_WIDTH * (lanes + 1);
+					CVector forward(pLink2->GetY() - pLink1->GetY(), -(pLink2->GetX() - pLink1->GetX()), 0.0f);
+					forward.Normalise();
+					if (ThePaths.m_pathNodes[node].HasDivider()) {
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() + (length * 0.5f + ThePaths.m_pathNodes[node].GetDividerWidth()) * forward,
+							ThePaths.m_pathNodes[node].GetPosition() + ThePaths.m_pathNodes[node].GetDividerWidth() * forward);
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() - ThePaths.m_pathNodes[node].GetDividerWidth() * forward,
+							ThePaths.m_pathNodes[node].GetPosition() - (length * 0.5f + ThePaths.m_pathNodes[node].GetDividerWidth()) * forward);
+					}
+					else {
+						CreateRoadBlockBetween2Points(
+							ThePaths.m_pathNodes[node].GetPosition() + (length * 0.5f) * forward,
+							ThePaths.m_pathNodes[node].GetPosition() - (length * 0.5f) * forward);
 					}
 				}
 			}
-		} else {
+		}
+		else {
 			InOrOut[nRoadblockNode] = false;
 		}
 	}
+	int i = CTimer::GetFrameCounter() & 0xF;
+	if (!aScriptRoadBlocks[i].m_bInUse)
+		return;
+	if ((aScriptRoadBlocks[i].GetPosition() - FindPlayerCoors()).Magnitude() < 100.0f) {
+		CreateRoadBlockBetween2Points(aScriptRoadBlocks[i].m_vInf, aScriptRoadBlocks[i].m_vSup);
+		aScriptRoadBlocks[i].m_bInUse = false;
+	}
+}
+
+void
+CRoadBlocks::ClearScriptRoadBlocks(void)
+{
+	for (int i = 0; i < NUM_SCRIPT_ROADBLOCKS; i++)
+		aScriptRoadBlocks[i].m_bInUse = false;
+}
+
+void
+CRoadBlocks::RegisterScriptRoadBlock(CVector vInf, CVector vSup)
+{
+	int32 i;
+	for (i = 0; i < NUM_SCRIPT_ROADBLOCKS; i++) {
+		if (!aScriptRoadBlocks[i].m_bInUse)
+			break;
+	}
+	if (i == NUM_SCRIPT_ROADBLOCKS)
+		return;
+	aScriptRoadBlocks[i].m_bInUse = true;
+	aScriptRoadBlocks[i].m_vInf = vInf;
+	aScriptRoadBlocks[i].m_vSup = vSup;
+}
+
+void 
+CRoadBlocks::CreateRoadBlockBetween2Points(CVector point1, CVector point2)
+{
+	CMatrix tmp;
+	CVector forward = (point2 - point1);
+	float distBetween = forward.Magnitude();
+	CVector pos = (point1 + point2) / 2;
+	CVector right(forward.y, -forward.x, 0.0f);
+	forward.Normalise();
+	right.Normalise();
+	if (DotProduct(FindPlayerCoors() - pos, right) < 0.0f) {
+		right *= -1.0f;
+	}
+	int32 vehicleId = MI_POLICE;
+	if (FindPlayerPed()->m_pWanted->AreArmyRequired())
+		vehicleId = MI_BARRACKS;
+	else if (FindPlayerPed()->m_pWanted->AreFbiRequired())
+		vehicleId = MI_FBICAR;
+	else if (FindPlayerPed()->m_pWanted->AreSwatRequired())
+		vehicleId = MI_ENFORCER;
+	if (!CStreaming::HasModelLoaded(vehicleId))
+		vehicleId = MI_POLICE;
+	CColModel* pVehicleColModel = CModelInfo::GetModelInfo(vehicleId)->GetColModel();
+	float fModelRadius = 2.0f * pVehicleColModel->boundingSphere.radius + 0.25f;
+	int16 numRoadblockVehicles = Min(6, (int16)(distBetween / fModelRadius));
+	for (int16 i = 0; i < numRoadblockVehicles; i++) {
+		float offset = fModelRadius * (i - numRoadblockVehicles / 2);
+		tmp.SetTranslate(0.0f, 0.0f, 0.0f);
+		tmp.GetRight() = CVector(forward.y, -forward.x, 0.0f);
+		tmp.GetForward() = forward;
+		tmp.GetUp() = CVector(0.0f, 0.0f, 1.0f);
+		tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f);
+		if (CGeneral::GetRandomNumber() & 1)
+			tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f + 3.1416f);
+		tmp.SetTranslateOnly(offset * forward + pos);
+		tmp.GetPosition().z += 0.6f;
+		float fModelRadius = CModelInfo::GetModelInfo(vehicleId)->GetColModel()->boundingSphere.radius - 0.25f;
+		int16 colliding = 0;
+		CWorld::FindObjectsKindaColliding(tmp.GetPosition(), fModelRadius, 0, &colliding, 2, nil, false, true, true, false, false);
+		if (!colliding) {
+			CAutomobile* pVehicle = new CAutomobile(vehicleId, RANDOM_VEHICLE);
+			pVehicle->SetStatus(STATUS_ABANDONED);
+			// pVehicle->GetHeightAboveRoad(); // called but return value is ignored?
+			tmp.GetPosition().z += fModelRadius - 0.6f;
+			pVehicle->m_matrix = tmp;
+			pVehicle->PlaceOnRoadProperly();
+			pVehicle->bIsStatic = false;
+			pVehicle->m_matrix.UpdateRW();
+			pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+			CCarCtrl::JoinCarWithRoadSystem(pVehicle);
+			pVehicle->bIsLocked = false;
+			pVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
+			pVehicle->AutoPilot.m_nTempAction = TEMPACT_NONE;
+			pVehicle->AutoPilot.m_nNextLane = pVehicle->AutoPilot.m_nCurrentLane = 0;
+			pVehicle->AutoPilot.m_nCruiseSpeed = pVehicle->AutoPilot.m_fMaxTrafficSpeed = 0;
+			pVehicle->bExtendedRange = true;
+			if (pVehicle->UsesSiren(pVehicle->GetModelIndex()) && CGeneral::GetRandomNumber() & 1)
+				pVehicle->m_bSirenOrAlarm = true;
+			if (pVehicle->GetUp().z > 0.94f) {
+				CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
+				CWorld::Add(pVehicle);
+				pVehicle->bCreateRoadBlockPeds = true;
+				pVehicle->m_nRoadblockType = DotProduct(pVehicle->GetRight(), pVehicle->GetPosition() - FindPlayerCoors()) >= 0.0f;
+				pVehicle->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 7000;
+			}
+			else {
+				delete pVehicle;
+			}
+		}
+	}
+	int numBarriers = distBetween / ROADBLOCK_OBJECT_WIDTH;
+	CStreaming::RequestModel(MI_ROADWORKBARRIER1, STREAMFLAGS_DONT_REMOVE);
+	if (!CStreaming::HasModelLoaded(MI_ROADWORKBARRIER1))
+		return;
+	for (int i = 0; i < numBarriers; i++) {
+		float offset = ROADBLOCK_OBJECT_WIDTH * (i - numBarriers / 2);
+		tmp.SetTranslate(0.0f, 0.0f, 0.0f);
+		tmp.GetRight() = CVector(forward.y, -forward.x, 0.0f);
+		tmp.GetForward() = forward;
+		tmp.GetUp() = CVector(0.0f, 0.0f, 1.0f);
+		tmp.RotateZ(((CGeneral::GetRandomNumber() & 0xFF) - 128.0f) * 0.003f);
+		tmp.SetTranslateOnly(5.0f * right + offset * forward + pos);
+		tmp.GetPosition().x += (CGeneral::GetRandomNumber() & 0xF) * 0.1f;
+		tmp.GetPosition().y += (CGeneral::GetRandomNumber() & 0xF) * 0.1f;
+		bool found;
+		tmp.GetPosition().z = CWorld::FindGroundZFor3DCoord(tmp.GetPosition().x, tmp.GetPosition().y, tmp.GetPosition().z + 2.0f, &found);
+		if (!found)
+			continue;
+		int16 colliding = 0;
+		CBaseModelInfo* pMI = CModelInfo::GetModelInfo(MI_ROADWORKBARRIER1);
+		tmp.GetPosition().z -= pMI->GetColModel()->boundingBox.min.z;
+		CWorld::FindObjectsKindaColliding(tmp.GetPosition(), pMI->GetColModel()->boundingSphere.radius, 0, &colliding, 2, nil, false, true, true, false, false);
+		if (colliding == 0) {
+			CObject* pObject = new CObject(MI_ROADWORKBARRIER1, true);
+			pObject->GetMatrix() = tmp;
+			pObject->ObjectCreatedBy = TEMP_OBJECT;
+			pObject->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 600000;
+			CWorld::Add(pObject);
+		}
+	}
 }
diff --git a/src/control/RoadBlocks.h b/src/control/RoadBlocks.h
index 0f0c1882..ef614950 100644
--- a/src/control/RoadBlocks.h
+++ b/src/control/RoadBlocks.h
@@ -3,14 +3,28 @@
 
 class CVehicle;
 
+class CScriptRoadblock
+{
+public:
+	CVector m_vInf;
+	CVector m_vSup;
+	bool m_bInUse;
+	CVector GetPosition() { return (m_vInf + m_vSup) / 2; }
+};
+
 class CRoadBlocks
 {
 public:
 	static int16 NumRoadBlocks;
-	static int16 RoadBlockObjects[NUMROADBLOCKS];
+	static int16 RoadBlockNodes[NUMROADBLOCKS];
 	static bool InOrOut[NUMROADBLOCKS];
+	static CScriptRoadblock aScriptRoadBlocks[NUM_SCRIPT_ROADBLOCKS];
 
 	static void Init(void);
-	static void GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType, int16 roadBlockNode);
+	static void GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType);
 	static void GenerateRoadBlocks(void);
+
+	static void CreateRoadBlockBetween2Points(CVector, CVector);
+	static void RegisterScriptRoadBlock(CVector, CVector);
+	static void ClearScriptRoadBlocks();
 };
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 7b7eb61d..535f6bec 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -88,7 +88,7 @@ static int32 NextValidModelId(int32 mi, int32 step)
 			continue;
 		if (pInfo->GetModelType() == MITYPE_PED
 #ifdef FIX_BUGS
-			&& !(i >= MI_SPECIAL01 && i <= MI_SPECIAL04)
+			&& !(i >= MI_SPECIAL01 && i <= MI_SPECIAL21)
 #endif
 			|| pInfo->GetModelType() == MITYPE_VEHICLE &&
 #ifdef FIX_BUGS
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 94590087..76264617 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -4,6 +4,7 @@
 #include "ScriptCommands.h"
 
 #include "AnimBlendAssociation.h"
+#include "Bike.h"
 #include "Boat.h"
 #include "BulletInfo.h"
 #include "Camera.h"
@@ -12,6 +13,7 @@
 #include "CarGen.h"
 #include "CivilianPed.h"
 #include "Clock.h"
+#include "ColStore.h"
 #include "CopPed.h"
 #include "Coronas.h"
 #include "Cranes.h"
@@ -25,6 +27,7 @@
 #include "Fire.h"
 #include "Frontend.h"
 #include "Gangs.h"
+#include "GameLogic.h"
 #include "Garages.h"
 #include "General.h"
 #ifdef MISSION_REPLAY
@@ -39,6 +42,7 @@
 #include "Pad.h"
 #include "Particle.h"
 #include "ParticleObject.h"
+#include "PedAttractor.h"
 #include "PedRoutes.h"
 #include "Phones.h"
 #include "Pickups.h"
@@ -55,15 +59,21 @@
 #include "Remote.h"
 #include "Replay.h"
 #include "Restart.h"
+#include "RoadBlocks.h"
 #include "RpAnimBlend.h"
 #include "Rubbish.h"
+#include "SimpleModelInfo.h"
+#include "SetPieces.h"
 #include "Shadows.h"
 #include "SpecialFX.h"
+#include "Sprite.h"
 #include "Stats.h"
 #include "Streaming.h"
 #include "Text.h"
+#include "Timecycle.h"
 #include "TxdStore.h"
 #include "User.h"
+#include "VisibilityPlugins.h"
 #include "WaterLevel.h"
 #include "Weather.h"
 #include "World.h"
@@ -72,13 +82,7 @@
 
 #define PICKUP_PLACEMENT_OFFSET 0.5f
 #define PED_FIND_Z_OFFSET 5.0f
-
-#define SPHERE_MARKER_R 0
-#define SPHERE_MARKER_G 128
-#define SPHERE_MARKER_B 255
-#define SPHERE_MARKER_A 128
-#define SPHERE_MARKER_PULSE_PERIOD 2048
-#define SPHERE_MARKER_PULSE_FRACTION 0.1f
+#define COP_PED_FIND_Z_OFFSET 10.0f
 
 #ifdef USE_PRECISE_MEASUREMENT_CONVERTION
 #define METERS_IN_FOOT 0.3048f
@@ -90,13 +94,10 @@
 
 uint8 CTheScripts::ScriptSpace[SIZE_SCRIPT_SPACE];
 CRunningScript CTheScripts::ScriptsArray[MAX_NUM_SCRIPTS];
-int32 CTheScripts::BaseBriefIdForContact[MAX_NUM_CONTACTS];
-int32 CTheScripts::OnAMissionForContactFlag[MAX_NUM_CONTACTS];
 intro_text_line CTheScripts::IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];
 intro_script_rectangle CTheScripts::IntroRectangles[MAX_NUM_INTRO_RECTANGLES];
 CSprite2d CTheScripts::ScriptSprites[MAX_NUM_SCRIPT_SRPITES];
 script_sphere_struct CTheScripts::ScriptSphereArray[MAX_NUM_SCRIPT_SPHERES];
-tCollectiveData CTheScripts::CollectiveArray[MAX_NUM_COLLECTIVES];
 tUsedObject CTheScripts::UsedObjectArray[MAX_NUM_USED_OBJECTS];
 int32 CTheScripts::MultiScriptArray[MAX_NUM_MISSION_SCRIPTS];
 tBuildingSwap CTheScripts::BuildingSwapArray[MAX_NUM_BUILDING_SWAPS];
@@ -117,8 +118,6 @@ uint16 CTheScripts::NumberOfMissionScripts;
 uint32 CTheScripts::LargestMissionScriptSize;
 uint32 CTheScripts::MainScriptSize;
 uint8 CTheScripts::FailCurrentMission;
-uint8 CTheScripts::CountdownToMakePlayerUnsafe;
-uint8 CTheScripts::DelayMakingPlayerUnsafeThisTime;
 uint16 CTheScripts::NumScriptDebugLines;
 uint16 CTheScripts::NumberOfIntroRectanglesThisFrame;
 uint16 CTheScripts::NumberOfIntroTextLinesThisFrame;
@@ -129,6 +128,11 @@ CStuckCarCheck CTheScripts::StuckCars;
 uint16 CTheScripts::CommandsExecuted;
 uint16 CTheScripts::ScriptsUpdated;
 int32 ScriptParams[32];
+uint8 CTheScripts::RiotIntensity;
+uint32 CTheScripts::LastMissionPassedTime;
+uint16 CTheScripts::NumberOfExclusiveMissionScripts;
+bool CTheScripts::bPlayerHasMetDebbieHarry;
+bool CTheScripts::bPlayerIsInTheStatium;
 
 #ifdef MISSION_REPLAY
 
@@ -204,10 +208,46 @@ void CMissionCleanup::AddEntityToList(int32 id, uint8 type)
 	m_nCount++;
 }
 
+static void PossiblyWakeThisEntity(CPhysical* pEntity)
+{
+	if (!pEntity->bIsStaticWaitingForCollision)
+		return;
+	if (CColStore::HasCollisionLoaded(pEntity->GetPosition())) {
+		pEntity->bIsStaticWaitingForCollision = false;
+		if (!pEntity->IsStatic())
+			pEntity->AddToMovingList();
+	}
+}
+
 void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
 {
 	for (int i = 0; i < MAX_CLEANUP; i++){
 		if (m_sEntities[i].type == type && m_sEntities[i].id == id){
+			switch (m_sEntities[i].type) {
+			case CLEANUP_CAR:
+			{
+				CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
+				if (v)
+					PossiblyWakeThisEntity(v);
+				break;
+			}
+			case CLEANUP_CHAR:
+			{
+				CPed* p = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
+				if (p)
+					PossiblyWakeThisEntity(p);
+				break;
+			}
+			case CLEANUP_OBJECT:
+			{
+				CObject* o = CPools::GetObjectPool()->GetAt(m_sEntities[i].id);
+				if (o)
+					PossiblyWakeThisEntity(o);
+				break;
+			}
+			default:
+				break;
+			}
 			m_sEntities[i].id = 0;
 			m_sEntities[i].type = CLEANUP_UNUSED;
 			m_nCount--;
@@ -215,14 +255,70 @@ void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
 	}
 }
 
+void CMissionCleanup::CheckIfCollisionHasLoadedForMissionObject()
+{
+	for (int i = 0; i < MAX_CLEANUP; i++) {
+		switch (m_sEntities[i].type) {
+		case CLEANUP_CAR:
+		{
+			CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
+			if (v)
+				PossiblyWakeThisEntity(v);
+			break;
+		}
+		case CLEANUP_CHAR:
+		{
+			CPed* p = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
+			if (p)
+				PossiblyWakeThisEntity(p);
+			break;
+		}
+		case CLEANUP_OBJECT:
+		{
+			CObject* o = CPools::GetObjectPool()->GetAt(m_sEntities[i].id);
+			if (o)
+				PossiblyWakeThisEntity(o);
+			break;
+		}
+		default:
+			break;
+		}
+	}
+}
+
+CPhysical* CMissionCleanup::DoesThisEntityWaitForCollision(int i)
+{
+	if (m_sEntities[i].type == CLEANUP_CAR) {
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
+		if (pVehicle && pVehicle->GetStatus() != STATUS_WRECKED)
+			return pVehicle;
+	}
+	else if (m_sEntities[i].type == CLEANUP_CHAR) {
+		CPed* pPed = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
+		if (pPed && !pPed->DyingOrDead())
+			return pPed;
+	}
+	return nil;
+}
+
 void CMissionCleanup::Process()
 {
 	CPopulation::m_AllRandomPedsThisType = -1;
 	CPopulation::PedDensityMultiplier = 1.0f;
 	CCarCtrl::CarDensityMultiplier = 1.0f;
+	CPed::nThreatReactionRangeMultiplier = 1;
+	CPed::nEnterCarRangeMultiplier = 1;
 	FindPlayerPed()->m_pWanted->m_fCrimeSensitivity = 1.0f;
-	TheCamera.Restore();
+	CRoadBlocks::ClearScriptRoadBlocks();
+	CRouteNode::Initialise();
+	if (!CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle)
+		TheCamera.Restore();
 	TheCamera.SetWideScreenOff();
+	// TODO(MIAMI)
+	//CSpecialFX::bLiftCam = false;
+	//CSpecialFX::bVideoCam = false;
+	//CTimeCycle::StopExtraColour(0);
+	// TODO(MIAMI): change this to loop when it supports parameters
 	DMAudio.ClearMissionAudio();
 	CWeather::ReleaseWeather();
 	for (int i = 0; i < NUM_OF_SPECIAL_CHARS; i++)
@@ -231,11 +327,18 @@ void CMissionCleanup::Process()
 		CStreaming::SetMissionDoesntRequireModel(MI_CUTOBJ01 + i);
 	CStreaming::ms_disableStreaming = false;
 	CHud::m_ItemToFlash = -1;
-	CHud::SetHelpMessage(nil, false);
+	CHud::SetHelpMessage(nil, false); // TODO(MIAMI): third parameter is false
 	CUserDisplay::OnscnTimer.m_bDisabled = false;
+	CTheScripts::RemoveScriptTextureDictionary();
 	CWorld::Players[0].m_pPed->m_pWanted->m_bIgnoredByCops = false;
 	CWorld::Players[0].m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
 	CWorld::Players[0].MakePlayerSafe(false);
+	//TODO(MIAMI): drunkenness, enable drive by
+	//DMAudio::ShutUpPlayerTalking(0);
+	CVehicle::bDisableRemoteDetonation = false;
+	CVehicle::bDisableRemoteDetonationOnContact = false;
+	CGameLogic::ClearShortCut();
+	CTheScripts::RiotIntensity = 0;
 	CTheScripts::StoreVehicleIndex = -1;
 	CTheScripts::StoreVehicleWasRandom = true;
 	CTheScripts::UpsideDownCars.Init();
@@ -425,11 +528,11 @@ bool CStuckCarCheck::HasCarBeenStuckForAWhile(int32 id)
 void CRunningScript::CollectParameters(uint32* pIp, int16 total)
 {
 	for (int16 i = 0; i < total; i++){
-		float tmp;
 		uint16 varIndex;
 		switch (CTheScripts::Read1ByteFromScript(pIp))
 		{
 		case ARGUMENT_INT32:
+		case ARGUMENT_FLOAT:
 			ScriptParams[i] = CTheScripts::Read4BytesFromScript(pIp);
 			break;
 		case ARGUMENT_GLOBALVAR:
@@ -448,10 +551,6 @@ void CRunningScript::CollectParameters(uint32* pIp, int16 total)
 		case ARGUMENT_INT16:
 			ScriptParams[i] = CTheScripts::Read2BytesFromScript(pIp);
 			break;
-		case ARGUMENT_FLOAT:
-			tmp = CTheScripts::ReadFloatFromScript(pIp);
-			ScriptParams[i] = *(int32*)&tmp;
-			break;
 		default:
 			assert(0);
 			break;
@@ -462,7 +561,6 @@ void CRunningScript::CollectParameters(uint32* pIp, int16 total)
 int32 CRunningScript::CollectNextParameterWithoutIncreasingPC(uint32 ip)
 {
 	uint32* pIp = &ip;
-	float tmp;
 	switch (CTheScripts::Read1ByteFromScript(pIp))
 	{
 	case ARGUMENT_INT32:
@@ -476,8 +574,7 @@ int32 CRunningScript::CollectNextParameterWithoutIncreasingPC(uint32 ip)
 	case ARGUMENT_INT16:
 		return CTheScripts::Read2BytesFromScript(pIp);
 	case ARGUMENT_FLOAT:
-		tmp = CTheScripts::ReadFloatFromScript(pIp);
-		return *(int32*)&tmp;
+		return CTheScripts::Read4BytesFromScript(pIp);
 	default:
 		assert(0);
 	}
@@ -539,6 +636,7 @@ void CRunningScript::Init()
 
 #ifdef USE_DEBUG_SCRIPT_LOADER
 int scriptToLoad = 0;
+const char *scriptfile = "main.scm";
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -555,11 +653,11 @@ int open_script()
 		scriptToLoad = 2;
 #endif
 	switch (scriptToLoad) {
-	case 0: return CFileMgr::OpenFile("main.scm", "rb");
-	case 1: return CFileMgr::OpenFile("main_freeroam.scm", "rb");
-	case 2: return CFileMgr::OpenFile("main_d.scm", "rb");
+	case 0: scriptfile = "main.scm"; break;
+	case 1: scriptfile = "freeroam_miami.scm"; break;
+	case 2: scriptfile = "main_d.scm"; break;
 	}
-	return CFileMgr::OpenFile("main.scm", "rb");
+	return CFileMgr::OpenFile(scriptfile, "rb");
 }
 #endif
 
@@ -587,14 +685,7 @@ void CTheScripts::Init()
 	StoreVehicleIndex = -1;
 	StoreVehicleWasRandom = true;
 	OnAMissionFlag = 0;
-	for (int i = 0; i < MAX_NUM_CONTACTS; i++){
-		BaseBriefIdForContact[i] = 0;
-		OnAMissionForContactFlag[i] = 0;
-	}
-	for (int i = 0; i < MAX_NUM_COLLECTIVES; i++){
-		CollectiveArray[i].index = -1;
-		CollectiveArray[i].unk_data = 0;
-	}
+	LastMissionPassedTime = (uint32)-1;
 	NextFreeCollectiveIndex = 0;
 	LastRandomPedId = -1;
 	for (int i = 0; i < MAX_NUM_USED_OBJECTS; i++){
@@ -608,15 +699,17 @@ void CTheScripts::Init()
 	bUsingAMultiScriptFile = true;
 	for (int i = 0; i < MAX_NUM_MISSION_SCRIPTS; i++)
 		MultiScriptArray[i] = 0;
+	NumberOfExclusiveMissionScripts = 0;
 	NumberOfMissionScripts = 0;
 	LargestMissionScriptSize = 0;
 	MainScriptSize = 0;
 	ReadMultiScriptFileOffsetsFromScript();
 	FailCurrentMission = 0;
-	CountdownToMakePlayerUnsafe = 0;
 	DbgFlag = false;
-	DelayMakingPlayerUnsafeThisTime = 1;
 	NumScriptDebugLines = 0;
+	RiotIntensity = 0;
+	bPlayerHasMetDebbieHarry = false;
+	bPlayerIsInTheStatium = false;
 	for (int i = 0; i < MAX_NUM_SCRIPT_SPHERES; i++){
 		ScriptSphereArray[i].m_bInUse = false;
 		ScriptSphereArray[i].m_Index = 1;
@@ -637,6 +730,7 @@ void CTheScripts::Init()
 		IntroRectangles[i].m_sColor = CRGBA(255, 255, 255, 255);
 	}
 	NumberOfIntroRectanglesThisFrame = 0;
+	RemoveScriptTextureDictionary();
 	for (int i = 0; i < MAX_NUM_BUILDING_SWAPS; i++){
 		BuildingSwapArray[i].m_pBuilding = nil;
 		BuildingSwapArray[i].m_nNewModel = -1;
@@ -646,6 +740,15 @@ void CTheScripts::Init()
 		InvisibilitySettingArray[i] = nil;
 }
 
+void CTheScripts::RemoveScriptTextureDictionary()
+{
+	for (int i = 0; i < ARRAY_SIZE(CTheScripts::ScriptSprites); i++)
+		CTheScripts::ScriptSprites[i].Delete();
+	int slot = CTxdStore::FindTxdSlot("script");
+	if (slot != -1)
+		CTxdStore::RemoveTxd(slot);
+}
+
 void CRunningScript::RemoveScriptFromList(CRunningScript** ppScript)
 {
 	if (prev)
@@ -685,13 +788,10 @@ void CTheScripts::Process()
 	float timeStep = CTimer::GetTimeStepInMilliseconds();
 	UpsideDownCars.UpdateTimers();
 	StuckCars.Process();
+	MissionCleanup.CheckIfCollisionHasLoadedForMissionObject();
 	DrawScriptSpheres();
 	if (FailCurrentMission)
 		--FailCurrentMission;
-	if (CountdownToMakePlayerUnsafe){
-		if (--CountdownToMakePlayerUnsafe == 0)
-			CWorld::Players[0].MakePlayerSafe(false);
-	}
 	if (UseTextCommands){
 		for (int i = 0; i < MAX_NUM_INTRO_TEXT_LINES; i++)
 			IntroTextLines[i].Reset();
@@ -810,15 +910,16 @@ int8 CRunningScript::ProcessOneCommand()
 		return ProcessCommands800To899(command);
 	if (command < 1000)
 		return ProcessCommands900To999(command);
-#ifdef GTA_PS2
-	if (command < 1200)
-		return ProcessCommands1000To1099(command);
-#else
 	if (command < 1100)
 		return ProcessCommands1000To1099(command);
 	if (command < 1200)
 		return ProcessCommands1100To1199(command);
-#endif
+	if (command < 1300)
+		return ProcessCommands1200To1299(command);
+	if (command < 1400)
+		return ProcessCommands1300To1399(command);
+	if (command < 1500)
+		return ProcessCommands1400To1499(command);
 	return -1;
 }
 
@@ -1246,13 +1347,11 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		UpdateCompareFlag(*ptr1 == *ptr2);
 		return 0;
 	}
-	/* Following commands are not implemented, and go to default case
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_VAR:
-	case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_INT_LVAR:
-	case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_LVAR:
-	*/
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_VAR:
+	//case COMMAND_IS_INT_LVAR_NOT_EQUAL_TO_INT_LVAR:
+	//case COMMAND_IS_INT_VAR_NOT_EQUAL_TO_INT_LVAR:
 	case COMMAND_IS_FLOAT_VAR_EQUAL_TO_NUMBER:
 	{
 		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
@@ -1288,19 +1387,18 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		UpdateCompareFlag(*(float*)ptr1 == *(float*)ptr2);
 		return 0;
 	}
-	/* Following commands are not implemented, and go to default case
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_NUMBER:
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_VAR:
-	case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_FLOAT_LVAR:
-	case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_LVAR:
-	*/
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_NUMBER:
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_VAR:
+	//case COMMAND_IS_FLOAT_LVAR_NOT_EQUAL_TO_FLOAT_LVAR:
+	//case COMMAND_IS_FLOAT_VAR_NOT_EQUAL_TO_FLOAT_LVAR:
+	/*
 	case COMMAND_GOTO_IF_TRUE:
 		CollectParameters(&m_nIp, 1);
 		if (m_bCondResult)
 			SetIP(ScriptParams[0] >= 0 ? ScriptParams[0] : SIZE_MAIN_SCRIPT - ScriptParams[0]);
-		/* Check COMMAND_GOTO note. */
 		return 0;
+	*/
 	case COMMAND_GOTO_IF_FALSE:
 		CollectParameters(&m_nIp, 1);
 		if (!m_bCondResult)
@@ -1312,6 +1410,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 			CTheScripts::bAlreadyRunningAMissionScript = false;
 		RemoveScriptFromList(&CTheScripts::pActiveScripts);
 		AddScriptToList(&CTheScripts::pIdleScripts);
+		m_bIsActive = false;
 #ifdef MISSION_REPLAY
 		if (m_bMissionFlag) {
 			CPlayerInfo* pPlayerInfo = &CWorld::Players[CWorld::PlayerInFocus];
@@ -1329,6 +1428,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		CollectParameters(&m_nIp, 1);
 		assert(ScriptParams[0] >= 0);
 		CRunningScript* pNew = CTheScripts::StartNewScript(ScriptParams[0]);
+		m_bIsActive = true;
 		int8 type = CTheScripts::Read1ByteFromScript(&m_nIp);
 		float tmp;
 		for (int i = 0; type != ARGUMENT_END; type = CTheScripts::Read1ByteFromScript(&m_nIp), i++) {
@@ -1376,7 +1476,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 	{
 		CollectParameters(&m_nIp, 4);
 		int32 index = ScriptParams[0];
-		assert(index < 1); /* Constant? Also no more double player glitch */
+		assert(index < NUMPLAYERS);
 		printf("&&&&&&&&&&&&&Creating player: %d\n", index);
 		if (!CStreaming::HasModelLoaded(MI_PLAYER)) {
 			CStreaming::RequestSpecialModel(MI_PLAYER, "player", STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);
@@ -1416,20 +1516,49 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
 		CPlayerPed* ped = CWorld::Players[index].m_pPed;
-		if (!ped->bInVehicle) {
-			pos.z += ped->GetDistanceFromCentreOfMassToBaseOfModel();
-			ped->Teleport(pos);
-			CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (ped->bInVehicle) {
+			pos.z += ped->m_pMyVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
+			ped->m_pMyVehicle->Teleport(pos); // removed dumb stuff that was present here
+			CTheScripts::ClearSpaceForMissionEntity(pos, ped->m_pMyVehicle);
 			return 0;
 		}
-		pos.z += ped->m_pMyVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
-		if (ped->m_pMyVehicle->IsBoat())
-			ped->m_pMyVehicle->Teleport(pos);
-		else
-			ped->m_pMyVehicle->Teleport(pos);
-		/* I'll keep this condition here but obviously it is absolutely pointless */
-		/* It's clearly present in disassembly so it had to be in original code */
-		CTheScripts::ClearSpaceForMissionEntity(pos, ped->m_pMyVehicle);
+		pos.z += ped->GetDistanceFromCentreOfMassToBaseOfModel();
+		CVector vOldPos = ped->GetPosition();
+		ped->Teleport(pos);
+		CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (ped) { // great time to check
+			for (int i = 0; i < ped->m_numNearPeds; i++) {
+				CPed* pTestedPed = ped->m_nearPeds[i];
+				if (!pTestedPed || !IsPedPointerValid(pTestedPed))
+					continue;
+				if (pTestedPed->m_pedInObjective == ped && pTestedPed->m_objective == OBJ_15) {
+					CVector vFollowerPos = pTestedPed->GetFormationPosition();
+					CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
+					bool bFound = false;
+					vFollowerPos.z = CWorld::FindGroundZFor3DCoord(vFollowerPos.x, vFollowerPos.y, vFollowerPos.z + 1.0f, &bFound) + 1.0f;
+					if (bFound) {
+						if (CWorld::GetIsLineOfSightClear(vFollowerPos, ped->GetPosition(), true, false, false, true, false, false)) {
+							pTestedPed->Teleport(vFollowerPos);
+						}
+					}
+				}
+				else if (pTestedPed->m_leader == ped) {
+					CVector vFollowerPos;
+					if (pTestedPed->m_pedFormation)
+						vFollowerPos = pTestedPed->GetFormationPosition();
+					else
+						vFollowerPos = ped->GetPosition() + pTestedPed->GetPosition() - vOldPos;
+					CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
+					bool bFound = false;
+					vFollowerPos.z = CWorld::FindGroundZFor3DCoord(vFollowerPos.x, vFollowerPos.y, vFollowerPos.z + 1.0f, &bFound) + 1.0f;
+					if (bFound) {
+						if (CWorld::GetIsLineOfSightClear(vFollowerPos, ped->GetPosition(), true, false, false, true, false, false)) {
+							pTestedPed->Teleport(vFollowerPos);
+						}
+					}
+				}
+			}
+		}
 		return 0;
 	}
 	case COMMAND_IS_PLAYER_IN_AREA_2D:
@@ -1851,6 +1980,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		ped->CharCreatedBy = MISSION_CHAR;
 		ped->bRespondsToThreats = false;
 		ped->bAllowMedicsToReviveMe = false;
+		ped->bIsPlayerFriend = false;
 		CVector pos = *(CVector*)&ScriptParams[2];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
@@ -1858,6 +1988,8 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		ped->SetPosition(pos);
 		ped->SetOrientation(0.0f, 0.0f, 0.0f);
 		CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (m_bIsMissionScript)
+			ped->bIsStaticWaitingForCollision = true;
 		CWorld::Add(ped);
 		ped->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
 		CPopulation::ms_nTotalMissionPeds++;
@@ -1871,24 +2003,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* ped = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		if (ped) {
-			if (ped->InVehicle()) {
-				if (ped->m_pMyVehicle->pDriver == ped) {
-					ped->m_pMyVehicle->RemoveDriver();
-					ped->m_pMyVehicle->SetStatus(STATUS_ABANDONED);
-					if (ped->m_pMyVehicle->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
-						ped->m_pMyVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-					if (ped->m_nPedType == PEDTYPE_COP && ped->m_pMyVehicle->IsLawEnforcementVehicle())
-						ped->m_pMyVehicle->ChangeLawEnforcerState(0);
-				}
-				else {
-					ped->m_pMyVehicle->RemovePassenger(ped);
-				}
-			}
-			CWorld::RemoveReferencesToDeletedObject(ped);
-			delete ped;
-			--CPopulation::ms_nTotalMissionPeds;
-		}
+		CTheScripts::RemoveThisPed(ped);
 		if (m_bIsMissionScript)
 			CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_CHAR);
 		return 0;
@@ -1905,19 +2020,26 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		ped->SetWanderPath(path);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_CHAR_WANDER_RANGE:
-	*/
+	//case COMMAND_CHAR_WANDER_RANGE:
 	case COMMAND_CHAR_FOLLOW_PATH:
 	{
-		CollectParameters(&m_nIp, 4);
+		CollectParameters(&m_nIp, 6);
 		CPed* ped = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(ped);
+		if (ped->GetPedState() == PED_ATTACK || ped->GetPedState() == PED_FIGHT || !ped->IsPedInControl())
+			return 0;
 		CVector pos = *(CVector*)&ScriptParams[1];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		float radius = *(float*)&ScriptParams[4];
+		eMoveState state;
+		switch (ScriptParams[5]) {
+		case 0: state = PEDMOVE_WALK; break;
+		case 1: state = PEDMOVE_SPRINT; break;
+		default: assert(0);
+		}
 		ped->ClearAll();
-		ped->SetFollowPath(pos);
+		ped->SetFollowPath(pos, radius, state, nil, nil, 999999);
 		return 0;
 	}
 	case COMMAND_CHAR_SET_IDLE:
@@ -1962,44 +2084,27 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		CVector pos = *(CVector*)&ScriptParams[1];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		/* The following block was once again written
-		 * by someone not familiar with virtual functions.
-		 * It doesn't require any ifs at all.
-		 * To keep as close to original as possible, I'll keep it.
-		 * Maybe there was more commented out/debug
-		 * stuff, but I doubt it.
-		 */
+		// removed dumb stuff again
 		if (!vehicle) {
 			pos.z += ped->GetDistanceFromCentreOfMassToBaseOfModel();
 			ped->Teleport(pos);
 			CTheScripts::ClearSpaceForMissionEntity(pos, ped);
-		}
-		else if (vehicle->IsBoat()) {
-			pos.z += vehicle->GetDistanceFromCentreOfMassToBaseOfModel();
-			vehicle->Teleport(pos);
-			CTheScripts::ClearSpaceForMissionEntity(pos, vehicle);
+			for (int i = 0; i < ped->m_numNearPeds; i++) {
+				CPed* pNearPed = ped->m_nearPeds[i];
+				if (pNearPed->m_leader == ped) {
+					pNearPed->Teleport(pos);
+					pNearPed->PositionPedOutOfCollision(); // TODO(MIAMI): this is PositionAnyPedOutOfCollision!!!
+				}
+			}
 		}
 		else {
 			pos.z += vehicle->GetDistanceFromCentreOfMassToBaseOfModel();
 			vehicle->Teleport(pos);
 			CTheScripts::ClearSpaceForMissionEntity(pos, vehicle);
 		}
-		/* Short version of this command.
-		 *
-		 * CollectParameters(&m_nIp, 4);
-		 * CPed* ped = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		 * assert(ped);
-		 * CEntity* entityToMove = ped->bInVehicle ? ped->m_pMyVehicle : ped;
-		 * CVector pos = *(CVector*)&ScriptParams[1];
-		 * if (pos.z <= MAP_Z_LOW_LIMIT)
-		 *	pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		 * pos.z += entityToMove->GetDistanceFromCentreOfMassToBaseOfModel();
-		 * entityToMove->Teleport(pos);
-		 * CTheScripts::ClearSpaceForMissionEntity(pos, entityToMove);
-		 *
-		 */
 		return 0;
 	}
+	/*
 	case COMMAND_IS_CHAR_STILL_ALIVE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -2007,6 +2112,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		UpdateCompareFlag(ped && ped->GetPedState() != PED_DEAD && ped->GetPedState() != PED_DIE);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_CHAR_IN_AREA_2D:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -2074,15 +2180,22 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 			boat->SetStatus(STATUS_ABANDONED);
 			boat->bIsLocked = true;
 			boat->AutoPilot.m_nCarMission = MISSION_NONE;
-			boat->AutoPilot.m_nTempAction = TEMPACT_NONE; /* Animation ID? */
+			boat->AutoPilot.m_nTempAction = TEMPACT_NONE;
 			boat->AutoPilot.m_nCruiseSpeed = boat->AutoPilot.m_fMaxTrafficSpeed = 20.0f;
+			if (m_bIsMissionScript)
+				boat->bIsStaticWaitingForCollision = true;
 			CWorld::Add(boat);
 			handle = CPools::GetVehiclePool()->GetIndex(boat);
 		}
 		else {
 			CVehicle* car;
+
 			if (!CModelInfo::IsBikeModel(ScriptParams[0]))
 				car = new CAutomobile(ScriptParams[0], MISSION_VEHICLE);
+			else {
+				car = new CBike(ScriptParams[0], MISSION_VEHICLE);
+				((CBike*)(car))->bIsStanding = true;
+			}
 			CVector pos = *(CVector*)&ScriptParams[1];
 			if (pos.z <= MAP_Z_LOW_LIMIT)
 				pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
@@ -2093,13 +2206,15 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 			car->bIsLocked = true;
 			CCarCtrl::JoinCarWithRoadSystem(car);
 			car->AutoPilot.m_nCarMission = MISSION_NONE;
-			car->AutoPilot.m_nTempAction = TEMPACT_NONE; /* Animation ID? */
+			car->AutoPilot.m_nTempAction = TEMPACT_NONE;
 			car->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_STOP_FOR_CARS;
 			car->AutoPilot.m_nCruiseSpeed = car->AutoPilot.m_fMaxTrafficSpeed = 9.0f;
 			car->AutoPilot.m_nCurrentLane = car->AutoPilot.m_nNextLane = 0;
 			car->bEngineOn = false;
 			car->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
 			car->bHasBeenOwnedByPlayer = true;
+			if (m_bIsMissionScript)
+				car->bIsStaticWaitingForCollision = true;
 			CWorld::Add(car);
 			handle = CPools::GetVehiclePool()->GetIndex(car);
 		}
@@ -2221,6 +2336,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		}
 		return 0;
 	}
+	/*
 	case COMMAND_IS_CAR_STILL_ALIVE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -2228,6 +2344,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		UpdateCompareFlag(car && car->GetStatus() != STATUS_WRECKED && (car->IsBoat() || !car->bIsInWater));
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CAR_CRUISE_SPEED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -2309,36 +2426,32 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 		return 0;
 	case COMMAND_PRINT_BIG:
 	{
-		wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
+		wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
 #ifdef MISSION_REPLAY
 		if (strcmp((char*)&CTheScripts::ScriptSpace[m_nIp], "M_FAIL") == 0 && CanAllowMissionReplay())
 			AllowMissionReplay = 1;
 #endif
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
 		CollectParameters(&m_nIp, 2);
 		CMessages::AddBigMessage(key, ScriptParams[0], ScriptParams[1] - 1);
 		return 0;
 	}
 	case COMMAND_PRINT:
 	{
-		wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
 		CollectParameters(&m_nIp, 2);
 		CMessages::AddMessage(key, ScriptParams[0], ScriptParams[1]);
 		return 0;
 	}
 	case COMMAND_PRINT_NOW:
 	{
-		wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
 		CollectParameters(&m_nIp, 2);
 		CMessages::AddMessageJumpQ(key, ScriptParams[0], ScriptParams[1]);
 		return 0;
 	}
 	case COMMAND_PRINT_SOON:
 	{
-		wchar* key = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]);
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
 		CollectParameters(&m_nIp, 2);
 		CMessages::AddMessageSoon(key, ScriptParams[0], ScriptParams[1]);
 		return 0;
@@ -2375,15 +2488,15 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
 	case COMMAND_DEBUG_OFF:
 		CTheScripts::DbgFlag = false;
 		return 0;
+	/*
 	case COMMAND_RETURN_TRUE:
 		UpdateCompareFlag(true);
 		return 0;
 	case COMMAND_RETURN_FALSE:
 		UpdateCompareFlag(false);
 		return 0;
-	/* Special command only used by compiler.
-	case COMMAND_VAR_INT:
 	*/
+	//case COMMAND_VAR_INT:
 	default:
 		assert(0);
 		break;
@@ -2436,8 +2549,6 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	{
 		if (!m_bIsMissionScript)
 			return 0;
-		if (strcmp(m_abScriptName, "love3") == 0) /* A Drop in the Ocean */
-			CPickups::RemoveAllFloatingPickups();
 		CTheScripts::MissionCleanup.Process();
 		return 0;
 	}
@@ -2580,29 +2691,23 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		UpdateCompareFlag(pPed->bInVehicle);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle);
 		return 0;
 	}
 	case COMMAND_IS_PLAYER_IN_ANY_CAR:
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
-		UpdateCompareFlag(pPed->bInVehicle);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle);
 		return 0;
 	}
 	case COMMAND_IS_BUTTON_PRESSED:
 	{
 		CollectParameters(&m_nIp, 2);
-		bool value = GetPadState(ScriptParams[0], ScriptParams[1]) != 0;
-		if (CGame::playingIntro && ScriptParams[0] == 0 && ScriptParams[1] == 12) {
-			if (CPad::GetPad(0)->GetLeftMouseJustDown() ||
-				CPad::GetPad(0)->GetEnterJustDown() ||
-				CPad::GetPad(0)->GetCharJustDown(' '))
-				value = true;
-		}
-		UpdateCompareFlag(value);
+		UpdateCompareFlag(GetPadState(ScriptParams[0], ScriptParams[1]) != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_GET_PAD_STATE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -2610,6 +2715,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_LOCATE_PLAYER_ANY_MEANS_2D:
 	case COMMAND_LOCATE_PLAYER_ON_FOOT_2D:
 	case COMMAND_LOCATE_PLAYER_IN_CAR_2D:
@@ -2676,6 +2782,9 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pObj->SetOrientation(0.0f, 0.0f, 0.0f);
 		pObj->GetMatrix().UpdateRW();
 		pObj->UpdateRwFrame();
+		CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(mi);
+		if (pModelInfo->IsBuilding() && ((CSimpleModelInfo*)pModelInfo)->m_isBigBuilding)
+			pObj->SetupBigBuilding();
 		CTheScripts::ClearSpaceForMissionEntity(pos, pObj);
 		CWorld::Add(pObj);
 		ScriptParams[0] = CPools::GetObjectPool()->GetIndex(pObj);
@@ -2700,6 +2809,8 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	case COMMAND_ADD_SCORE:
 		CollectParameters(&m_nIp, 2);
 		CWorld::Players[ScriptParams[0]].m_nMoney += ScriptParams[1];
+		if (CWorld::Players[ScriptParams[0]].m_nMoney < 0)
+			CWorld::Players[ScriptParams[0]].m_nMoney = 0;
 		return 0;
 	case COMMAND_IS_SCORE_GREATER:
 		CollectParameters(&m_nIp, 2);
@@ -2742,12 +2853,14 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	case COMMAND_HAS_DEATHARREST_BEEN_EXECUTED:
 		UpdateCompareFlag(m_bDeatharrestExecuted);
 		return 0;
+	/*
 	case COMMAND_ADD_AMMO_TO_PLAYER:
 	{
 		CollectParameters(&m_nIp, 3);
 		CWorld::Players[ScriptParams[0]].m_pPed->GrantAmmo((eWeaponType)ScriptParams[1], ScriptParams[2]);
 		return 0;
 	}
+	*/
 	case COMMAND_ADD_AMMO_TO_CHAR:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -2756,10 +2869,8 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pPed->GrantAmmo((eWeaponType)ScriptParams[1], ScriptParams[2]);
 		return 0;
 	}
-	/* Not implemented
-	case COMMAND_ADD_AMMO_TO_CAR:
-	case COMMAND_IS_PLAYER_STILL_ALIVE:
-	*/
+	//case COMMAND_ADD_AMMO_TO_CAR:
+	//case COMMAND_IS_PLAYER_STILL_ALIVE:
 	case COMMAND_IS_PLAYER_DEAD:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CWorld::Players[ScriptParams[0]].m_WBState == WBSTATE_WASTED);
@@ -2768,14 +2879,14 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		UpdateCompareFlag(!pPed || pPed->GetPedState() == PED_DIE || pPed->GetPedState() == PED_DEAD);
+		UpdateCompareFlag(!pPed || pPed->DyingOrDead());
 		return 0;
 	}
 	case COMMAND_IS_CAR_DEAD:
 	{
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
-		UpdateCompareFlag(!pVehicle || pVehicle->GetStatus() == STATUS_WRECKED || !pVehicle->IsBoat() && pVehicle->bIsInWater);
+		UpdateCompareFlag(!pVehicle || pVehicle->GetStatus() == STATUS_WRECKED || pVehicle->bIsDrowning);
 		return 0;
 	}
 	case COMMAND_SET_CHAR_THREAT_SEARCH:
@@ -2786,9 +2897,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pPed->m_fearFlags |= ScriptParams[1];
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_SET_CHAR_THREAT_REACTION:
-	*/
+	//case COMMAND_SET_CHAR_THREAT_REACTION:
 	case COMMAND_SET_CHAR_OBJ_NO_OBJ:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -2798,23 +2907,21 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pPed->ClearObjective();
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_ORDER_DRIVER_OUT_OF_CAR:
-	case COMMAND_ORDER_CHAR_TO_DRIVE_CAR:
-	case COMMAND_ADD_PATROL_POINT:
-	case COMMAND_IS_PLAYER_IN_GANGZONE:
-	*/
+	//case COMMAND_ORDER_DRIVER_OUT_OF_CAR:
+	//case COMMAND_ORDER_CHAR_TO_DRIVE_CAR:
+	//case COMMAND_ADD_PATROL_POINT:
+	//case COMMAND_IS_PLAYER_IN_GANGZONE:
 	case COMMAND_IS_PLAYER_IN_ZONE:
 	{
 		CollectParameters(&m_nIp, 1);
 		CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]];
 		char label[12];
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
-		int zoneToCheck = CTheZones::FindZoneByLabelAndReturnIndex(label);
+		int zoneToCheck = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_DEFAULT);
 		if (zoneToCheck != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT; /* why only if zone != 1? */
 		CVector pos = pPlayer->GetPos();
-		CZone* pZone = CTheZones::GetZone(zoneToCheck);
+		CZone* pZone = CTheZones::GetNavigationZone(zoneToCheck);
 		UpdateCompareFlag(CTheZones::PointLiesWithinZone(&pos, pZone));
 		return 0;
 	}
@@ -2822,8 +2929,6 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CWorld::Players[ScriptParams[0]].m_pPed->GetPedState() == PED_DRIVING &&
 			CPad::GetPad(ScriptParams[0])->GetHorn());
-		/* Is it correct that same parameter is used both as index of Players */
-		/* and as ID of pad? Pratically this parameter is always 0 anyway of course. */
 		return 0;
 	case COMMAND_HAS_CHAR_SPOTTED_PLAYER:
 	{
@@ -2833,10 +2938,8 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		UpdateCompareFlag(pPed->OurPedCanSeeThisOne(CWorld::Players[ScriptParams[1]].m_pPed));
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_ORDER_CHAR_TO_BACKDOOR:
-	case COMMAND_ADD_CHAR_TO_GANG:
-	*/
+	//case COMMAND_ORDER_CHAR_TO_BACKDOOR:
+	//case COMMAND_ADD_CHAR_TO_GANG:
 	case COMMAND_IS_CHAR_OBJECTIVE_PASSED:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -2892,6 +2995,9 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pPed->CharCreatedBy = MISSION_CHAR;
 		pPed->bRespondsToThreats = false;
 		pPed->bAllowMedicsToReviveMe = false;
+		pPed->bIsPlayerFriend = false;
+		if (pVehicle->bIsBus)
+			pPed->bRenderPedInCar = false;
 		pPed->SetPosition(pVehicle->GetPosition());
 		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
 		pPed->SetPedState(PED_DRIVING);
@@ -2907,13 +3013,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 			pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
 		pVehicle->bEngineOn = true;
 		pPed->bUsesCollision = false;
-#ifdef FIX_BUGS
-		AnimationId anim = pVehicle->GetDriverAnim();
-#else
-		AnimationId anim = pVehicle->bLowVehicle ? ANIM_CAR_LSIT : ANIM_CAR_SIT;
-#endif
-		pPed->m_pVehicleAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, anim, 100.0f);
-		pPed->StopNonPartialAnims();
+		pPed->AddInCarAnims(pVehicle, true);
 		pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition());
 		CWorld::Add(pPed);
 		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
@@ -2947,7 +3047,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		pPlayer->m_pPed->SetPedState(PED_IDLE);
 		pPlayer->m_pPed->bUsesCollision = true;
 		pPlayer->m_pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-		pPlayer->m_pPed->AddWeaponModel(CWeaponInfo::GetWeaponInfo(pPlayer->m_pPed->GetWeapon()->m_eWeaponType)->m_nModelId);
+		pPlayer->m_pPed->ReplaceWeaponWhenExitingVehicle();
 		pPlayer->m_pPed->RemoveInCarAnims();
 		if (pPlayer->m_pPed->m_pVehicleAnim)
 			pPlayer->m_pPed->m_pVehicleAnim->blendDelta = -1000.0f;
@@ -2961,9 +3061,7 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 		CTheScripts::ClearSpaceForMissionEntity(pos, pPlayer->m_pPed);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_MAKE_CHAR_DO_NOTHING:
-	*/
+	//case COMMAND_MAKE_CHAR_DO_NOTHING:
 	default:
 		assert(0);
 		break;
@@ -2974,22 +3072,21 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 int8 CRunningScript::ProcessCommands300To399(int32 command)
 {
 	switch (command) {
-	/* Not implemented.
-	case COMMAND_SET_CHAR_INVINCIBLE:
-	case COMMAND_SET_PLAYER_INVINCIBLE:
-	case COMMAND_SET_CHAR_GRAPHIC_TYPE:
-	case COMMAND_SET_PLAYER_GRAPHIC_TYPE:
-	*/
+	//case COMMAND_SET_CHAR_INVINCIBLE:
+	//case COMMAND_SET_PLAYER_INVINCIBLE:
+	//case COMMAND_SET_CHAR_GRAPHIC_TYPE:
+	//case COMMAND_SET_PLAYER_GRAPHIC_TYPE:
+	/*
 	case COMMAND_HAS_PLAYER_BEEN_ARRESTED:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CWorld::Players[ScriptParams[0]].m_WBState == WBSTATE_BUSTED);
 		return 0;
-	/* Not implemented.
-	case COMMAND_STOP_CHAR_DRIVING:
-	case COMMAND_KILL_CHAR:
-	case COMMAND_SET_FAVOURITE_CAR_MODEL_FOR_CHAR:
-	case COMMAND_SET_CHAR_OCCUPATION:
 	*/
+	//case COMMAND_STOP_CHAR_DRIVING:
+	//case COMMAND_KILL_CHAR:
+	//case COMMAND_SET_FAVOURITE_CAR_MODEL_FOR_CHAR:
+	//case COMMAND_SET_CHAR_OCCUPATION:
+	/*
 	case COMMAND_CHANGE_CAR_LOCK:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3005,6 +3102,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 			*(float*)&ScriptParams[2],
 			*(float*)&ScriptParams[3]);
 		return 0;
+	*/
 	case COMMAND_IS_CAR_MODEL:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3013,11 +3111,10 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		UpdateCompareFlag(pVehicle->GetModelIndex() == ScriptParams[1]);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_IS_CAR_REMAP:
-	case COMMAND_HAS_CAR_JUST_SUNK:
-	case COMMAND_SET_CAR_NO_COLLIDE:
-	*/
+	//case COMMAND_IS_CAR_REMAP:
+	//case COMMAND_HAS_CAR_JUST_SUNK:
+	//case COMMAND_SET_CAR_NO_COLLIDE:
+	/*
 	case COMMAND_IS_CAR_DEAD_IN_AREA_2D:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -3056,35 +3153,39 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 			CTheScripts::DrawDebugCube(x1, y1, z1, x2, y2, z2);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_IS_TRAILER_ATTACHED:
-	case COMMAND_IS_CAR_ON_TRAILER:
-	case COMMAND_HAS_CAR_GOT_WEAPON:
-	case COMMAND_PARK:
-	case COMMAND_HAS_PARK_FINISHED:
-	case COMMAND_KILL_ALL_PASSENGERS:
-	case COMMAND_SET_CAR_BULLETPROOF:
-	case COMMAND_SET_CAR_FLAMEPROOF:
-	case COMMAND_SET_CAR_ROCKETPROOF:
-	case COMMAND_IS_CARBOMB_ACTIVE:
-	case COMMAND_GIVE_CAR_ALARM:
-	case COMMAND_PUT_CAR_ON_TRAILER:
 	*/
+	//case COMMAND_IS_TRAILER_ATTACHED:
+	//case COMMAND_IS_CAR_ON_TRAILER:
+	//case COMMAND_HAS_CAR_GOT_WEAPON:
+	//case COMMAND_PARK:
+	//case COMMAND_HAS_PARK_FINISHED:
+	//case COMMAND_KILL_ALL_PASSENGERS:
+	//case COMMAND_SET_CAR_BULLETPROOF:
+	//case COMMAND_SET_CAR_FLAMEPROOF:
+	//case COMMAND_SET_CAR_ROCKETPROOF:
+	//case COMMAND_IS_CARBOMB_ACTIVE:
+	//case COMMAND_GIVE_CAR_ALARM:
+	//case COMMAND_PUT_CAR_ON_TRAILER:
+	/*
 	case COMMAND_IS_CAR_CRUSHED:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CGarages::HasCarBeenCrushed(ScriptParams[0]));
 		return 0;
-	/* Not implemented.
-	case COMMAND_CREATE_GANG_CAR:
 	*/
+	//case COMMAND_CREATE_GANG_CAR:
 	case COMMAND_CREATE_CAR_GENERATOR:
+	{
 		CollectParameters(&m_nIp, 12);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z > MAP_Z_LOW_LIMIT)
+			pos.z += 0.015f;
 		ScriptParams[0] = CTheCarGenerators::CreateCarGenerator(
-			*(float*)&ScriptParams[0], *(float*)&ScriptParams[1], *(float*)&ScriptParams[2], *(float*)&ScriptParams[3],
+			pos.x, pos.y, pos.z, *(float*)&ScriptParams[3],
 			ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7],
 			ScriptParams[8], ScriptParams[9], ScriptParams[10], ScriptParams[11]);
 		StoreParameters(&m_nIp, 1);
 		return 0;
+	}
 	case COMMAND_SWITCH_CAR_GENERATOR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3099,6 +3200,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		}
 		return 0;
 	}
+	/*
 	case COMMAND_ADD_PAGER_MESSAGE:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -3106,11 +3208,14 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CUserDisplay::Pager.AddMessage(text, ScriptParams[0], ScriptParams[1], ScriptParams[2]);
 		return 0;
 	}
+	*/
 	case COMMAND_DISPLAY_ONSCREEN_TIMER:
 	{
 		assert(CTheScripts::ScriptSpace[m_nIp] == ARGUMENT_GLOBALVAR);
 		m_nIp++;
-		CUserDisplay::OnscnTimer.AddClock(CTheScripts::Read2BytesFromScript(&m_nIp), nil);
+		uint32 offset = CTheScripts::Read2BytesFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 1);
+		CUserDisplay::OnscnTimer.AddClock(offset, nil, ScriptParams[0] != 0);
 		return 0;
 	}
 	case COMMAND_CLEAR_ONSCREEN_TIMER:
@@ -3126,7 +3231,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		m_nIp++;
 		int32 counter = CTheScripts::Read2BytesFromScript(&m_nIp);
 		CollectParameters(&m_nIp, 1);
-		CUserDisplay::OnscnTimer.AddCounter(counter, ScriptParams[0], nil);
+		CUserDisplay::OnscnTimer.AddCounter(counter, ScriptParams[0], nil, 0);
 		return 0;
 	}
 	case COMMAND_CLEAR_ONSCREEN_COUNTER:
@@ -3139,23 +3244,30 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	case COMMAND_SET_ZONE_CAR_INFO:
 	{
 		char label[12];
+		int16 gangDensities[NUM_GANGS] = { 0 };
+		int i;
+
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CollectParameters(&m_nIp, 16);
-		int zone = CTheZones::FindZoneByLabelAndReturnIndex(label);
+		CollectParameters(&m_nIp, 12);
+		for (i = 0; i < NUM_GANGS; i++)
+			gangDensities[i] = ScriptParams[i + 2];
+		int zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_INFO);
+		for (int i = 0; i < NUM_GANGS; i++) {
+			if (gangDensities[i] != 0 && CGangs::GetGangInfo(i)->m_nVehicleMI == -1)
+				debug("SET_ZONE_CAR_INFO - Gang %d car ratio should be 0 in %s zone\n", i + 1, label);
+		}
 		if (zone < 0) {
 			debug("Couldn't find zone - %s\n", label);
 			return 0;
 		}
-		CTheZones::SetZoneCarInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3],
-			ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], 0, 0,
-			ScriptParams[9], ScriptParams[10], ScriptParams[11], ScriptParams[12],
-			ScriptParams[13], ScriptParams[14], ScriptParams[15]);
+		while (zone >= 0) {
+			CTheZones::SetZoneCarInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[11], gangDensities);
+			zone = CTheZones::FindNextZoneByLabelAndReturnIndex(label, ZONE_INFO);
+		}
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_IS_CHAR_IN_GANG_ZONE:
-	*/
+	//case COMMAND_IS_CHAR_IN_GANG_ZONE:
 	case COMMAND_IS_CHAR_IN_ZONE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -3163,41 +3275,15 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		assert(pPed);
 		char label[12];
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
-		int zone = CTheZones::FindZoneByLabelAndReturnIndex(label);
+		int zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_DEFAULT);
 		if (zone != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
 		CVector pos = pPed->bInVehicle ? pPed->m_pMyVehicle->GetPosition() : pPed->GetPosition();
-		UpdateCompareFlag(CTheZones::PointLiesWithinZone(&pos, CTheZones::GetZone(zone)));
-		return 0;
-	}
-	case COMMAND_SET_CAR_DENSITY:
-	{
-		char label[12];
-		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
-		int16 zone = CTheZones::FindZoneByLabelAndReturnIndex(label);
-		m_nIp += 8;
-		CollectParameters(&m_nIp, 2);
-		if (zone < 0) {
-			debug("Couldn't find zone - %s\n", label);
-			return 0;
-		}
-		CTheZones::SetCarDensity(zone, ScriptParams[0], ScriptParams[1]);
-		return 0;
-	}
-	case COMMAND_SET_PED_DENSITY:
-	{
-		char label[12];
-		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
-		int16 zone = CTheZones::FindZoneByLabelAndReturnIndex(label);
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CollectParameters(&m_nIp, 2);
-		if (zone < 0) {
-			debug("Couldn't find zone - %s\n", label);
-			return 0;
-		}
-		CTheZones::SetPedDensity(zone, ScriptParams[0], ScriptParams[1]);
+		UpdateCompareFlag(CTheZones::PointLiesWithinZone(&pos, CTheZones::GetNavigationZone(zone)));
 		return 0;
 	}
+	//case COMMAND_SET_CAR_DENSITY:
+	//case COMMAND_SET_PED_DENSITY:
 	case COMMAND_POINT_CAMERA_AT_PLAYER:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -3209,43 +3295,49 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	{
 		CollectParameters(&m_nIp, 3);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
-		assert(pVehicle);
-		TheCamera.TakeControl(pVehicle, ScriptParams[1], ScriptParams[2], CAMCONTROL_SCRIPT);
+		if (pVehicle)
+			TheCamera.TakeControl(pVehicle, ScriptParams[1], ScriptParams[2], CAMCONTROL_SCRIPT);
 		return 0;
 	}
 	case COMMAND_POINT_CAMERA_AT_CHAR:
 	{
 		CollectParameters(&m_nIp, 3);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		assert(pPed);
-		TheCamera.TakeControl(pPed, ScriptParams[1], ScriptParams[2], CAMCONTROL_SCRIPT);
+		if (pPed)
+			TheCamera.TakeControl(pPed, ScriptParams[1], ScriptParams[2], CAMCONTROL_SCRIPT);
 		return 0;
 	}
 	case COMMAND_RESTORE_CAMERA:
 		TheCamera.Restore();
 		return 0;
+	/*
 	case COMMAND_SHAKE_PAD:
 		CPad::GetPad(ScriptParams[0])->StartShake(ScriptParams[1], ScriptParams[2]);
 		return 0;
+	*/
 	case COMMAND_SET_ZONE_PED_INFO:
 	{
 		char label[12];
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CollectParameters(&m_nIp, 10);
-		int16 zone = CTheZones::FindZoneByLabelAndReturnIndex(label);
+		CollectParameters(&m_nIp, 12);
+		int16 zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_INFO);
 		if (zone < 0) {
 			debug("Couldn't find zone - %s\n", label);
 			return 0;
 		}
-		CTheZones::SetZonePedInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3],
-			ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], 0, 0, ScriptParams[9]);
+		while (zone >= 0) {
+			CTheZones::SetZonePedInfo(zone, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3],
+				ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8], ScriptParams[9], ScriptParams[10], ScriptParams[11]);
+			zone = CTheZones::FindNextZoneByLabelAndReturnIndex(label, ZONE_INFO);
+		}
 		return 0;
 	}
 	case COMMAND_SET_TIME_SCALE:
 		CollectParameters(&m_nIp, 1);
 		CTimer::SetTimeScale(*(float*)&ScriptParams[0]);
 		return 0;
+	/*
 	case COMMAND_IS_CAR_IN_AIR:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -3255,6 +3347,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		UpdateCompareFlag(pCar->GetAllWheelsOffGround());
 		return 0;
 	}
+	*/
 	case COMMAND_SET_FIXED_CAMERA_POSITION:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -3277,7 +3370,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 3);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		ScriptParams[0] = CRadar::SetEntityBlip(BLIP_CAR, ScriptParams[0], ScriptParams[1], (eBlipDisplay)ScriptParams[2]);
 		StoreParameters(&m_nIp, 1);
@@ -3288,23 +3380,23 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 3);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		ScriptParams[0] = CRadar::SetEntityBlip(BLIP_CHAR, ScriptParams[0], ScriptParams[1], (eBlipDisplay)ScriptParams[2]);
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_ADD_BLIP_FOR_OBJECT_OLD:
 	{
 		CollectParameters(&m_nIp, 3);
 		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
 		assert(pObject);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		ScriptParams[0] = CRadar::SetEntityBlip(BLIP_OBJECT, ScriptParams[0], ScriptParams[1], (eBlipDisplay)ScriptParams[2]);
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_REMOVE_BLIP:
 		CollectParameters(&m_nIp, 1);
 		CRadar::ClearBlip(ScriptParams[0]);
@@ -3323,7 +3415,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CVector pos = *(CVector*)&ScriptParams[0];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		// Useless call
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		ScriptParams[0] = CRadar::SetCoordBlip(BLIP_COORD, pos, ScriptParams[3], (eBlipDisplay)ScriptParams[4]);
 		StoreParameters(&m_nIp, 1);
@@ -3374,6 +3465,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CRestart::OverrideNextRestart(pos, angle);
 		return 0;
 	}
+	/*
 	case COMMAND_DRAW_SHADOW:
 	{
 		CollectParameters(&m_nIp, 10);
@@ -3392,11 +3484,11 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		float frontY = y;
 		float sideX = y;
 		float sideY = x;
-		/* Not very nicely named intermediate variables. */
 		CShadows::StoreShadowToBeRendered(ScriptParams[0], &pos, frontX, frontY, sideX, sideY,
 			ScriptParams[6], ScriptParams[7], ScriptParams[8], ScriptParams[9]);
 		return 0;
 	}
+	*/
 	case COMMAND_GET_PLAYER_HEADING:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -3410,10 +3502,9 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	{
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
-		if (pPed->bInVehicle){
-			// Is assertion required?
+		assert(pPed);
+		if (pPed->bInVehicle)
 			return 0;
-		}
 		pPed->m_fRotationDest = pPed->m_fRotationCur = DEGTORAD(*(float*)&ScriptParams[1]);
 		pPed->SetHeading(DEGTORAD(*(float*)&ScriptParams[1]));
 		return 0;
@@ -3433,10 +3524,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		if (pPed->bInVehicle) {
-			// Is assertion required?
+		if (pPed->bInVehicle)
 			return 0;
-		}
 		pPed->m_fRotationDest = pPed->m_fRotationCur = DEGTORAD(*(float*)&ScriptParams[1]);
 		pPed->SetHeading(DEGTORAD(*(float*)&ScriptParams[1]));
 		return 0;
@@ -3481,6 +3570,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CWorld::Add(pObject);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_PLAYER_TOUCHING_OBJECT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3502,12 +3592,14 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		UpdateCompareFlag(pEntityToTest->GetHasCollidedWith(pObject));
 		return 0;
 	}
+	*/
 	case COMMAND_SET_PLAYER_AMMO:
 	{
 		CollectParameters(&m_nIp, 3);
 		CWorld::Players[0].m_pPed->SetAmmo((eWeaponType)ScriptParams[1], ScriptParams[2]);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_AMMO:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -3515,23 +3607,17 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		pPed->SetAmmo((eWeaponType)ScriptParams[1], ScriptParams[2]);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_SET_CAR_AMMO:
-	case COMMAND_LOAD_CAMERA_SPLINE:
-	case COMMAND_MOVE_CAMERA_ALONG_SPLINE:
-	case COMMAND_GET_CAMERA_POSITION_ALONG_SPLINE:
 	*/
+	//case COMMAND_SET_CAR_AMMO:
+	//case COMMAND_LOAD_CAMERA_SPLINE:
+	//case COMMAND_MOVE_CAMERA_ALONG_SPLINE:
+	//case COMMAND_GET_CAMERA_POSITION_ALONG_SPLINE:
 	case COMMAND_DECLARE_MISSION_FLAG:
 		CTheScripts::OnAMissionFlag = CTheScripts::Read2BytesFromScript(&++m_nIp);
 		return 0;
 	case COMMAND_DECLARE_MISSION_FLAG_FOR_CONTACT:
-		CollectParameters(&m_nIp, 1);
-		CTheScripts::OnAMissionForContactFlag[ScriptParams[0]] = CTheScripts::Read2BytesFromScript(&++m_nIp);
-		return 0;
-	case COMMAND_DECLARE_BASE_BRIEF_ID_FOR_CONTACT:
-		CollectParameters(&m_nIp, 2);
-		CTheScripts::BaseBriefIdForContact[ScriptParams[0]] = ScriptParams[1];
 		return 0;
+	//case COMMAND_DECLARE_BASE_BRIEF_ID_FOR_CONTACT:
 	case COMMAND_IS_PLAYER_HEALTH_GREATER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -3560,7 +3646,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		int handle = CRadar::SetEntityBlip(BLIP_CAR, ScriptParams[0], 0, BLIP_DISPLAY_BOTH);
 		CRadar::ChangeBlipScale(handle, 3);
@@ -3573,7 +3658,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		int handle = CRadar::SetEntityBlip(BLIP_CHAR, ScriptParams[0], 1, BLIP_DISPLAY_BOTH);
 		CRadar::ChangeBlipScale(handle, 3);
@@ -3586,7 +3670,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
 		assert(pObject);
-		// Useless call.
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		int handle = CRadar::SetEntityBlip(BLIP_OBJECT, ScriptParams[0], 6, BLIP_DISPLAY_BOTH);
 		CRadar::ChangeBlipScale(handle, 3);
@@ -3600,7 +3683,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CVector pos = *(CVector*)&ScriptParams[0];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		// Useless call
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		int handle = CRadar::SetCoordBlip(BLIP_COORD, pos, 2, BLIP_DISPLAY_BOTH);
 		CRadar::ChangeBlipScale(handle, 3);
@@ -3614,7 +3696,6 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		CVector pos = *(CVector*)&ScriptParams[0];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		// Useless call
 		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
 		int handle = CRadar::SetCoordBlip(BLIP_COORD, pos, 5, BLIP_DISPLAY_BOTH);
 		CRadar::ChangeBlipScale(handle, 3);
@@ -3629,6 +3710,15 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	case COMMAND_ADD_ONE_OFF_SOUND:
 	{
 		CollectParameters(&m_nIp, 4);
+		// TODO(MIAMI)
+		// SOUND_PART_MISSION_COMPLETE == 1
+		// SOUND_RACE_START_3 == 7
+		// SOUND_RACE_START_2 == 8
+		// SOUND_RACE_START_1 == 9
+		// SOUND_RACE_START_GO == 10
+		// SOUND_AMMUNATION_BUY_WEAPON == 13
+		// SOUND_AMMUNATION_BUY_WEAPON_DENIED == 14
+		// SOUND_AMMUNATION_IMRAN_ARM_BOMB == 16
 		switch (ScriptParams[3]) {
 		case SCRIPT_SOUND_EVIDENCE_PICKUP:
 			DMAudio.PlayFrontEndSound(SOUND_EVIDENCE_PICKUP, 0);
@@ -3654,11 +3744,8 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 		default:
 			break;
 		}
-#ifdef FIX_BUGS
-		/* BUG: if audio is not initialized, this object will not be freed. */
 		if (!DMAudio.IsAudioInitialised())
 			return 0;
-#endif
 		cAudioScriptObject* obj = new cAudioScriptObject();
 		obj->Posn = *(CVector*)&ScriptParams[0];
 		obj->AudioId = ScriptParams[3];
@@ -3669,11 +3756,15 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	case COMMAND_ADD_CONTINUOUS_SOUND:
 	{
 		CollectParameters(&m_nIp, 4);
-		cAudioScriptObject* obj = new cAudioScriptObject();
-		obj->Posn = *(CVector*)&ScriptParams[0];
-		obj->AudioId = ScriptParams[3];
-		obj->AudioEntity = DMAudio.CreateLoopingScriptObject(obj);
-		ScriptParams[0] = CPools::GetAudioScriptObjectPool()->GetIndex(obj);
+		if (DMAudio.IsAudioInitialised()) {
+			cAudioScriptObject* obj = new cAudioScriptObject();
+			obj->Posn = *(CVector*)&ScriptParams[0];
+			obj->AudioId = ScriptParams[3];
+			obj->AudioEntity = DMAudio.CreateLoopingScriptObject(obj);
+			ScriptParams[0] = CPools::GetAudioScriptObjectPool()->GetIndex(obj);
+		}
+		else
+			ScriptParams[0] = -1;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -3752,6 +3843,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_GUARD_SPOT, pos);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_OBJ_GUARD_AREA:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -3787,6 +3879,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_WAIT_IN_CAR);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_PLAYER_IN_AREA_ON_FOOT_2D:
 	case COMMAND_IS_PLAYER_IN_AREA_IN_CAR_2D:
 	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_2D:
@@ -3835,31 +3928,21 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
 		pPed->SetCurrentWeapon(pPed->GiveWeapon((eWeaponType)ScriptParams[1], ScriptParams[2]));
-		if (pPed->bInVehicle)
+		if (pPed->bInVehicle && pPed->m_pMyVehicle)
 			pPed->RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType)->m_nModelId);
 		return 0;
 	}
-	/* Not implemented */
 	//case COMMAND_GIVE_WEAPON_TO_CAR:
 	case COMMAND_SET_PLAYER_CONTROL:
 	{
 		CollectParameters(&m_nIp, 2);
 		CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]];
 		if (ScriptParams[1]){
-			if (CGame::playingIntro || CTheScripts::DelayMakingPlayerUnsafeThisTime){
-				CTheScripts::CountdownToMakePlayerUnsafe = 50;
-				if (CTheScripts::DelayMakingPlayerUnsafeThisTime)
-					CTheScripts::DelayMakingPlayerUnsafeThisTime--;
-			}else{
-				pPlayer->MakePlayerSafe(false);
-			}
+			pPlayer->MakePlayerSafe(false);
+			if (strcmp(m_abScriptName, "serg1") == 0) // Four Iron
+				pPlayer->m_pPed->ClearFollowPath();
 		}else{
 			pPlayer->MakePlayerSafe(true);
-			if (strcmp(m_abScriptName, "camera") == 0){
-				pPlayer->m_pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-				pPlayer->m_pPed->SetTurnSpeed(0.0f, 0.0f, 0.0f);
-				CAnimManager::BlendAnimation((RpClump*)pPlayer->m_pPed->m_rwObject, pPlayer->m_pPed->m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
-			}
 		}
 		return 0;
 	}
@@ -3878,7 +3961,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	{
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
-		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++){
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++){
 			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
 				pPed->m_nSelectedWepSlot = i;
 		}
@@ -3888,13 +3971,12 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	{
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
 			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
 				pPed->SetCurrentWeapon(i);
 		}
 		return 0;
 	}
-	/* Not implemented */
 	//case COMMAND_SET_CURRENT_CAR_WEAPON:
 	case COMMAND_GET_OBJECT_COORDINATES:
 	{
@@ -4084,9 +4166,11 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->CharCreatedBy = MISSION_CHAR;
 		pPed->bRespondsToThreats = false;
 		pPed->bAllowMedicsToReviveMe = false;
+		pPed->bIsPlayerFriend = false;
+		if (pVehicle->bIsBus)
+			pPed->bRenderPedInCar = false;
 		pPed->SetPosition(pVehicle->GetPosition());
 		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
-		pPed->SetPedState(PED_DRIVING);
 		CPopulation::ms_nTotalMissionPeds++;
 		if (ScriptParams[3] >= 0)
 			pVehicle->AddPassenger(pPed, ScriptParams[3]);
@@ -4095,16 +4179,10 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->m_pMyVehicle = pVehicle;
 		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
 		pPed->bInVehicle = true;
-		pPed->SetPedState(PED_DRIVING);
 		pVehicle->SetStatus(STATUS_PHYSICS);
+		pPed->SetPedState(PED_DRIVING);
 		pPed->bUsesCollision = false;
-#ifdef FIX_BUGS
-		AnimationId anim = pVehicle->GetDriverAnim();
-#else
-		AnimationId anim = pVehicle->bLowVehicle ? ANIM_CAR_LSIT : ANIM_CAR_SIT;
-#endif
-		pPed->m_pVehicleAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, anim, 100.0f);
-		pPed->StopNonPartialAnims();
+		pPed->AddInCarAnims(pVehicle, false);
 		pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition());
 		CWorld::Add(pPed);
 		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
@@ -4153,6 +4231,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_KILL_CHAR_ANY_MEANS, pTarget);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_OBJ_FLEE_CHAR_ON_FOOT_TILL_SAFE:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -4163,6 +4242,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, pTarget);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_OBJ_FLEE_PLAYER_ON_FOOT_TILL_SAFE:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -4243,11 +4323,18 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, pVehicle);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_IN_CAR:
-	case COMMAND_SET_CHAR_OBJ_FIRE_AT_OBJECT_FROM_VEHICLE:
+	//case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_IN_CAR:
+	//case COMMAND_SET_CHAR_OBJ_FIRE_AT_OBJECT_FROM_VEHICLE:
 	case COMMAND_SET_CHAR_OBJ_DESTROY_OBJECT:
-	*/
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->bScriptObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_DESTROY_OBJ, pVehicle);
+		return 0;
+	}
 	case COMMAND_SET_CHAR_OBJ_DESTROY_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -4258,6 +4345,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_DESTROY_CAR, pVehicle);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_OBJ_GOTO_AREA_ON_FOOT:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -4284,11 +4372,10 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, pos, radius);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_SET_CHAR_OBJ_GOTO_AREA_IN_CAR:
-	case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
-	case COMMAND_SET_CHAR_OBJ_GUARD_ATTACK:
 	*/
+	//case COMMAND_SET_CHAR_OBJ_GOTO_AREA_IN_CAR:
+	//case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
+	//case COMMAND_SET_CHAR_OBJ_GUARD_ATTACK:
 	case COMMAND_SET_CHAR_AS_LEADER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -4351,9 +4438,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		CMessages::AddMessageJumpQWithNumber(text, ScriptParams[1], ScriptParams[2], ScriptParams[0], -1, -1, -1, -1, -1);
 		return 0;
 	}
-	/* Not implemented.
-	case COMMAND_PRINT_WITH_NUMBER_SOON:
-	*/
+	//case COMMAND_PRINT_WITH_NUMBER_SOON:
 	case COMMAND_SWITCH_ROADS_ON:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -4431,7 +4516,16 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		pVehicle->bIsHeavy = (ScriptParams[1] != 0);
+		if (ScriptParams[1] != 0) {
+			pVehicle->bIsHeavy = true;
+			pVehicle->m_fMass = 3.0f * pVehicle->pHandling->fMass;
+			pVehicle->m_fTurnMass = 5.0f * pVehicle->pHandling->fTurnMass;
+		}
+		else {
+			pVehicle->bIsHeavy = false;
+			pVehicle->m_fMass = pVehicle->pHandling->fMass;
+			pVehicle->m_fTurnMass = pVehicle->pHandling->fTurnMass;
+		}
 		return 0;
 	}
 	case COMMAND_CLEAR_CHAR_THREAT_SEARCH:
@@ -4442,6 +4536,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		pPed->m_fearFlags = 0;
 		return 0;
 	}
+	/*
 	case COMMAND_ACTIVATE_CRANE:
 	{
 		CollectParameters(&m_nIp, 10);
@@ -4469,16 +4564,15 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 		CCranes::DeActivateCrane(*(float*)&ScriptParams[0], *(float*)&ScriptParams[1]);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_MAX_WANTED_LEVEL:
 	{
 		CollectParameters(&m_nIp, 1);
 		CWanted::SetMaximumWantedLevel(ScriptParams[0]);
 		return 0;
 	}
-	/* Debug commands?
-	case COMMAND_SAVE_VAR_INT:
-	case COMMAND_SAVE_VAR_FLOAT:
-	*/
+	//case COMMAND_SAVE_VAR_INT:
+	//case COMMAND_SAVE_VAR_FLOAT:
 	case COMMAND_IS_CAR_IN_AIR_PROPER:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -4530,6 +4624,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		}
 		return 0;
 	}
+	/*
 	case COMMAND_ADD_PAGER_MESSAGE_WITH_NUMBER:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -4538,6 +4633,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 			ScriptParams[1], ScriptParams[2], ScriptParams[3]);
 		return 0;
 	}
+	*/
 	case COMMAND_START_KILL_FRENZY:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -4682,7 +4778,6 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pPed->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, target);
 		return 0;
 	}
-	/* Not implemented*/
 	//case COMMAND_SET_CHAR_OBJ_GOTO_COORD_IN_CAR:
 	case COMMAND_CREATE_PICKUP:
 	{
@@ -4722,6 +4817,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CMessages::AddBigMessageQ(text, ScriptParams[0], ScriptParams[1] - 1);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_NUMBER_BIG_Q:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -4730,56 +4826,39 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 			ScriptParams[0], -1, -1, -1, -1, -1);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_GARAGE:
 	{
-		CollectParameters(&m_nIp, 7);
+		CollectParameters(&m_nIp, 9);
 		float infX = *(float*)&ScriptParams[0];
 		float infY = *(float*)&ScriptParams[1];
 		float infZ = *(float*)&ScriptParams[2];
-		float supX = *(float*)&ScriptParams[3];
-		float supY = *(float*)&ScriptParams[4];
-		float supZ = *(float*)&ScriptParams[5];
-		if (infX > supX) {
-			infX = *(float*)&ScriptParams[3];
-			supX = *(float*)&ScriptParams[0];
-		}
-		if (infY > supY) {
-			infY = *(float*)&ScriptParams[4];
-			supY = *(float*)&ScriptParams[1];
-		}
-		if (infZ > supZ) {
-			infZ = *(float*)&ScriptParams[5];
-			supZ = *(float*)&ScriptParams[2];
-		}
-		ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, supX, supY, supZ, (eGarageType)ScriptParams[6], 0);
+		float X2 = *(float*)&ScriptParams[3];
+		float Y2 = *(float*)&ScriptParams[4];
+		float supX = *(float*)&ScriptParams[5];
+		float supY = *(float*)&ScriptParams[6];
+		float supZ = *(float*)&ScriptParams[7];
+		ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, (eGarageType)ScriptParams[8], 0);
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_GARAGE_WITH_CAR_MODEL:
 	{
-		CollectParameters(&m_nIp, 8);
+		CollectParameters(&m_nIp, 10);
 		float infX = *(float*)&ScriptParams[0];
 		float infY = *(float*)&ScriptParams[1];
 		float infZ = *(float*)&ScriptParams[2];
-		float supX = *(float*)&ScriptParams[3];
-		float supY = *(float*)&ScriptParams[4];
-		float supZ = *(float*)&ScriptParams[5];
-		if (infX > supX) {
-			infX = *(float*)&ScriptParams[3];
-			supX = *(float*)&ScriptParams[0];
-		}
-		if (infY > supY) {
-			infY = *(float*)&ScriptParams[4];
-			supY = *(float*)&ScriptParams[1];
-		}
-		if (infZ > supZ) {
-			infZ = *(float*)&ScriptParams[5];
-			supZ = *(float*)&ScriptParams[2];
-		}
-		ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, supX, supY, supZ, (eGarageType)ScriptParams[6], ScriptParams[7]);
+		float X2 = *(float*)&ScriptParams[3];
+		float Y2 = *(float*)&ScriptParams[4];
+		float supX = *(float*)&ScriptParams[5];
+		float supY = *(float*)&ScriptParams[6];
+		float supZ = *(float*)&ScriptParams[7];
+		ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, (eGarageType)ScriptParams[8], ScriptParams[9]);
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_TARGET_CAR_FOR_MISSION_GARAGE:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -4837,6 +4916,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		return 0;
 	}
 #endif // GTA_PS2
+	/*
 	case COMMAND_SET_ALL_TAXI_LIGHTS:
 		CollectParameters(&m_nIp, 1);
 		CAutomobile::SetAllTaxiLights(ScriptParams[0] != 0);
@@ -4850,6 +4930,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		UpdateCompareFlag(pCar->m_bombType != 0); //TODO: enum
 		return 0;
 	}
+	*/
 	case COMMAND_APPLY_BRAKES_TO_PLAYERS_CAR:
 		CollectParameters(&m_nIp, 2);
 		CPad::GetPad(ScriptParams[0])->bApplyBrakes = (ScriptParams[1] != 0);
@@ -4859,7 +4940,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		pPed->m_fHealth = ScriptParams[1];
+		pPed->m_fHealth = Min(ScriptParams[1], CWorld::Players[ScriptParams[0]].m_nMaxHealth);
 		return 0;
 	}
 	case COMMAND_SET_CHAR_HEALTH:
@@ -4876,7 +4957,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 				pPed->FlagToDestroyWhenNextProcessed();
 		}
 		else {
-			pPed->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
+			pPed->SetDie();
 		}
 		return 0;
 	}
@@ -4893,7 +4974,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		ScriptParams[0] = pPed->m_fHealth; // correct cast float to int
+		ScriptParams[0] = pPed->m_fHealth;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -4902,7 +4983,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		ScriptParams[0] = pPed->m_fHealth; // correct cast float to int
+		ScriptParams[0] = pPed->m_fHealth;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -4911,19 +4992,21 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		ScriptParams[0] = pVehicle->m_fHealth; // correct cast float to int
+		ScriptParams[0] = pVehicle->m_fHealth;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_CAR_ARMED_WITH_BOMB:
 	{
 		CollectParameters(&m_nIp, 2);
 		CAutomobile* pCar = (CAutomobile*)CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pCar);
 		assert(pCar->m_vehType == VEHICLE_TYPE_CAR);
-		UpdateCompareFlag(pCar->m_bombType == ScriptParams[1]); //TODO: enum
+		UpdateCompareFlag(pCar->m_bombType == ScriptParams[1]);
 		return 0;
 	}
+	*/
 	case COMMAND_CHANGE_CAR_COLOUR:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -5037,15 +5120,19 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 			pSourcePed->RestorePreviousState();
 		return 0;
 	}
+	/*
 	case COMMAND_SWITCH_HELICOPTER:
 		CollectParameters(&m_nIp, 1);
 		CHeli::ActivateHeli(ScriptParams[0] != 0);
 		return 0;
-
-		//case COMMAND_SET_GANG_ATTITUDE:
-		//case COMMAND_SET_GANG_GANG_ATTITUDE:
-		//case COMMAND_SET_GANG_PLAYER_ATTITUDE:
-		//case COMMAND_SET_GANG_PED_MODELS:
+	*/
+	//case COMMAND_SET_GANG_ATTITUDE:
+	//case COMMAND_SET_GANG_GANG_ATTITUDE:
+	//case COMMAND_SET_GANG_PLAYER_ATTITUDE:
+	case COMMAND_SET_GANG_PED_MODELS:
+		CollectParameters(&m_nIp, 3);
+		CGangs::SetGangPedModels(ScriptParams[0], ScriptParams[1], ScriptParams[2]);
+		return 0;
 	case COMMAND_SET_GANG_CAR_MODEL:
 		CollectParameters(&m_nIp, 2);
 		CGangs::SetGangVehicleModel(ScriptParams[0], ScriptParams[1]);
@@ -5054,6 +5141,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 3);
 		CGangs::SetGangWeapons(ScriptParams[0], (eWeaponType)ScriptParams[1], (eWeaponType)ScriptParams[2]);
 		return 0;
+	/*
 	case COMMAND_SET_CHAR_OBJ_RUN_TO_AREA:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -5080,6 +5168,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pPed->SetObjective(OBJECTIVE_RUN_TO_AREA, pos, radius);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_OBJ_RUN_TO_COORD:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -5093,6 +5182,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pPed->SetObjective(OBJECTIVE_RUN_TO_AREA, pos);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_PLAYER_TOUCHING_OBJECT_ON_FOOT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5121,6 +5211,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		UpdateCompareFlag(isTouching);
 		return 0;
 	}
+	*/
 	case COMMAND_LOAD_SPECIAL_CHARACTER:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5138,6 +5229,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		UpdateCompareFlag(CStreaming::HasSpecialCharLoaded(ScriptParams[0] - 1));
 		return 0;
 	}
+	/*
 	case COMMAND_FLASH_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5162,10 +5254,12 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pObject->bHasBlip = (ScriptParams[1] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_PLAYER_IN_REMOTE_MODE:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CWorld::Players[ScriptParams[0]].IsPlayerInRemoteMode());
 		return 0;
+	/*
 	case COMMAND_ARM_CAR_WITH_BOMB:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5176,6 +5270,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		((CAutomobile*)pVehicle)->m_pBombRigger = FindPlayerPed();
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_PERSONALITY:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5196,6 +5291,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pPed->m_animGroup = (AssocGroupId)ScriptParams[1];
 		return 0;
 	}
+	/*
 	case COMMAND_SET_ANIM_GROUP_FOR_PLAYER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5204,6 +5300,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		pPed->m_animGroup = (AssocGroupId)ScriptParams[1];
 		return 0;
 	}
+	*/
 	case COMMAND_REQUEST_MODEL:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5238,6 +5335,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_REPEATED_PHONE_MESSAGE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5258,6 +5356,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		UpdateCompareFlag(gPhoneInfo.HasMessageBeenDisplayed(ScriptParams[0]));
 		return 0;
 	}
+	*/
 	case COMMAND_TURN_PHONE_OFF:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5271,7 +5370,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
 		CCoronas::RegisterCorona((uintptr)this + m_nIp, ScriptParams[6], ScriptParams[7], ScriptParams[8],
-			255, pos, *(float*)&ScriptParams[3], 150.0f, ScriptParams[4], ScriptParams[5], 1, 0, 0, 0.0f);
+			255, pos, *(float*)&ScriptParams[3], 150.0f, ScriptParams[4], ScriptParams[5], 1, 0, 0, 0.0f); // TODO(MIAMI): more params
 		return 0;
 	}
 	case COMMAND_DRAW_LIGHT:
@@ -5283,18 +5382,15 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 			ScriptParams[3] / 255.0f, ScriptParams[4] / 255.0f, ScriptParams[5] / 255.0f, 0, true);
 		return 0;
 	}
-	case COMMAND_STORE_WEATHER:
-		CWeather::StoreWeatherState();
-		return 0;
-	case COMMAND_RESTORE_WEATHER:
-		CWeather::RestoreWeatherState();
-		return 0;
+	//case COMMAND_STORE_WEATHER:
+	//case COMMAND_RESTORE_WEATHER:
 	case COMMAND_STORE_CLOCK:
 		CClock::StoreClock();
 		return 0;
 	case COMMAND_RESTORE_CLOCK:
 		CClock::RestoreClock();
 		return 0;
+	/*
 	case COMMAND_RESTART_CRITICAL_MISSION:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -5307,6 +5403,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CWorld::Players[CWorld::PlayerInFocus].PlayerFailedCriticalMission();
 		return 0;
 	}
+	*/
 	case COMMAND_IS_PLAYER_PLAYING:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5415,15 +5512,16 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		((CAutomobile*)pVehicle)->bFixedColour = (ScriptParams[1] == 0);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_TAXI:
 	{
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		int mi = pVehicle->GetModelIndex();
-		UpdateCompareFlag(mi == MI_TAXI || mi == MI_CABBIE || mi == MI_BORGNINE);
+		UpdateCompareFlag(pVehicle->IsTaxi());
 		return 0;
 	}
+	*/
 	case COMMAND_UNLOAD_SPECIAL_CHARACTER:
 		CollectParameters(&m_nIp, 1);
 		CStreaming::SetMissionDoesntRequireSpecialChar(ScriptParams[0] - 1);
@@ -5436,6 +5534,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		ScriptParams[0] = CDarkel::QueryModelsKilledByPlayer(ScriptParams[0]);
 		StoreParameters(&m_nIp, 1);
 		return 0;
+	/*
 	case COMMAND_ACTIVATE_GARAGE:
 		CollectParameters(&m_nIp, 1);
 		CGarages::ActivateGarage(ScriptParams[0]);
@@ -5451,6 +5550,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		}
 		return 0;
 	}
+	*/
 	case COMMAND_CREATE_OBJECT_NO_OFFSET:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -5464,6 +5564,9 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		pObj->SetOrientation(0.0f, 0.0f, 0.0f);
 		pObj->GetMatrix().UpdateRW();
 		pObj->UpdateRwFrame();
+		CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(mi);
+		if (pModelInfo->IsBuilding() && ((CSimpleModelInfo*)pModelInfo)->m_isBigBuilding)
+			pObj->SetupBigBuilding();
 		CTheScripts::ClearSpaceForMissionEntity(pos, pObj);
 		CWorld::Add(pObj);
 		ScriptParams[0] = CPools::GetObjectPool()->GetIndex(pObj);
@@ -5472,6 +5575,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_OBJECT);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_BOAT:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5506,6 +5610,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		pPed->SetObjective(OBJECTIVE_GOTO_AREA_ANY_MEANS, pos, radius);
 		return 0;
 	}
+	*/
 	//case COMMAND_SET_COLL_OBJ_GOTO_AREA_ANY_MEANS:
 	case COMMAND_IS_PLAYER_STOPPED:
 	{
@@ -5513,7 +5618,9 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]];
 		UpdateCompareFlag(CTheScripts::IsPlayerStopped(pPlayer));
 		return 0;
+	
 	}
+	/*
 	case COMMAND_IS_CHAR_STOPPED:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5536,6 +5643,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		CParticleObject::AddObject(ScriptParams[0], pos, ScriptParams[4] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_SWITCH_WIDESCREEN:
 		CollectParameters(&m_nIp, 1);
 		if (ScriptParams[0] != 0)
@@ -5543,6 +5651,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		else
 			TheCamera.SetWideScreenOff();
 		return 0;
+	/*
 	case COMMAND_ADD_SPRITE_BLIP_FOR_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5579,6 +5688,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_ADD_SPRITE_BLIP_FOR_CONTACT_POINT:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -5659,6 +5769,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 	case COMMAND_IS_PLAYER_STOPPED_IN_ANGLED_AREA_IN_CAR_3D:
 		PlayerInAngledAreaCheckCommand(command, &m_nIp);
 		return 0;
+	/*
 	case COMMAND_DEACTIVATE_GARAGE:
 		CollectParameters(&m_nIp, 1);
 		CGarages::DeActivateGarage(ScriptParams[0]);
@@ -5672,6 +5783,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 		CollectParameters(&m_nIp, 2);
 		UpdateCompareFlag(CGarages::HasThisCarBeenCollected(ScriptParams[0], ScriptParams[1] - 1));
 		return 0;
+	*/
 	default:
 		assert(0);
 	}
@@ -5681,6 +5793,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 int8 CRunningScript::ProcessCommands700To799(int32 command)
 {
 	switch (command){
+	/*
 	case COMMAND_SET_SWAT_REQUIRED:
 		CollectParameters(&m_nIp, 1);
 		FindPlayerPed()->m_pWanted->m_bSwatRequired = (ScriptParams[0] != 0);
@@ -5693,6 +5806,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 1);
 		FindPlayerPed()->m_pWanted->m_bArmyRequired = (ScriptParams[0] != 0);
 		return 0;
+	*/
 	case COMMAND_IS_CAR_IN_WATER:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5737,10 +5851,11 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 			pVehicle->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_ACCURATE;
 		pVehicle->SetStatus(STATUS_PHYSICS);
 		pVehicle->bEngineOn = true;
-		pVehicle->AutoPilot.m_nCruiseSpeed = Max(6, pVehicle->AutoPilot.m_nCruiseSpeed);
+		pVehicle->AutoPilot.m_nCruiseSpeed = Max(1, pVehicle->AutoPilot.m_nCruiseSpeed);
 		pVehicle->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
 		return 0;
 	}
+	/*
 	case COMMAND_START_PACMAN_RACE:
 		CollectParameters(&m_nIp, 1);
 		CPacManPickups::StartPacManRace(ScriptParams[0]);
@@ -5771,6 +5886,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 	case COMMAND_CLEAR_NUMBER_OF_POWER_PILLS_CARRIED:
 		CPacManPickups::ResetPowerPillsCarriedByPlayer();
 		return 0;
+	*/
 	case COMMAND_IS_CAR_ON_SCREEN:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -5795,6 +5911,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		UpdateCompareFlag(TheCamera.IsSphereVisible(pObject->GetBoundCentre(), pObject->GetBoundRadius()));
 		return 0;
 	}
+	/*
 	case COMMAND_GOSUB_FILE:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5804,6 +5921,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		// ScriptParams[1] == filename
 		return 0;
 	}
+	*/
 	case COMMAND_GET_GROUND_Z_FOR_3D_COORD:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -5831,6 +5949,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 1);
 		gFireManager.RemoveScriptFire(ScriptParams[0]);
 		return 0;
+	/*
 	case COMMAND_SET_COMEDY_CONTROLS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5839,6 +5958,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		pVehicle->bComedyControls = (ScriptParams[1] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_BOAT_GOTO_COORDS:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -5852,7 +5972,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		pBoat->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_ASTHECROWSWIMS;
 		pBoat->AutoPilot.m_vecDestinationCoors = pos;
 		pBoat->SetStatus(STATUS_PHYSICS);
-		pBoat->AutoPilot.m_nCruiseSpeed = Max(6, pBoat->AutoPilot.m_nCruiseSpeed);
+		pBoat->AutoPilot.m_nCruiseSpeed = Max(1, pBoat->AutoPilot.m_nCruiseSpeed);
 		pBoat->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
 		return 0;
 	}
@@ -5908,7 +6028,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		UpdateCompareFlag(ScriptParams[1] == pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType);
+		UpdateCompareFlag(ScriptParams[1] == pPed->GetWeapon()->m_eWeaponType);
 		return 0;
 	}
 	case COMMAND_IS_CURRENT_CHAR_WEAPON:
@@ -5916,9 +6036,10 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		UpdateCompareFlag(ScriptParams[1] == pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType);
+		UpdateCompareFlag(ScriptParams[1] == pPed->GetWeapon()->m_eWeaponType);
 		return 0;
 	}
+	/*
 	case COMMAND_CLEAR_NUMBER_OF_POWER_PILLS_EATEN:
 		CPacManPickups::ResetPowerPillsEatenInRace();
 		return 0;
@@ -5931,6 +6052,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CPacManPickups::GenerateOnePMPickUp(pos);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_BOAT_CRUISE_SPEED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -5941,6 +6063,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		pBoat->AutoPilot.m_nCruiseSpeed = *(float*)&ScriptParams[1];
 		return 0;
 	}
+	/*
 	case COMMAND_GET_RANDOM_CHAR_IN_AREA:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -5965,8 +6088,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 				continue;
 			if (pPed->bFadeOut)
 				continue;
-			if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN)
-				continue;
+//			if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN)
+//				continue;
 			if (!ThisIsAValidRandomPed(pPed->m_nPedType))
 				continue;
 			if (pPed->bIsLeader || pPed->m_leader)
@@ -5989,14 +6112,16 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_GET_RANDOM_CHAR_IN_ZONE:
 	{
 		char zone[KEY_LENGTH_IN_SCRIPT];
 		strncpy(zone, (const char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
-		int nZone = CTheZones::FindZoneByLabelAndReturnIndex(zone);
+		int nZone = CTheZones::FindZoneByLabelAndReturnIndex(zone, ZONE_DEFAULT);
 		if (nZone != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CZone* pZone = CTheZones::GetZone(nZone);
+		CZone* pZone = CTheZones::GetNavigationZone(nZone);
+		CollectParameters(&m_nIp, 3);
 		int ped_handle = -1;
 		CVector pos = FindPlayerCoors();
 		int i = CPools::GetPedPool()->GetSize();
@@ -6014,9 +6139,9 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 				continue;
 			if (pPed->bFadeOut)
 				continue;
-			if (pPed->GetModelIndex() == MI_SCUM_WOM || pPed->GetModelIndex() == MI_SCUM_MAN)
+			if (pPed->m_nWaitState != WAITSTATE_FALSE)
 				continue;
-			if (!ThisIsAValidRandomPed(pPed->m_nPedType))
+			if (!ThisIsAValidRandomPed(pPed->m_nPedType, ScriptParams[0], ScriptParams[1], ScriptParams[2]))
 				continue;
 			if (pPed->bIsLeader || pPed->m_leader)
 				continue;
@@ -6026,6 +6151,10 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 				continue;
 			if (pos.z + PED_FIND_Z_OFFSET < pPed->GetPosition().z)
 				continue;
+			bool found;
+			CWorld::FindRoofZFor3DCoord(pos.x, pos.y, pos.z, &found);
+			if (found)
+				continue;
 			ped_handle = CPools::GetPedPool()->GetIndex(pPed);
 			CTheScripts::LastRandomPedId = ped_handle;
 			pPed->CharCreatedBy = MISSION_CHAR;
@@ -6146,6 +6275,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages = ScriptParams[0];
 		return 0;
+	/*
 	case COMMAND_IS_PROJECTILE_IN_AREA:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -6216,6 +6346,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CPickups::GenerateNewOne(pos, MI_NAUTICALMINE, PICKUP_MINE_INACTIVE, 0);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_CHAR_MODEL:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6235,29 +6366,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
 		return 0;
 	}
-	case COMMAND_CREATE_CUTSCENE_HEAD:
-	{
-		CollectParameters(&m_nIp, 2);
-		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
-		assert(pObject);
-		CCutsceneHead* pCutHead = CCutsceneMgr::AddCutsceneHead(pObject, ScriptParams[1]);
-		ScriptParams[0] = CPools::GetObjectPool()->GetIndex(pCutHead);
-		StoreParameters(&m_nIp, 1);
-		return 0;
-	}
-	case COMMAND_SET_CUTSCENE_HEAD_ANIM:
-	{
-		CollectParameters(&m_nIp, 1);
-		CObject* pCutHead = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
-		assert(pCutHead);
-		char name[KEY_LENGTH_IN_SCRIPT];
-		strncpy(name, (const char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
-		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CTimer::Stop();
-		CCutsceneMgr::SetHeadAnim(name, pCutHead);
-		CTimer::Update();
-		return 0;
-	}
+	//case COMMAND_CREATE_CUTSCENE_HEAD:
+	//case COMMAND_SET_CUTSCENE_HEAD_ANIM:
 	case COMMAND_SIN:
 		CollectParameters(&m_nIp, 1);
 		*(float*)&ScriptParams[0] = Sin(DEGTORAD(*(float*)&ScriptParams[0]));
@@ -6290,6 +6400,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CGarages::ChangeGarageType(ScriptParams[0], (eGarageType)ScriptParams[1], 0);
 		return 0;
+	/*
 	case COMMAND_ACTIVATE_CRUSHER_CRANE:
 	{
 		CollectParameters(&m_nIp, 10);
@@ -6318,6 +6429,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageWithNumber(text, ScriptParams[2], ScriptParams[3], ScriptParams[0], ScriptParams[1], -1, -1, -1, -1);
 		return 0;
 	}
+	*/
 	case COMMAND_PRINT_WITH_2_NUMBERS_NOW:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6325,6 +6437,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageJumpQWithNumber(text, ScriptParams[2], ScriptParams[3], ScriptParams[0], ScriptParams[1], -1, -1, -1, -1);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_2_NUMBERS_SOON:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6332,6 +6445,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageSoonWithNumber(text, ScriptParams[2], ScriptParams[3], ScriptParams[0], ScriptParams[1], -1, -1, -1, -1);
 		return 0;
 	}
+	*/
 	case COMMAND_PRINT_WITH_3_NUMBERS:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6339,6 +6453,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageWithNumber(text, ScriptParams[3], ScriptParams[4], ScriptParams[0], ScriptParams[1], ScriptParams[2], -1, -1, -1);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_3_NUMBERS_NOW:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6353,6 +6468,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageSoonWithNumber(text, ScriptParams[3], ScriptParams[4], ScriptParams[0], ScriptParams[1], ScriptParams[2], -1, -1, -1);
 		return 0;
 	}
+	*/
 	case COMMAND_PRINT_WITH_4_NUMBERS:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6360,6 +6476,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageWithNumber(text, ScriptParams[4], ScriptParams[5], ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], -1, -1);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_4_NUMBERS_NOW:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6395,6 +6512,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageSoonWithNumber(text, ScriptParams[5], ScriptParams[6], ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], ScriptParams[4], -1);
 		return 0;
 	}
+	*/
 	case COMMAND_PRINT_WITH_6_NUMBERS:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6402,6 +6520,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		CMessages::AddMessageWithNumber(text, ScriptParams[6], ScriptParams[7], ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], ScriptParams[4], ScriptParams[5]);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_6_NUMBERS_NOW:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -6427,6 +6546,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		pPed->SetFormation((eFormation)ScriptParams[2]);
 		return 0;
 	}
+	*/
 	case COMMAND_PLAYER_MADE_PROGRESS:
 		CollectParameters(&m_nIp, 1);
 		CStats::ProgressMade += ScriptParams[0];
@@ -6434,6 +6554,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 	case COMMAND_SET_PROGRESS_TOTAL:
 		CollectParameters(&m_nIp, 1);
 		CStats::TotalProgressInGame = ScriptParams[0];
+		if (CGame::germanGame)
+			CStats::TotalProgressInGame -= 2;
 		return 0;
 	case COMMAND_REGISTER_JUMP_DISTANCE:
 		CollectParameters(&m_nIp, 1);
@@ -6480,6 +6602,8 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		strncpy(CStats::LastMissionPassedName, name, KEY_LENGTH_IN_SCRIPT);
 		++CStats::MissionsPassed;
 		CStats::CheckPointReachedSuccessfully();
+		CTheScripts::LastMissionPassedTime = CTimer::GetTimeInMilliseconds();
+		CGameLogic::RemoveShortCutDropOffPointForMission();
 		return 0;
 	}
 	case COMMAND_SET_CHAR_RUNNING:
@@ -6493,6 +6617,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 	case COMMAND_REMOVE_ALL_SCRIPT_FIRES:
 		gFireManager.RemoveAllScriptFires();
 		return 0;
+	/*
 	case COMMAND_IS_FIRST_CAR_COLOUR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6509,22 +6634,37 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 		UpdateCompareFlag(pVehicle->m_currentColour2 == ScriptParams[1]);
 		return 0;
 	}
+	*/
 	case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_WEAPON:
 	{
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		bool result = false;
 		if (!pPed)
 			printf("HAS_CHAR_BEEN_DAMAGED_BY_WEAPON - Character doesn't exist\n");
-		UpdateCompareFlag(pPed && pPed->m_lastWepDam == ScriptParams[1]);
+		else {
+			if (ScriptParams[1] == WEAPONTYPE_ANYMELEE || ScriptParams[1] == WEAPONTYPE_ANYWEAPON)
+				result = CheckDamagedWeaponType(pPed->m_lastWepDam, ScriptParams[1]);
+			else
+				result = ScriptParams[1] == pPed->m_lastWepDam;
+		}
+		UpdateCompareFlag(result);
 		return 0;
 	}
 	case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_WEAPON:
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		bool result = false;
 		if (!pVehicle)
 			printf("HAS_CAR_BEEN_DAMAGED_BY_WEAPON - Vehicle doesn't exist\n");
-		UpdateCompareFlag(pVehicle && pVehicle->m_nLastWeaponDamage == ScriptParams[1]);
+		else {
+			if (ScriptParams[1] == WEAPONTYPE_ANYMELEE || ScriptParams[1] == WEAPONTYPE_ANYWEAPON)
+				result = CheckDamagedWeaponType(pVehicle->m_nLastWeaponDamage, ScriptParams[1]);
+			else
+				result = ScriptParams[1] == pVehicle->m_nLastWeaponDamage;
+		}
+		UpdateCompareFlag(result);
 		return 0;
 	}
 	case COMMAND_IS_CHAR_IN_CHARS_GROUP:
@@ -6561,17 +6701,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		if (pPed->m_nPedState == PED_DRIVING) {
-			pPed->SetDead();
-			if (!pPed->IsPlayer())
-				pPed->FlagToDestroyWhenNextProcessed();
-		}
-		else if (CGame::nastyGame && pPed->IsPedInControl()) {
-			pPed->ApplyHeadShot(WEAPONTYPE_SNIPERRIFLE, pPed->GetNodePosition(PED_HEAD), true);
-		}
-		else {
-			pPed->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
-		}
+		pPed->InflictDamage(nil, WEAPONTYPE_SNIPERRIFLE, 1000.0f, PEDPIECE_HEAD, 0);
 		return 0;
 	}
 	case COMMAND_EXPLODE_PLAYER_HEAD:
@@ -6579,12 +6709,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		if (CGame::nastyGame) {
-			pPed->ApplyHeadShot(WEAPONTYPE_SNIPERRIFLE, pPed->GetNodePosition(PED_HEAD), true);
-		}
-		else {
-			pPed->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
-		}
+		pPed->InflictDamage(nil, WEAPONTYPE_SNIPERRIFLE, 1000.0f, PEDPIECE_HEAD, 0);
 		return 0;
 	}
 	case COMMAND_ANCHOR_BOAT:
@@ -6601,7 +6726,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, zone);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
 		CollectParameters(&m_nIp, 2);
-		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone);
+		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone, ZONE_INFO);
 		if (zone_id < 0) {
 			printf("Couldn't find zone - %s\n", zone);
 			return 0;
@@ -6640,6 +6765,10 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 			CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
 			if (!pVehicle)
 				continue;
+			if (pVehicle->GetVehicleAppearance() != VEHICLE_APPEARANCE_CAR && pVehicle->GetVehicleAppearance() != VEHICLE_APPEARANCE_BIKE)
+				continue;
+			if (!pVehicle->bUsesCollision)
+				continue;
 			if (ScriptParams[4] != pVehicle->GetModelIndex() && ScriptParams[4] >= 0)
 				continue;
 			if (pVehicle->VehicleCreatedBy != RANDOM_VEHICLE)
@@ -6657,14 +6786,15 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_GET_RANDOM_CAR_OF_TYPE_IN_ZONE:
 	{
 		char zone[KEY_LENGTH_IN_SCRIPT];
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, zone);
-		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone);
+		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone, ZONE_DEFAULT);
 		if (zone_id != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CZone* pZone = CTheZones::GetZone(zone_id);
+		CZone* pZone = CTheZones::GetNavigationZone(zone_id);
 		CollectParameters(&m_nIp, 1);
 		int handle = -1;
 		uint32 i = CPools::GetVehiclePool()->GetSize();
@@ -6689,6 +6819,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_HAS_RESPRAY_HAPPENED:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -6728,6 +6859,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CCarAI::TellCarToRamOtherCar(pVehicle, pTarget);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CAR_BLOCK_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6747,6 +6879,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pPed->SetObjective(OBJECTIVE_CATCH_TRAIN);
 		return 0;
 	}
+	*/
 	//case COMMAND_SET_COLL_OBJ_CATCH_TRAIN:
 	case COMMAND_SET_PLAYER_NEVER_GETS_TIRED:
 	{
@@ -6770,6 +6903,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pPed->bPedIsBleeding = (ScriptParams[1] != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CAR_FUNNY_SUSPENSION:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6788,6 +6922,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pCar->bBigWheels = (ScriptParams[1] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_FREE_RESPRAYS:
 		CollectParameters(&m_nIp, 1);
 		CGarages::SetFreeResprays(ScriptParams[0] != 0);
@@ -6808,6 +6943,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pPed->bIsVisible = (ScriptParams[1] != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CAR_VISIBLE:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6816,6 +6952,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pVehicle->bIsVisible = (ScriptParams[1] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_AREA_OCCUPIED:
 	{
 		CollectParameters(&m_nIp, 11);
@@ -6843,6 +6980,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		UpdateCompareFlag(total > 0);
 		return 0;
 	}
+	/*
 	case COMMAND_START_DRUG_RUN:
 		CPlane::CreateIncomingCesna();
 		return 0;
@@ -6856,6 +6994,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 1);
 		gFireManager.ExtinguishPoint(CWorld::Players[ScriptParams[0]].GetPos(), 3.0f);
 		return 0;
+	*/
 	case COMMAND_DISPLAY_TEXT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -6902,18 +7041,21 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_fWrapX = *(float*)&ScriptParams[0];
 		return 0;
 	}
+	/*
 	case COMMAND_SET_TEXT_CENTRE_SIZE:
 	{
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_fCenterSize = *(float*)&ScriptParams[0];
 		return 0;
 	}
+	*/
 	case COMMAND_SET_TEXT_BACKGROUND:
 	{
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_bBackground = (ScriptParams[0] != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_TEXT_BACKGROUND_COLOUR:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -6927,12 +7069,14 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_bBackgroundOnly = (ScriptParams[0] != 0);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_TEXT_PROPORTIONAL:
 	{
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_bTextProportional = (ScriptParams[0] != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_TEXT_FONT:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -6950,6 +7094,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 	case COMMAND_SUBURBAN_PASSED:
 		CStats::SuburbanPassed = true;
 		return 0;
+	*/
 	case COMMAND_ROTATE_OBJECT:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -7067,28 +7212,16 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		if (pPed && pPed->CharCreatedBy == MISSION_CHAR){
 			CWorld::RemoveReferencesToDeletedObject(pPed);
-			if (pPed->bInVehicle){
-				if (pPed->m_pMyVehicle){
-					if (pPed == pPed->m_pMyVehicle->pDriver){
-						pPed->m_pMyVehicle->RemoveDriver();
-						pPed->m_pMyVehicle->SetStatus(STATUS_ABANDONED);
-						if (pPed->m_pMyVehicle->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
-							pPed->m_pMyVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-						if (pPed->m_nPedType == PEDTYPE_COP && pPed->m_pMyVehicle->IsLawEnforcementVehicle())
-							pPed->m_pMyVehicle->ChangeLawEnforcerState(0);
-					}else{
-						pPed->m_pMyVehicle->RemovePassenger(pPed);
-					}
-				}
-				delete pPed;
-				--CPopulation::ms_nTotalMissionPeds;
-			}else{
+			if (pPed->bInVehicle && pPed->m_pMyVehicle)
+				CTheScripts::RemoveThisPed(pPed);
+			else{
 				pPed->CharCreatedBy = RANDOM_CHAR;
 				pPed->bRespondsToThreats = true;
 				pPed->bScriptObjectiveCompleted = false;
 				pPed->ClearLeader();
 				--CPopulation::ms_nTotalMissionPeds;
 				pPed->bFadeOut = true;
+				CWorld::RemoveReferencesToDeletedObject(pPed);
 			}
 		}
 		if (m_bIsMissionScript)
@@ -7103,9 +7236,11 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pPed->bKindaStayInSamePlace = (ScriptParams[1] != 0);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_NASTY_GAME:
 		UpdateCompareFlag(CGame::nastyGame);
 		return 0;
+	*/
 	case COMMAND_UNDRESS_CHAR:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -7115,13 +7250,8 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, name);
 		for (int i = 0; i < KEY_LENGTH_IN_SCRIPT; i++)
 			name[i] = tolower(name[i]);
-		int mi = pPed->GetModelIndex();
-		pPed->DeleteRwObject();
-		if (pPed->IsPlayer())
-			mi = 0;
-		CStreaming::RequestSpecialModel(mi, name, STREAMFLAGS_DEPENDENCY | STREAMFLAGS_SCRIPTOWNED);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CWorld::Remove(pPed);
+		pPed->Undress(name);
 		return 0;
 	}
 	case COMMAND_DRESS_CHAR:
@@ -7129,12 +7259,10 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		int mi = pPed->GetModelIndex();
-		pPed->m_modelIndex = -1;
-		pPed->SetModelIndex(mi);
-		CWorld::Add(pPed);
+		pPed->Dress();
 		return 0;
 	}
+	/*
 	case COMMAND_START_CHASE_SCENE:
 		CollectParameters(&m_nIp, 1);
 		CTimer::Suspend();
@@ -7175,10 +7303,11 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 1);
 		char zone[KEY_LENGTH_IN_SCRIPT];
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, zone);
-		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone);
+// TODO(MIAMI): just getting this to compile with new argument
+		int zone_id = CTheZones::FindZoneByLabelAndReturnIndex(zone, ZONE_DEFAULT);
 		if (zone_id != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CZone* pZone = CTheZones::GetZone(zone_id);
+		CZone* pZone = CTheZones::GetNavigationZone(zone_id);
 		UpdateCompareFlag(CExplosion::TestForExplosionInArea((eExplosionType)ScriptParams[0],
 			pZone->minx, pZone->maxx, pZone->miny, pZone->maxy, pZone->minz, pZone->maxz));
 		return 0;
@@ -7206,6 +7335,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_PLACE_OBJECT_RELATIVE_TO_CAR:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -7232,7 +7362,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPlayerPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPlayerPed);
-		pPlayerPed->m_fArmour = clamp(pPlayerPed->m_fArmour + ScriptParams[1], 0.0f, 100.0f);
+		pPlayerPed->m_fArmour = clamp(pPlayerPed->m_fArmour + ScriptParams[1], 0.0f, CWorld::Players[ScriptParams[0]].m_nMaxArmour);
 		return 0;
 	}
 	case COMMAND_ADD_ARMOUR_TO_CHAR:
@@ -7258,7 +7388,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 	case COMMAND_WARP_CHAR_FROM_CAR_TO_COORD:
 	{
 		CollectParameters(&m_nIp, 4);
-		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CPed *pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
 		CVector pos = *(CVector*)&ScriptParams[1];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
@@ -7271,26 +7401,54 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 				pPed->m_pMyVehicle->SetStatus(STATUS_ABANDONED);
 				pPed->m_pMyVehicle->bEngineOn = false;
 				pPed->m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
+				pPed->m_pMyVehicle->SetMoveSpeed(0.0f, 0.0f, -0.00001f);
+				pPed->m_pMyVehicle->SetTurnSpeed(0.0f, 0.0f, 0.0f);
 			}else{
 				pPed->m_pMyVehicle->RemovePassenger(pPed);
 			}
-			pPed->m_pMyVehicle->SetMoveSpeed(0.0f, 0.0f, -0.00001f);
-			pPed->m_pMyVehicle->SetTurnSpeed(0.0f, 0.0f, 0.0f);
+			if (pPed->m_vehEnterType) {
+				if (pPed->GetPedState() == PED_EXIT_CAR || pPed->GetPedState() == PED_DRAG_FROM_CAR) {
+					uint8 flags = 0;
+					if (pPed->m_pMyVehicle->IsBike()) {
+						if (pPed->m_vehEnterType == CAR_DOOR_LF ||
+							pPed->m_vehEnterType == CAR_DOOR_RF ||
+							pPed->m_vehEnterType == CAR_WINDSCREEN)
+							flags = CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_RF;
+						else if (pPed->m_vehEnterType == CAR_DOOR_LR ||
+							pPed->m_vehEnterType == CAR_DOOR_RR)
+							flags = CAR_DOOR_FLAG_LR | CAR_DOOR_FLAG_RR;
+					}
+					else {
+						switch (pPed->m_vehEnterType) {
+						case CAR_DOOR_LF:
+							flags = pPed->m_pMyVehicle->m_nNumMaxPassengers != 0 ? CAR_DOOR_FLAG_LF : CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+						case CAR_DOOR_LR:
+							flags = pPed->m_pMyVehicle->m_nNumMaxPassengers != 0 ? CAR_DOOR_FLAG_RF : CAR_DOOR_FLAG_LF | CAR_DOOR_FLAG_LR;
+						case CAR_DOOR_RF:
+							flags = CAR_DOOR_FLAG_RF;
+						case CAR_DOOR_RR:
+							flags = CAR_DOOR_FLAG_RR;
+						}
+					}
+					pPed->m_pMyVehicle->m_nGettingOutFlags &= ~flags;
+					pPed->m_pMyVehicle->ProcessOpenDoor(pPed->m_vehEnterType, NUM_STD_ANIMS, 0.0f);
+				}
+			}
 		}
+		pPed->RemoveInCarAnims();
 		pPed->bInVehicle = false;
 		pPed->m_pMyVehicle = nil;
 		pPed->SetPedState(PED_IDLE);
 		pPed->m_nLastPedState = PED_NONE;
 		pPed->bUsesCollision = true;
 		pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
-		pPed->AddWeaponModel(CWeaponInfo::GetWeaponInfo(pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType)->m_nModelId);
-		pPed->RemoveInCarAnims();
+		pPed->ReplaceWeaponWhenExitingVehicle();
 		if (pPed->m_pVehicleAnim)
 			pPed->m_pVehicleAnim->blendDelta = -1000.0f;
 		pPed->m_pVehicleAnim = nil;
 		pPed->RestartNonPartialAnims();
 		pPed->SetMoveState(PEDMOVE_NONE);
-		CAnimManager::BlendAnimation(pPed->GetClump(), pPed->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
+		CAnimManager::BlendAnimation(pPed->GetClump(), pPed->m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
 		pos.z += pPed->GetDistanceFromCentreOfMassToBaseOfModel();
 		pPed->Teleport(pos);
 		CTheScripts::ClearSpaceForMissionEntity(pos, pPed);
@@ -7310,7 +7468,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		if (total == 0)
 			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(LEVEL_NONE), pos, range, true, &total, 16, apEntities);
 		if (total == 0)
-			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, range, true, &total, 16, apEntities);
+			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(CTheZones::GetLevelFromPosition(&pos)), pos, range, true, &total, 16, apEntities);
 		CEntity* pClosestEntity = nil;
 		float min_dist = 2.0f * range;
 		for (int i = 0; i < total; i++) {
@@ -7326,6 +7484,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		}
 		return 0;
 	}
+	/*
 	case COMMAND_HAS_CHAR_SPOTTED_CHAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -7336,6 +7495,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		UpdateCompareFlag(pPed->OurPedCanSeeThisOne(pTarget));
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_OBJ_HAIL_TAXI:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -7353,6 +7513,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		UpdateCompareFlag(pObject->bRenderDamaged || !pObject->bIsVisible);
 		return 0;
 	}
+	/*
 	case COMMAND_START_KILL_FRENZY_HEADSHOT:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -7383,6 +7544,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 			*(float*)&ScriptParams[0], *(float*)&ScriptParams[1]);
 		return 0;
 	}
+	*/
 	case COMMAND_WARP_PLAYER_INTO_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -7414,6 +7576,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CMessages::AddBigMessageWithNumber(text, ScriptParams[2], ScriptParams[3] - 1, ScriptParams[0], ScriptParams[1], -1, -1, -1, -1);
 		return 0;
 	}
+	/*
 	case COMMAND_PRINT_WITH_3_NUMBERS_BIG:
 	{
 		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
@@ -7442,6 +7605,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CMessages::AddBigMessageWithNumber(text, ScriptParams[6], ScriptParams[7] - 1, ScriptParams[0], ScriptParams[1], ScriptParams[2], ScriptParams[3], ScriptParams[4], ScriptParams[5]);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_WAIT_STATE:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -7453,6 +7617,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 	case COMMAND_SET_CAMERA_BEHIND_PLAYER:
 		TheCamera.SetCameraDirectlyBehindForFollowPed_CamOnAString();
 		return 0;
+	/*
 	case COMMAND_SET_MOTION_BLUR:
 		CollectParameters(&m_nIp, 1);
 		TheCamera.SetMotionBlur(0, 0, 0, 0, ScriptParams[0]);
@@ -7465,6 +7630,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CMessages::AddMessageWithString(text, ScriptParams[0], ScriptParams[1], string);
 		return 0;
 	}
+	*/
 	case COMMAND_CREATE_RANDOM_CHAR:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -7487,6 +7653,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		ped->CharCreatedBy = MISSION_CHAR;
 		ped->bRespondsToThreats = false;
 		ped->bAllowMedicsToReviveMe = false;
+		ped->bIsPlayerFriend = false;
 		CVector pos = *(CVector*)&ScriptParams[0];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
@@ -7494,6 +7661,8 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		ped->SetPosition(pos);
 		ped->SetOrientation(0.0f, 0.0f, 0.0f);
 		CTheScripts::ClearSpaceForMissionEntity(pos, ped);
+		if (m_bIsMissionScript)
+			ped->bIsStaticWaitingForCollision = true;
 		CWorld::Add(ped);
 		ped->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pos);
 		CPopulation::ms_nTotalMissionPeds++;
@@ -7512,6 +7681,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		pPed->SetObjective(OBJECTIVE_STEAL_ANY_CAR);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_2_REPEATED_PHONE_MESSAGES:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -7566,6 +7736,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		gPhoneInfo.SetPhoneMessage_JustOnce(ScriptParams[0], text1, text2, text3, text4, nil, nil);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_SNIPER_BULLET_IN_AREA:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -7590,9 +7761,11 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		UpdateCompareFlag(CBulletInfo::TestForSniperBullet(infX, supX, infY, supY, infZ, supZ));
 		return 0;
 	}
+	/*
 	case COMMAND_GIVE_PLAYER_DETONATOR:
 		CGarages::GivePlayerDetonator();
 		return 0;
+	*/
 	//case COMMAND_SET_COLL_OBJ_STEAL_ANY_CAR:
 	case COMMAND_SET_OBJECT_VELOCITY:
 	{
@@ -7642,6 +7815,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		return 0;
 	}
 	//case COMMAND_PRINT_STRING_IN_STRING_SOON:
+	/*
 	case COMMAND_SET_5_REPEATED_PHONE_MESSAGES:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -7688,6 +7862,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		gPhoneInfo.SetPhoneMessage_JustOnce(ScriptParams[0], text1, text2, text3, text4, text5, text6);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_POINT_OBSCURED_BY_A_MISSION_ENTITY:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -7718,16 +7893,24 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		return 0;
 	}
 	case COMMAND_LOAD_ALL_MODELS_NOW:
+#ifdef FIX_BUGS
+		CTimer::Suspend();
+#else
 		CTimer::Stop();
+#endif
 		CStreaming::LoadAllRequestedModels(false);
+#ifdef FIX_BUGS
+		CTimer::Resume();
+#else
 		CTimer::Update();
+#endif
 		return 0;
 	case COMMAND_ADD_TO_OBJECT_VELOCITY:
 	{
 		CollectParameters(&m_nIp, 4);
 		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
 		assert(pObject);
-		pObject->SetMoveSpeed(pObject->GetMoveSpeed() + 0.02f * *(CVector*)&ScriptParams[1]);
+		pObject->SetMoveSpeed(pObject->GetMoveSpeed() + *(CVector*)&ScriptParams[1] / METERS_PER_SECOND_TO_GAME_SPEED);
 		return 0;
 	}
 	case COMMAND_DRAW_SPRITE:
@@ -7781,9 +7964,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	}
 	case COMMAND_REMOVE_TEXTURE_DICTIONARY:
 	{
-		for (int i = 0; i < ARRAY_SIZE(CTheScripts::ScriptSprites); i++)
-			CTheScripts::ScriptSprites[i].Delete();
-		CTxdStore::RemoveTxd(CTxdStore::FindTxdSlot("script"));
+		CTheScripts::RemoveScriptTextureDictionary();
 		return 0;
 	}
 	case COMMAND_SET_OBJECT_DYNAMIC:
@@ -7805,6 +7986,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		}
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_ANIM_SPEED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -7815,6 +7997,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 			pAssoc->speed = *(float*)&ScriptParams[1];
 		return 0;
 	}
+	*/
 	case COMMAND_PLAY_MISSION_PASSED_TUNE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -7843,6 +8026,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		pVehicle->m_bSirenOrAlarm = ScriptParams[1] != 0;
 		return 0;
 	}
+	/*
 	case COMMAND_SWITCH_PED_ROADS_ON_ANGLED:
 	{
 		CollectParameters(&m_nIp, 7);
@@ -7865,14 +8049,20 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		ThePaths.SwitchRoadsInAngledArea(*(float*)&ScriptParams[0], *(float*)&ScriptParams[1], *(float*)&ScriptParams[2],
 			*(float*)&ScriptParams[3], *(float*)&ScriptParams[4], *(float*)&ScriptParams[5], *(float*)&ScriptParams[6], 1, 0);
 		return 0;
+	*/
 	case COMMAND_SET_CAR_WATERTIGHT:
 	{
 		CollectParameters(&m_nIp, 2);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		assert(pVehicle->m_vehType == VEHICLE_TYPE_CAR);
-		CAutomobile* pCar = (CAutomobile*)pVehicle;
-		pCar->bWaterTight = ScriptParams[1] != 0;
+		if (pVehicle->IsBike()) {
+			CBike* pBike = (CBike*)pVehicle;
+			pBike->bWaterTight = ScriptParams[1] != 0;
+		}
+		else if (pVehicle->IsCar()) {
+			CAutomobile* pCar = (CAutomobile*)pVehicle;
+			pCar->bWaterTight = ScriptParams[1] != 0;
+		}
 		return 0;
 	}
 	case COMMAND_ADD_MOVING_PARTICLE_EFFECT:
@@ -7916,6 +8106,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		pVehicle->SetHeading(heading);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_CRANE_LIFTING_CAR:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -7923,6 +8114,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		UpdateCompareFlag(CCranes::IsThisCarPickedUp(*(float*)&ScriptParams[0], *(float*)&ScriptParams[1], pVehicle));
 		return 0;
 	}
+	*/
 	case COMMAND_DRAW_SPHERE:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -7959,6 +8151,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		strncpy(m_abScriptName, str, KEY_LENGTH_IN_SCRIPT);
 		return 0;
 	}
+	/*
 	case COMMAND_CHANGE_GARAGE_TYPE_WITH_CAR_MODEL:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -7969,6 +8162,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		*(CVector*)&ScriptParams[0] = CPlane::FindDrugPlaneCoordinates();
 		StoreParameters(&m_nIp, 3);
 		return 0;
+	*/
 	case COMMAND_SAVE_INT_TO_DEBUG_FILE:
 		// TODO: implement something here
 		CollectParameters(&m_nIp, 1);
@@ -7996,7 +8190,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		return 0;
 	case COMMAND_SWITCH_RUBBISH:
 		CollectParameters(&m_nIp, 1);
-		CRubbish::SetVisibility(ScriptParams[0] != 0);;
+		CRubbish::SetVisibility(ScriptParams[0] != 0);
 		return 0;
 	case COMMAND_REMOVE_PARTICLE_EFFECTS_IN_AREA:
 	{
@@ -8035,6 +8229,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CGarages::IsGarageClosed(ScriptParams[0]));
 		return 0;
+	/*
 	case COMMAND_START_CATALINA_HELI:
 		CHeli::StartCatalinaFlyBy();
 		return 0;
@@ -8047,6 +8242,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	case COMMAND_HAS_CATALINA_HELI_BEEN_SHOT_DOWN:
 		UpdateCompareFlag(CHeli::HasCatalinaBeenShotDown());
 		return 0;
+	*/
 	case COMMAND_SWAP_NEAREST_BUILDING_MODEL:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -8062,7 +8258,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (total == 0)
 			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(LEVEL_NONE), pos, radius, true, &total, 16, apEntities);
 		if (total == 0)
-			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, radius, true, &total, 16, apEntities);
+			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(CTheZones::GetLevelFromPosition(&pos)), pos, radius, true, &total, 16, apEntities);
 		CEntity* pClosestEntity = nil;
 		float min_dist = 2.0f * radius;
 		for (int i = 0; i < total; i++) {
@@ -8093,6 +8289,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		pPed->ClearWeapons();
 		return 0;
 	}
+	/*
 	case COMMAND_GRAB_CATALINA_HELI:
 	{
 		CHeli* pHeli = CHeli::FindPointerToCatalinasHeli();
@@ -8100,6 +8297,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_CLEAR_AREA_OF_CARS:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -8144,9 +8342,11 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::RemoveScriptSphere(ScriptParams[0]);
 		return 0;
+	/*
 	case COMMAND_CATALINA_HELI_FLY_AWAY:
 		CHeli::MakeCatalinaHeliFlyAway();
 		return 0;
+	*/
 	case COMMAND_SET_EVERYONE_IGNORE_PLAYER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8181,18 +8381,21 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_PHONE_DISPLAYING_MESSAGE:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(gPhoneInfo.IsMessageBeingDisplayed(ScriptParams[0]));
 		return 0;
+	*/
 	case COMMAND_DISPLAY_ONSCREEN_TIMER_WITH_STRING:
 	{
 		assert(CTheScripts::ScriptSpace[m_nIp++] == ARGUMENT_GLOBALVAR);
 		int16 var = CTheScripts::Read2BytesFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 1);
 		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
 		strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddClock(var, onscreen_str);
+		CUserDisplay::OnscnTimer.AddClock(var, onscreen_str, ScriptParams[0] != 0);
 		return 0;
 	}
 	case COMMAND_DISPLAY_ONSCREEN_COUNTER_WITH_STRING:
@@ -8203,7 +8406,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
 		strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CUserDisplay::OnscnTimer.AddCounter(var, ScriptParams[0], onscreen_str);
+		CUserDisplay::OnscnTimer.AddCounter(var, ScriptParams[0], onscreen_str, 0);
 		return 0;
 	}
 	case COMMAND_CREATE_RANDOM_CAR_FOR_CAR_PARK:
@@ -8228,15 +8431,17 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 				switch (model) {
 				case MI_LANDSTAL:
 				case MI_LINERUN:
+				case MI_RIO:
 				case MI_FIRETRUCK:
 				case MI_TRASH:
 				case MI_STRETCH:
+				case MI_VOODOO:
 				case MI_MULE:
 				case MI_AMBULAN:
 				case MI_FBICAR:
 				case MI_MRWHOOP:
 				case MI_BFINJECT:
-				case MI_CORPSE:
+				case MI_HUNTER:
 				case MI_POLICE:
 				case MI_ENFORCER:
 				case MI_SECURICA:
@@ -8244,56 +8449,95 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 				case MI_BUS:
 				case MI_RHINO:
 				case MI_BARRACKS:
-				case MI_TRAIN:
+				case MI_CUBAN:
 				case MI_CHOPPER:
-				case MI_DODO:
+				case MI_ANGEL:
 				case MI_COACH:
 				case MI_RCBANDIT:
-				case MI_BELLYUP:
-				case MI_MRWONGS:
-				case MI_MAFIA:
-				case MI_YARDIE:
-				case MI_YAKUZA:
-				case MI_DIABLOS:
-				case MI_COLUMB:
-				case MI_HOODS:
+				case MI_ROMERO:
+				case MI_PACKER:
+				case MI_SENTXS:
+				case MI_SQUALO:
+				case MI_SEASPAR:
+				case MI_PIZZABOY:
+				case MI_GANGBUR:
 				case MI_AIRTRAIN:
 				case MI_DEADDODO:
 				case MI_SPEEDER:
 				case MI_REEFER:
-				case MI_PANLANT:
+				case MI_TROPIC:
 				case MI_FLATBED:
 				case MI_YANKEE:
-				case MI_ESCAPE:
-				case MI_BORGNINE:
-				case MI_TOYZ:
-				case MI_GHOST:
-				case MI_MIAMI_RCBARON:
-				case MI_MIAMI_RCRAIDER:
+				case MI_CADDY:
+				case MI_ZEBRA:
+				case MI_TOPFUN:
+				case MI_SKIMMER:
+				case MI_RCBARON:
+				case MI_RCRAIDER:
+				case MI_SPARROW:
+				case MI_PATRIOT:
+				case MI_LOVEFIST:
+				case MI_COASTG:
+				case MI_DINGHY:
+				case MI_HERMES:
+				case MI_SABRETUR:
+				case MI_PHEONIX:
+				case MI_WALTON:
+				case MI_COMET:
+				case MI_DELUXO:
+				case MI_BURRITO:
+				case MI_SPAND:
+				case MI_MARQUIS:
+				case MI_BAGGAGE:
+				case MI_KAUFMAN:
+				case MI_MAVERICK:
+				case MI_VCNMAV:
+				case MI_RANCHER:
+				case MI_FBIRANCH:
+				case MI_JETMAX:
+				case MI_HOTRING:
+				case MI_SANDKING:
+				case MI_BLISTAC:
+				case MI_POLMAV:
+				case MI_BOXVILLE:
+				case MI_BENSON:
+				case MI_MESA:
+				case MI_RCGOBLIN:
+				case MI_HOTRINA:
+				case MI_HOTRINB:
+				case MI_BLOODRA:
+				case MI_BLOODRB:
+				case MI_VICECHEE:
 					model = -1;
 					break;
 				case MI_IDAHO:
 				case MI_STINGER:
 				case MI_PEREN:
 				case MI_SENTINEL:
-				case MI_PATRIOT:
 				case MI_MANANA:
 				case MI_INFERNUS:
-				case MI_BLISTA:
 				case MI_PONY:
 				case MI_CHEETAH:
 				case MI_MOONBEAM:
 				case MI_ESPERANT:
 				case MI_TAXI:
-				case MI_KURUMA:
+				case MI_WASHING:
 				case MI_BOBCAT:
 				case MI_BANSHEE:
 				case MI_CABBIE:
 				case MI_STALLION:
 				case MI_RUMPO:
-				case 151:
-				case 152:
-				case 153:
+				case MI_ADMIRAL:
+				case MI_PCJ600:
+				case MI_FAGGIO:
+				case MI_FREEWAY:
+				case MI_GLENDALE:
+				case MI_OCEANIC:
+				case MI_SANCHEZ:
+				case MI_SABRE:
+				case MI_REGINA:
+				case MI_VIRGO:
+				case MI_GREENWOO:
 					break;
 				default:
 					printf("CREATE_RANDOM_CAR_FOR_CAR_PARK - Unknown car model %d\n", CStreaming::ms_vehiclesLoaded[index]);
@@ -8309,7 +8553,11 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (model == -1)
 			return 0;
 		CVehicle* car;
-		if (!CModelInfo::IsBikeModel(model))
+		if (CModelInfo::IsBikeModel(model)) {
+			car = new CBike(model, MISSION_VEHICLE);
+			((CBike*)(car))->bIsStanding = true;
+		}
+		else
 			car = new CAutomobile(model, MISSION_VEHICLE);
 		CVector pos = *(CVector*)&ScriptParams[0];
 		pos.z += car->GetDistanceFromCentreOfMassToBaseOfModel();
@@ -8330,10 +8578,12 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CWorld::Add(car);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_COLLISION_IN_MEMORY:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CCollision::ms_collisionInMemory == ScriptParams[0]);
 		return 0;
+	*/
 	case COMMAND_SET_WANTED_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
 		FindPlayerPed()->m_pWanted->m_fCrimeSensitivity = *(float*)&ScriptParams[0];
@@ -8341,6 +8591,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	case COMMAND_SET_CAMERA_IN_FRONT_OF_PLAYER:
 		TheCamera.SetCameraDirectlyInFrontForFollowPed_CamOnAString();
 		return 0;
+	/*
 	case COMMAND_IS_CAR_VISIBLY_DAMAGED:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -8349,6 +8600,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		UpdateCompareFlag(pVehicle->bIsDamaged);
 		return 0;
 	}
+	*/
 	case COMMAND_DOES_OBJECT_EXIST:
 		CollectParameters(&m_nIp, 1);
 		UpdateCompareFlag(CPools::GetObjectPool()->GetAt(ScriptParams[0]));
@@ -8357,9 +8609,17 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	{
 		CollectParameters(&m_nIp, 3);
 		CVector pos = *(CVector*)&ScriptParams[0];
+#ifdef FIX_BUGS
+		CTimer::Suspend();
+#else
 		CTimer::Stop();
+#endif
 		CStreaming::LoadScene(pos);
+#ifdef FIX_BUGS
+		CTimer::Suspend();
+#else
 		CTimer::Update();
+#endif
 		return 0;
 	}
 	case COMMAND_ADD_STUCK_CAR_CHECK:
@@ -8381,21 +8641,49 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		UpdateCompareFlag(CTheScripts::StuckCars.HasCarBeenStuckForAWhile(ScriptParams[0]));
 		return 0;
 	case COMMAND_LOAD_MISSION_AUDIO:
+	{
+		CollectParameters(&m_nIp, 1);
 		strncpy(str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
 		for (int i = 0; i < KEY_LENGTH_IN_SCRIPT; i++)
 			str[i] = tolower(str[i]);
+		static bool bShowed = false;
 		m_nIp += KEY_LENGTH_IN_SCRIPT;
-		DMAudio.PreloadMissionAudio(str);
+		if (!bShowed) {
+			debug("LOAD_MISSION_AUDIO not implemented\n");
+			bShowed = true;
+		}
+		//DMAudio.PreloadMissionAudio(str);
 		return 0;
+	}
 	case COMMAND_HAS_MISSION_AUDIO_LOADED:
-		UpdateCompareFlag(DMAudio.GetMissionAudioLoadingStatus() == 1);
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("HAS_MISSION_AUDIO_LOADED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		//UpdateCompareFlag(DMAudio.GetMissionAudioLoadingStatus() == 1);
 		return 0;
+	}
 	case COMMAND_PLAY_MISSION_AUDIO:
-		DMAudio.PlayLoadedMissionAudio();
+		CollectParameters(&m_nIp, 1);
+		debug("PLAY_MISSION_AUDIO doesn't support parameter yet, skipping\n");
+		//DMAudio.PlayLoadedMissionAudio();
 		return 0;
 	case COMMAND_HAS_MISSION_AUDIO_FINISHED:
-		UpdateCompareFlag(DMAudio.IsMissionAudioSampleFinished());
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("HAS_MISSION_AUDIO_FINISHED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		//UpdateCompareFlag(DMAudio.IsMissionAudioSampleFinished());
 		return 0;
+	}
 	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -8403,6 +8691,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (pos.z <= MAP_Z_LOW_LIMIT)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
 		int node = ThePaths.FindNodeClosestToCoors(pos, 0, 999999.9f, true, true);
+		// TODO(MIAMI): replace GetPosition with FindNodeCoorsForScript
 		*(CVector*)&ScriptParams[0] = ThePaths.m_pathNodes[node].GetPosition();
 		*(float*)&ScriptParams[3] = ThePaths.FindNodeOrientationForCarPlacement(node);
 		StoreParameters(&m_nIp, 4);
@@ -8428,21 +8717,32 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	}
 	case COMMAND_SET_MISSION_AUDIO_POSITION:
 	{
-		CollectParameters(&m_nIp, 3);
-		CVector pos = *(CVector*)&ScriptParams[0];
-		DMAudio.SetMissionAudioLocation(pos.x, pos.y, pos.z);
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[1];
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("SET_MISSION_AUDIO_POSITION not implemented\n");
+			bShowed = true;
+		}
+		//DMAudio.SetMissionAudioLocation(pos.x, pos.y, pos.z);
 		return 0;
 	}
 	case COMMAND_ACTIVATE_SAVE_MENU:
-		FrontEndMenuManager.m_bSaveMenuActive = true;
+	{
+		CStats::SafeHouseVisits++;
+		FrontEndMenuManager.m_bActivateSaveMenu = true;
+		FindPlayerPed()->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+		FindPlayerPed()->SetTurnSpeed(0.0f, 0.0f, 0.0f);
 		return 0;
+	}
 	case COMMAND_HAS_SAVE_GAME_FINISHED:
-		UpdateCompareFlag(!FrontEndMenuManager.m_bMenuActive);
+		UpdateCompareFlag(!FrontEndMenuManager.m_bMenuActive && !FrontEndMenuManager.m_bActivateSaveMenu);
 		return 0;
 	case COMMAND_NO_SPECIAL_CAMERA_FOR_THIS_GARAGE:
 		CollectParameters(&m_nIp, 1);
 		CGarages::SetLeaveCameraForThisGarage(ScriptParams[0]);
 		return 0;
+	/*
 	case COMMAND_ADD_BLIP_FOR_PICKUP_OLD:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -8452,6 +8752,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_ADD_BLIP_FOR_PICKUP:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -8463,6 +8764,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_ADD_SPRITE_BLIP_FOR_PICKUP:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8474,6 +8776,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_PED_DENSITY_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
 		CPopulation::PedDensityMultiplier = *(float*)&ScriptParams[0];
@@ -8482,18 +8785,25 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPopulation::m_AllRandomPedsThisType = ScriptParams[0];
 		return 0;
+	/*
 	case COMMAND_SET_TEXT_DRAW_BEFORE_FADE:
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroTextLines[CTheScripts::NumberOfIntroTextLinesThisFrame].m_bTextBeforeFade = ScriptParams[0] != 0;
 		return 0;
+	*/
 	case COMMAND_GET_COLLECTABLE1S_COLLECTED:
 		ScriptParams[0] = CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages;
 		StoreParameters(&m_nIp, 1);
 		return 0;
-	case COMMAND_REGISTER_EL_BURRO_TIME:
+	case COMMAND_SET_CHAR_OBJ_LEAVE_ANY_CAR:
+	{
 		CollectParameters(&m_nIp, 1);
-		CStats::RegisterElBurroTime(ScriptParams[0]);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bScriptObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pPed->m_pMyVehicle);
 		return 0;
+	}
 	case COMMAND_SET_SPRITES_DRAW_BEFORE_FADE:
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroRectangles[CTheScripts::NumberOfIntroRectanglesThisFrame].m_bBeforeFade = ScriptParams[0] != 0;
@@ -8507,8 +8817,8 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		if (CCamera::m_bUseMouse3rdPerson && (
 			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "HELP15", 7) == 0 ||
 			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_2A", 7) == 0 ||
-			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_3A", 7) == 0 ||
-			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_4A", 7) == 0)) {
+			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_2C", 7) == 0 ||
+			strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_2D", 7) == 0)) {
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
 			return 0;
 		}
@@ -8531,11 +8841,9 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 
 int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 {
-#ifdef GTA_PS2
-	char tmp[48];
-#endif
 	switch (command) {
 	//case COMMAND_FLASH_RADAR_BLIP:
+	/*
 	case COMMAND_IS_CHAR_IN_CONTROL:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -8543,6 +8851,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		UpdateCompareFlag(pPed->IsPedInControl());
 		return 0;
 	}
+	*/
 	case COMMAND_SET_GENERATE_CARS_AROUND_CAMERA:
 		CollectParameters(&m_nIp, 1);
 		CCarCtrl::bCarsGeneratedAroundCamera = (ScriptParams[0] != 0);
@@ -8550,9 +8859,11 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 	case COMMAND_CLEAR_SMALL_PRINTS:
 		CMessages::ClearSmallMessagesOnly();
 		return 0;
+	/*
 	case COMMAND_HAS_MILITARY_CRANE_COLLECTED_ALL_CARS:
 		UpdateCompareFlag(CCranes::HaveAllCarsBeenCollectedByMilitaryCrane());
 		return 0;
+	*/
 	case COMMAND_SET_UPSIDEDOWN_CAR_NOT_DAMAGED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8622,6 +8933,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		return 0;
 	}
 	//case COMMAND_MAKE_PLAYER_UNSAFE:
+	/*
 	case COMMAND_LOAD_COLLISION:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -8636,9 +8948,10 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		return 0;
 	}
 	case COMMAND_GET_BODY_CAST_HEALTH:
-		ScriptParams[0] = CObject::nBodyCastHealth;
-		StoreParameters(&m_nIp, 1);
+	//	ScriptParams[0] = CObject::nBodyCastHealth;
+	//	StoreParameters(&m_nIp, 1);
 		return 0;
+	*/
 	case COMMAND_SET_CHARS_CHATTING:
 	{
 		CollectParameters(&m_nIp, 3);
@@ -8650,6 +8963,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		return 0;
 	}
 	//case COMMAND_MAKE_PLAYER_SAFE:
+	/*
 	case COMMAND_SET_CAR_STAYS_IN_CURRENT_LEVEL:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8672,22 +8986,33 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			pPed->m_nZoneLevel = LEVEL_NONE;
 		return 0;
 	}
-	case COMMAND_REGISTER_4X4_ONE_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4OneTime(ScriptParams[0]);
-		return 0;
-	case COMMAND_REGISTER_4X4_TWO_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4TwoTime(ScriptParams[0]);
+	*/
+	case COMMAND_SET_DRUNK_INPUT_DELAY:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_DRUNK_INPUT_DELAY not implemented\n");
 		return 0;
-	case COMMAND_REGISTER_4X4_THREE_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4ThreeTime(ScriptParams[0]);
+	}
+	case COMMAND_SET_CHAR_MONEY:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->m_nPedMoney = ScriptParams[1];
+		pPed->bMoneyHasBeenGivenByScript = true;
 		return 0;
-	case COMMAND_REGISTER_4X4_MAYHEM_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4MayhemTime(ScriptParams[0]);
+	}
+	//case COMMAND_INCREASE_CHAR_MONEY:
+	case COMMAND_GET_OFFSET_FROM_OBJECT_IN_WORLD_COORDS:
+	{
+		CollectParameters(&m_nIp, 4);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		CVector result = Multiply3x3(pObject->GetMatrix(), *(CVector*)&ScriptParams[1]) + pObject->GetPosition();
+		*(CVector*)&ScriptParams[0] = result;
+		StoreParameters(&m_nIp, 3);
 		return 0;
+	}
 	case COMMAND_REGISTER_LIFE_SAVED:
 		CStats::AnotherLifeSavedWithAmbulance();
 		return 0;
@@ -8705,25 +9030,35 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 1);
 		gPhoneInfo.m_aPhones[ScriptParams[0]].m_nState = PHONE_STATE_9;
 		return 0;
+	/*
 	case COMMAND_REGISTER_LONGEST_DODO_FLIGHT:
 		CollectParameters(&m_nIp, 1);
 		CStats::RegisterLongestFlightInDodo(ScriptParams[0]);
 		return 0;
-	case COMMAND_REGISTER_DEFUSE_BOMB_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::RegisterTimeTakenDefuseMission(ScriptParams[0]);
+	*/
+	case COMMAND_GET_OFFSET_FROM_CAR_IN_WORLD_COORDS:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CVector result = Multiply3x3(pVehicle->GetMatrix(), *(CVector*)&ScriptParams[1]) + pVehicle->GetPosition();
+		*(CVector*)&ScriptParams[0] = result;
+		StoreParameters(&m_nIp, 3);
 		return 0;
+	}
 	case COMMAND_SET_TOTAL_NUMBER_OF_KILL_FRENZIES:
 		CollectParameters(&m_nIp, 1);
 		CStats::SetTotalNumberKillFrenzies(ScriptParams[0]);
 		return 0;
 	case COMMAND_BLOW_UP_RC_BUGGY:
-		CWorld::Players[CWorld::PlayerInFocus].BlowUpRCBuggy();
+		CWorld::Players[CWorld::PlayerInFocus].BlowUpRCBuggy(true);
 		return 0;
+	/*
 	case COMMAND_REMOVE_CAR_FROM_CHASE:
 		CollectParameters(&m_nIp, 1);
 		CRecordDataForChase::RemoveCarFromChase(ScriptParams[0]);
 		return 0;
+	*/
 	case COMMAND_IS_FRENCH_GAME:
 		UpdateCompareFlag(CGame::frenchGame);
 		return 0;
@@ -8731,8 +9066,13 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		UpdateCompareFlag(CGame::germanGame);
 		return 0;
 	case COMMAND_CLEAR_MISSION_AUDIO:
-		DMAudio.ClearMissionAudio();
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLEAR_MISSION_AUDIO not implemented\n");
+		//DMAudio.ClearMissionAudio();
 		return 0;
+	}
+	/*
 	case COMMAND_SET_FADE_IN_AFTER_NEXT_ARREST:
 		CollectParameters(&m_nIp, 1);
 		CRestart::bFadeInAfterNextArrest = !!ScriptParams[0];
@@ -8745,6 +9085,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CGangs::SetGangPedModelOverride(ScriptParams[0], ScriptParams[1]);
 		return 0;
+	*/
 	case COMMAND_SET_CHAR_USE_PEDNODE_SEEK:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8755,6 +9096,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		pPed->bUsePedNodeSeek = !!ScriptParams[1];
 		return 0;
 	}
+	/*
 	case COMMAND_SWITCH_VEHICLE_WEAPONS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8767,10 +9109,12 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CWorld::Players[ScriptParams[0]].m_bGetOutOfJailFree = !!ScriptParams[1];
 		return 0;
+	*/
 	case COMMAND_SET_FREE_HEALTH_CARE:
 		CollectParameters(&m_nIp, 2);
 		CWorld::Players[ScriptParams[0]].m_bGetOutOfHospitalFree = !!ScriptParams[1];
 		return 0;
+	/*
 	case COMMAND_IS_CAR_DOOR_CLOSED:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8779,11 +9123,14 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		UpdateCompareFlag(!pVehicle->IsDoorMissing((eDoors)ScriptParams[1]) && pVehicle->IsDoorClosed((eDoors)ScriptParams[1]));
 		return 0;
 	}
+	*/
 	case COMMAND_LOAD_AND_LAUNCH_MISSION:
 		return 0;
 	case COMMAND_LOAD_AND_LAUNCH_MISSION_INTERNAL:
 	{
 		CollectParameters(&m_nIp, 1);
+		if (CTheScripts::NumberOfExclusiveMissionScripts > 0 && ScriptParams[0] <= UINT16_MAX - 2)
+			return 0;
 #ifdef MISSION_REPLAY
 		missionRetryScriptIndex = ScriptParams[0];
 		if (missionRetryScriptIndex == 19)
@@ -8791,8 +9138,14 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 #endif
 		CTimer::Suspend();
 		int offset = CTheScripts::MultiScriptArray[ScriptParams[0]];
+#ifdef USE_DEBUG_SCRIPT_LOADER
+		CFileMgr::ChangeDir("\\data\\");
+		int handle = CFileMgr::OpenFile(scriptfile, "rb");
+		CFileMgr::ChangeDir("\\");
+#else
 		CFileMgr::ChangeDir("\\");
 		int handle = CFileMgr::OpenFile("data\\main.scm", "rb");
+#endif
 		CFileMgr::Seek(handle, offset, 0);
 		CFileMgr::Read(handle, (const char*)&CTheScripts::ScriptSpace[SIZE_MAIN_SCRIPT], SIZE_MISSION_SCRIPT);
 		CFileMgr::CloseFile(handle);
@@ -8801,6 +9154,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		pMissionScript->m_bIsMissionScript = true;
 		pMissionScript->m_bMissionFlag = true;
 		CTheScripts::bAlreadyRunningAMissionScript = true;
+		CGameLogic::ClearShortCut();
 		return 0;
 	}
 	case COMMAND_SET_OBJECT_DRAW_LAST:
@@ -8816,14 +9170,15 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		CWeapon* pWeaponSlot = &pPed->m_weapons[ScriptParams[1]];
-		if (pWeaponSlot->m_eWeaponType == (eWeaponType)ScriptParams[1])
-			ScriptParams[0] = pWeaponSlot->m_nAmmoTotal;
-		else
-			ScriptParams[0] = 0;
+		ScriptParams[0] = 0;
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+			if (pPed->GetWeapon(i).m_eWeaponType == (eWeaponType)ScriptParams[1])
+				ScriptParams[0] = pPed->GetWeapon(i).m_nAmmoTotal;
+		}
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_GET_AMMO_IN_CHAR_WEAPON:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8868,6 +9223,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		}
 		return 0;
 	}
+	*/
 	case COMMAND_SET_NEAR_CLIP:
 		CollectParameters(&m_nIp, 1);
 		TheCamera.SetNearClipScript(*(float*)&ScriptParams[0]);
@@ -8876,6 +9232,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 2);
 		DMAudio.SetRadioChannel(ScriptParams[0], ScriptParams[1]);
 		return 0;
+	/*
 	case COMMAND_OVERRIDE_HOSPITAL_LEVEL:
 		CollectParameters(&m_nIp, 1);
 		CRestart::OverrideHospitalLevel = ScriptParams[0];
@@ -8896,6 +9253,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		UpdateCompareFlag(CGarages::IsThisCarWithinGarageArea(ScriptParams[0], pVehicle));
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CAR_TRACTION:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8905,9 +9263,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		if (pVehicle->m_vehType == VEHICLE_TYPE_CAR)
 			((CAutomobile*)pVehicle)->m_fTraction = fTraction;
 		else
-			// this is certainly not a boat, trane, heli or plane field
-			//((CBike*)pVehicle)->m_fTraction = fTraction;
-			*(float*)(((char*)pVehicle) + 1088) = fTraction;
+			((CBike*)pVehicle)->m_fTraction = fTraction;
 		return 0;
 	}
 	case COMMAND_ARE_MEASUREMENTS_IN_METRES:
@@ -8926,6 +9282,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_MARK_ROADS_BETWEEN_LEVELS:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -8974,6 +9331,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		ThePaths.PedMarkRoadsBetweenLevelsInArea(infX, supX, infY, supY, infZ, supZ);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CAR_AVOID_LEVEL_TRANSITIONS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8982,6 +9340,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		pVehicle->AutoPilot.m_bStayInCurrentLevel = !!ScriptParams[1];
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CHAR_AVOID_LEVEL_TRANSITIONS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -8994,6 +9353,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 2);
 		UpdateCompareFlag(CPedType::IsThreat(ScriptParams[0], ScriptParams[1]));
 		return 0;
+	*/
 	case COMMAND_CLEAR_AREA_OF_CHARS:
 	{
 		CollectParameters(&m_nIp, 6);
@@ -9020,7 +9380,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 	}
 	case COMMAND_SET_TOTAL_NUMBER_OF_MISSIONS:
 		CollectParameters(&m_nIp, 1);
-		CStats::SetTotalNumberMissions(ScriptParams[0]);
+		CStats::SetTotalNumberMissions(CGame::germanGame ? ScriptParams[0] - 2 : ScriptParams[0]);
 		return 0;
 	case COMMAND_CONVERT_METRES_TO_FEET_INT:
 		CollectParameters(&m_nIp, 1);
@@ -9036,7 +9396,15 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CStats::RegisterHighestScore(ScriptParams[0], ScriptParams[1]);
 		return 0;
 	//case COMMAND_WARP_CHAR_INTO_CAR_AS_PASSENGER:
-	//case COMMAND_IS_CAR_PASSENGER_SEAT_FREE:
+	case COMMAND_IS_CAR_PASSENGER_SEAT_FREE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		UpdateCompareFlag(ScriptParams[1] < pVehicle->m_nNumMaxPassengers && pVehicle->pPassengers[ScriptParams[1]] == nil);
+		return 0;
+	}
+	/*
 	case COMMAND_GET_CHAR_IN_CAR_PASSENGER_SEAT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9048,6 +9416,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_IS_CHRIS_CRIMINAL:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9070,6 +9439,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CParticle::AddParticle((tParticleType)ScriptParams[0], *(CVector*)&ScriptParams[1],
 			*(CVector*)&ScriptParams[4], nil, *(float*)&ScriptParams[7], 0, 0, 0, 0);
 		return 0;
+	/*
 	case COMMAND_SET_CHAR_IGNORE_LEVEL_TRANSITIONS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9102,10 +9472,12 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CSpecialParticleStuff::UpdateBoatFoamAnimation(&pObject->GetMatrix());
 		return 0;
 	}
+	*/
 	case COMMAND_SET_MUSIC_DOES_FADE:
 		CollectParameters(&m_nIp, 1);
 		TheCamera.m_bIgnoreFadingStuffForMusic = (ScriptParams[0] == 0);
 		return 0;
+	/*
 	case COMMAND_SET_INTRO_IS_PLAYING:
 		CollectParameters(&m_nIp, 1);
 		if (ScriptParams[0]) {
@@ -9120,6 +9492,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			CStreaming::LoadAllRequestedModels(false);
 		}
 		return 0;
+	*/
 	case COMMAND_SET_PLAYER_HOOKER:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9132,6 +9505,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			CPed* pHooker = CPools::GetPedPool()->GetAt(ScriptParams[1]);
 			assert(pHooker);
 			pPlayerInfo->m_pHooker = (CCivilianPed*)pHooker;
+			pPlayerInfo->m_nSexFrequency = 1000;
 			pPlayerInfo->m_nNextSexFrequencyUpdateTime = CTimer::GetTimeInMilliseconds() + 1000;
 			pPlayerInfo->m_nNextSexMoneyUpdateTime = CTimer::GetTimeInMilliseconds() + 3000;
 		}
@@ -9159,8 +9533,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
-		assert(pVehicle);
-		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_pMyVehicle == pVehicle);
+		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_objective != OBJECTIVE_LEAVE_VEHICLE && pPed->m_pMyVehicle == pVehicle);
 		return 0;
 	}
 	case COMMAND_IS_PLAYER_SITTING_IN_ANY_CAR:
@@ -9168,15 +9541,17 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING);
+		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_objective != OBJECTIVE_LEAVE_VEHICLE);
 		return 0;
 	}
+	/*
 	case COMMAND_SET_SCRIPT_FIRE_AUDIO:
 		CollectParameters(&m_nIp, 2);
 		gFireManager.SetScriptFireAudio(ScriptParams[0], !!ScriptParams[1]);
 		return 0;
+	*/
 	case COMMAND_ARE_ANY_CAR_CHEATS_ACTIVATED:
-		UpdateCompareFlag(CVehicle::bAllDodosCheat || CVehicle::bCheat3);
+		UpdateCompareFlag(CVehicle::bAllDodosCheat || CVehicle::bCheat3); // TODO(MIAMI): more cheats!
 		return 0;
 	case COMMAND_SET_CHAR_SUFFERS_CRITICAL_HITS:
 	{
@@ -9186,6 +9561,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		pPed->bNoCriticalHits = (ScriptParams[0] == 0);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_PLAYER_LIFTING_A_PHONE:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -9194,6 +9570,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		UpdateCompareFlag(pPed->GetPedState() == PED_MAKE_CALL);
 		return 0;
 	}
+	*/
 	case COMMAND_IS_CHAR_SITTING_IN_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9201,7 +9578,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		assert(pPed);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
 		assert(pVehicle);
-		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_pMyVehicle == pVehicle);
+		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_objective != OBJECTIVE_LEAVE_VEHICLE && pPed->m_pMyVehicle == pVehicle);
 		return 0;
 	}
 	case COMMAND_IS_CHAR_SITTING_IN_ANY_CAR:
@@ -9209,7 +9586,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING);
+		UpdateCompareFlag(pPed->GetPedState() == PED_DRIVING && pPed->m_objective != OBJECTIVE_LEAVE_VEHICLE);
 		return 0;
 	}
 	case COMMAND_IS_PLAYER_ON_FOOT:
@@ -9230,7 +9607,6 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			pPed->m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER);
 		return 0;
 	}
-#ifndef GTA_PS2
 	default:
 		assert(0);
 	}
@@ -9241,7 +9617,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 {
 	char tmp[48];
 	switch (command) {
-#endif
+	/*
 	case COMMAND_LOAD_COLLISION_WITH_SCREEN:
 		CollectParameters(&m_nIp, 1);
 		CTimer::Stop();
@@ -9262,6 +9638,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		}
 		CTimer::Update();
 		return 0;
+	*/
 	case COMMAND_LOAD_SPLASH_SCREEN:
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, tmp);
 		for (int i = 0; i < KEY_LENGTH_IN_SCRIPT; i++)
@@ -9269,6 +9646,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		m_nIp += 8;
 		LoadSplash(tmp);
 		return 0;
+	/*
 	case COMMAND_SET_CAR_IGNORE_LEVEL_TRANSITIONS:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9290,6 +9668,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		pCar->bMoreResistantToDamage = ScriptParams[1];
 		return 0;
 	}
+	*/
 	case COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -9301,15 +9680,14 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_LOAD_END_OF_GAME_TUNE:
 		DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE);
 		printf("Start preload end of game audio\n");
-		DMAudio.PreloadCutSceneMusic(STREAMED_SOUND_GAME_COMPLETED);
+		DMAudio.PreloadCutSceneMusic(STREAMED_SOUND_CUTSCENE_FINALE);
 		printf("End preload end of game audio\n");
 		return 0;
+	/*
 	case COMMAND_ENABLE_PLAYER_CONTROL_CAMERA:
 		CPad::GetPad(0)->DisablePlayerControls &= PLAYERCONTROL_DISABLED_1;
 		return 0;
-#ifndef GTA_PS2
-	// To be precise, on PS2 previous handlers were in 1000-1099 function
-	// These are "beta" VC commands (with bugs)
+	*/
 	case COMMAND_SET_OBJECT_ROTATION:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -9329,6 +9707,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		*(CVector*)&ScriptParams[0] = TheCamera.Cams[2].Source;
 		StoreParameters(&m_nIp, 3);
 		return 0;
+	/*
 	case COMMAND_GET_DEBUG_CAMERA_FRONT_VECTOR:
 		*(CVector*)&ScriptParams[0] = TheCamera.Cams[2].Front;
 		StoreParameters(&m_nIp, 3);
@@ -9342,6 +9721,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		UpdateCompareFlag(pTarget && pTarget->IsPed());
 		return 0;
 	}
+	*/
 	case COMMAND_IS_PLAYER_TARGETTING_CHAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9350,9 +9730,38 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CPed* pTestedPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
 		assert(pTestedPed);
 		CEntity* pTarget = pPed->m_pPointGunAt;
-		UpdateCompareFlag(pTarget && pTarget->IsPed() && pTarget == pTestedPed);
+		bool bTargetting = pTarget && pTarget->IsPed() && pTarget == pTestedPed;
+		// PC shit
+		static int nCounter = 0;
+		nCounter = Max(0, nCounter - 1);
+		if (!pPed->GetWeapon()->IsTypeMelee() && !bTargetting) {
+			if ((pTestedPed->GetPosition() - TheCamera.GetPosition()).Magnitude() < 10.0f) {
+				CVector vTestedPos(pTestedPed->GetPosition().x, pTestedPed->GetPosition().y, pTestedPed->GetPosition().z + 0.4);
+				CVector vScreenPos;
+				float w, h;
+				if (CSprite::CalcScreenCoors(vTestedPos, vScreenPos, &w, &h, false)) {
+					CVector2D vCrosshairPosition(CCamera::m_f3rdPersonCHairMultX * RsGlobal.maximumWidth, CCamera::m_f3rdPersonCHairMultY * RsGlobal.maximumHeight);
+					float fScreenDistance = ((CVector2D)vScreenPos - vCrosshairPosition).Magnitude();
+					if (SCREEN_STRETCH_X(0.45f) > fScreenDistance / w) {
+						CColPoint point;
+						CEntity* entity;
+						if (!CWorld::ProcessLineOfSight(TheCamera.GetPosition() + 2.0f * TheCamera.GetForward(),
+							vTestedPos, point, entity, true, true, true, true, true, false) ||
+							entity == pTestedPed) {
+							nCounter += 2;
+							if (nCounter > 20) {
+								bTargetting = true;
+								nCounter = 20;
+							}
+						}
+					}
+				}
+			}
+		}
+		UpdateCompareFlag(bTargetting);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_PLAYER_TARGETTING_OBJECT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9364,6 +9773,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		UpdateCompareFlag(pTarget && pTarget->IsObject() && pTarget == pTestedObject);
 		return 0;
 	}
+	*/
 	case COMMAND_TERMINATE_ALL_SCRIPTS_WITH_THIS_NAME:
 	{
 		CTheScripts::ReadTextLabelFromScript(&m_nIp, tmp);
@@ -9408,6 +9818,8 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		return 0;
 	case COMMAND_GET_CLOSEST_OBJECT_OF_TYPE:
 	{
+		return 0;
+/*
 		CollectParameters(&m_nIp, 5);
 		CVector pos = *(CVector*)&ScriptParams[0];
 		if (pos.z <= MAP_Z_LOW_LIMIT)
@@ -9451,7 +9863,9 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		}
 		StoreParameters(&m_nIp, 1);
 		return 0;
+*/
 	}
+	/*
 	case COMMAND_PLACE_OBJECT_RELATIVE_TO_OBJECT:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -9463,28 +9877,20 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CPhysical::PlacePhysicalRelativeToOtherPhysical(pTarget, pObject, offset);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_ALL_OCCUPANTS_OF_CAR_LEAVE_CAR:
 	{
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		if (pVehicle->pDriver) {
-			pVehicle->pDriver->bScriptObjectiveCompleted = false;
-			pVehicle->pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
-		}
-		for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++)
-		{
-			if (pVehicle->pPassengers[i]) {
-				pVehicle->pPassengers[i]->bScriptObjectiveCompleted = false;
-				pVehicle->pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
-			}
-		}
+		CCarAI::TellOccupantsToLeaveCar(pVehicle);
 		return 0;
 	}
 	case COMMAND_SET_INTERPOLATION_PARAMETERS:
 		CollectParameters(&m_nIp, 2);
-		TheCamera.SetParametersForScriptInterpolation(*(float*)&ScriptParams[0], 50.0f - *(float*)&ScriptParams[0], ScriptParams[1]);
+		TheCamera.SetParametersForScriptInterpolation(*(float*)&ScriptParams[0], 100.0f - *(float*)&ScriptParams[0], ScriptParams[1]);
 		return 0;
+	/*
 	case COMMAND_GET_CLOSEST_CAR_NODE_WITH_HEADING_TOWARDS_POINT:
 	{
 		CollectParameters(&m_nIp, 5);
@@ -9515,16 +9921,27 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 4);
 		return 0;
 	}
+	*/
 	case COMMAND_GET_DEBUG_CAMERA_POINT_AT:
 		*(CVector*)&ScriptParams[0] = TheCamera.Cams[2].Source + TheCamera.Cams[2].Front;
 		StoreParameters(&m_nIp, 3);
 		return 0;
 	case COMMAND_ATTACH_CHAR_TO_CAR:
-		// empty implementation
+	{
+		CollectParameters(&m_nIp, 8);
+		CPed *pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CVehicle *pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->AttachPedToEntity(pVehicle, *(CVector*)&ScriptParams[2], ScriptParams[5], DEGTORAD(ScriptParams[6]), (eWeaponType)ScriptParams[7]);
 		return 0;
+	}
 	case COMMAND_DETACH_CHAR_FROM_CAR:
-		// empty implementation
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed *pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		if (pPed && pPed->m_attachedTo)
+			pPed->DettachPedFromEntity();
 		return 0;
+	}
 	case COMMAND_SET_CAR_CHANGE_LANE: // for some reason changed in SA
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9537,15 +9954,20 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		assert(pPed);
-		pPed->m_lastWepDam = -1;
+		if (pPed)
+			pPed->m_lastWepDam = -1;
+		else
+			debug("CLEAR_CHAR_LAST_WEAPON_DAMAGE - Character doesn't exist\n");
 		return 0;
 	}
 	case COMMAND_CLEAR_CAR_LAST_WEAPON_DAMAGE:
 	{
 		CollectParameters(&m_nIp, 1);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
-		pVehicle->m_nLastWeaponDamage = -1;
+		if (pVehicle)
+			pVehicle->m_nLastWeaponDamage = -1;
+		else
+			debug("CLEAR_CAR_LAST_WEAPON_DAMAGE - Vehicle doesn't exist\n");
 		return 0;
 	}
 	case COMMAND_GET_RANDOM_COP_IN_AREA:
@@ -9566,9 +9988,11 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 				continue;
 			if (pPed->m_nPedType != PEDTYPE_COP)
 				continue;
+			if (!ThisIsAValidRandomCop(pPed->GetModelIndex(), ScriptParams[4], ScriptParams[5], ScriptParams[6], ScriptParams[7], ScriptParams[8]))
+				continue;
 			if (pPed->CharCreatedBy != RANDOM_CHAR)
 				continue;
-			if (!pPed->IsPedInControl() && pPed->GetPedState() != PED_DRIVING)
+			if (!pPed->IsPedInControl() && pPed->GetPedState() != PED_DRIVING /* && pPed->GetPedState() != PED_ONROPE */) // TODO(MIAMI)!
 				continue;
 			if (pPed->bRemoveFromWorld)
 				continue;
@@ -9578,9 +10002,9 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 				continue;
 			if (!pPed->IsWithinArea(x1, y1, x2, y2))
 				continue;
-			if (pos.z - PED_FIND_Z_OFFSET > pPed->GetPosition().z)
+			if (pos.z - COP_PED_FIND_Z_OFFSET > pPed->GetPosition().z)
 				continue;
-			if (pos.z + PED_FIND_Z_OFFSET < pPed->GetPosition().z)
+			if (pos.z + COP_PED_FIND_Z_OFFSET < pPed->GetPosition().z)
 				continue;
 			ped_handle = CPools::GetPedPool()->GetIndex(pPed);
 			CTheScripts::LastRandomPedId = ped_handle;
@@ -9594,14 +10018,15 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	/*
 	case COMMAND_GET_RANDOM_COP_IN_ZONE:
 	{
 		char zone[KEY_LENGTH_IN_SCRIPT];
 		strncpy(zone, (const char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
-		int nZone = CTheZones::FindZoneByLabelAndReturnIndex(zone);
+		int nZone = CTheZones::FindZoneByLabelAndReturnIndex(zone, ZONE_DEFAULT);
 		if (nZone != -1)
 			m_nIp += KEY_LENGTH_IN_SCRIPT;
-		CZone* pZone = CTheZones::GetZone(nZone);
+		CZone* pZone = CTheZones::GetNavigationZone(nZone);
 		int ped_handle = -1;
 		CVector pos = FindPlayerCoors();
 		int i = CPools::GetPedPool()->GetSize();
@@ -9625,9 +10050,9 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 				continue;
 			if (!CTheZones::PointLiesWithinZone(&pPed->GetPosition(), pZone))
 				continue;
-			if (pos.z - PED_FIND_Z_OFFSET > pPed->GetPosition().z)
+			if (pos.z - COP_PED_FIND_Z_OFFSET > pPed->GetPosition().z)
 				continue;
-			if (pos.z + PED_FIND_Z_OFFSET < pPed->GetPosition().z)
+			if (pos.z + COP_PED_FIND_Z_OFFSET < pPed->GetPosition().z)
 				continue;
 			ped_handle = CPools::GetPedPool()->GetIndex(pPed);
 			CTheScripts::LastRandomPedId = ped_handle;
@@ -9641,6 +10066,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
+	*/
 	case COMMAND_SET_CHAR_OBJ_FLEE_CAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9697,7 +10123,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		ScriptParams[0] = pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType;
+		ScriptParams[0] = pPed->GetWeapon()->m_eWeaponType;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -9706,7 +10132,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		ScriptParams[0] = pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType;
+		ScriptParams[0] = pPed->GetWeapon()->m_eWeaponType;
 		StoreParameters(&m_nIp, 1);
 		return 0;
 	}
@@ -9718,15 +10144,16 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_LOCATE_CHAR_IN_CAR_OBJECT_3D:
 		LocateCharObjectCommand(command, &m_nIp);
 		return 0;
-	case COMMAND_SET_CAR_HANDBRAKE_TURN_LEFT: // this will be changed in final VC version to a more general SET_TEMP_ACTION
+	case COMMAND_SET_CAR_TEMP_ACTION:
 	{
-		CollectParameters(&m_nIp, 2);
+		CollectParameters(&m_nIp, 3);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		pVehicle->AutoPilot.m_nTempAction = TEMPACT_HANDBRAKETURNLEFT;
-		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[1];
+		pVehicle->AutoPilot.m_nTempAction = (eCarTempAction)ScriptParams[1];
+		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[2];
 		return 0;
 	}
+	/*
 	case COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9745,18 +10172,21 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[1];
 		return 0;
 	}
+	*/
 	case COMMAND_IS_CHAR_ON_ANY_BIKE:
 	{
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
 		assert(pPed);
-		UpdateCompareFlag(pPed->bInVehicle&& pPed->m_pMyVehicle->m_vehType == VEHICLE_TYPE_BIKE);
+		UpdateCompareFlag(pPed->bInVehicle&& pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
 		return 0;
 	}
+	/*
 	case COMMAND_LOCATE_SNIPER_BULLET_2D:
 	case COMMAND_LOCATE_SNIPER_BULLET_3D:
 		LocateSniperBulletCommand(command, &m_nIp);
 		return 0;
+	*/
 	case COMMAND_GET_NUMBER_OF_SEATS_IN_MODEL:
 		CollectParameters(&m_nIp, 1);
 		ScriptParams[0] = CVehicleModelInfo::GetMaximumNumberOfPassengersFromNumberOfDoors(ScriptParams[0]) + 1;
@@ -9767,9 +10197,10 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
 		assert(pPed);
-		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->m_vehType == VEHICLE_TYPE_BIKE);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
 		return 0;
 	}
+	/*
 	case COMMAND_IS_CHAR_LYING_DOWN:
 	{
 		CollectParameters(&m_nIp, 1);
@@ -9778,6 +10209,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 		UpdateCompareFlag(pPed->bFallenDown);
 		return 0;
 	}
+	*/
 	case COMMAND_CAN_CHAR_SEE_DEAD_CHAR:
 	{
 		CollectParameters(&m_nIp, 2);
@@ -9795,29 +10227,2017 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	}
 	case COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
-#ifdef FIX_BUGS
 		CPed::nEnterCarRangeMultiplier = *(float*)&ScriptParams[0];
-#else
-		CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0];
-#endif
 		return 0;
-#endif
-#ifndef GTA3_1_1_PATCH
 	case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
-#ifdef FIX_BUGS
 		CPed::nThreatReactionRangeMultiplier = *(float*)&ScriptParams[0];
-#else
-		CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0];
-#endif
 		return 0;
-#endif
+	case COMMAND_SET_CHAR_CEASE_ATTACK_TIMER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->m_ceaseAttackTimer = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_GET_REMOTE_CONTROLLED_CAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CWorld::Players[ScriptParams[0]].m_pRemoteVehicle;
+		if (pVehicle)
+			ScriptParams[0] = CPools::GetVehiclePool()->GetIndex(pVehicle);
+		else
+			ScriptParams[0] = -1;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_IS_PC_VERSION:
+		UpdateCompareFlag(true);
+		return 0;
+	//case COMMAND_REPLAY:
+	//case COMMAND_IS_REPLAY_PLAYING:
+	case COMMAND_IS_MODEL_AVAILABLE:
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(CModelInfo::GetModelInfo(ScriptParams[0]) != nil);
+		return 0;
+	case COMMAND_SHUT_CHAR_UP:
+		CollectParameters(&m_nIp, 2);
+		debug("SHUT_CHAR_UP not implemented"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_SET_ENABLE_RC_DETONATE:
+		CollectParameters(&m_nIp, 1);
+		CVehicle::bDisableRemoteDetonation = !ScriptParams[0];
+		return 0;
+	case COMMAND_SET_CAR_RANDOM_ROUTE_SEED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->m_nRouteSeed = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_IS_ANY_PICKUP_AT_COORDS:
+	{
+		CollectParameters(&m_nIp, 3);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		CRunningScript::UpdateCompareFlag(CPickups::TestForPickupsInBubble(pos, 0.5f));
+		return 0;
+	}
+	case COMMAND_GET_FIRST_PICKUP_COORDS:
+	case COMMAND_GET_NEXT_PICKUP_COORDS:
+	case COMMAND_REMOVE_ALL_CHAR_WEAPONS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->ClearWeapons();
+		return 0;
+	}
+	case COMMAND_HAS_PLAYER_GOT_WEAPON:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		bool bFound = false;
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+			if (pPed->GetWeapon(i).m_eWeaponType == ScriptParams[1]) {
+				bFound = true;
+				break;
+			}
+		}
+		UpdateCompareFlag(bFound);
+		return 0;
+	}
+	//case COMMAND_HAS_CHAR_GOT_WEAPON:
+	//case COMMAND_IS_PLAYER_FACING_CHAR:
+	case COMMAND_SET_TANK_DETONATE_CARS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle && pVehicle->m_vehType == VEHICLE_TYPE_CAR);
+		((CAutomobile*)pVehicle)->bTankDetonateCars = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_GET_POSITION_OF_ANALOGUE_STICKS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPad* pPad = CPad::GetPad(ScriptParams[0]);
+		ScriptParams[0] = pPad->NewState.LeftStickX;
+		ScriptParams[1] = pPad->NewState.LeftStickY;
+		ScriptParams[2] = pPad->NewState.RightStickX;
+		ScriptParams[3] = pPad->NewState.RightStickY;
+		StoreParameters(&m_nIp, 4);
+		return 0;
+	}
+	case COMMAND_IS_CAR_ON_FIRE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		bool bOnFire = false;
+		if (pVehicle->m_pCarFire)
+			bOnFire = true;
+		if (pVehicle->m_vehType == VEHICLE_TYPE_CAR && ((CAutomobile*)pVehicle)->Damage.GetEngineStatus() >= ENGINE_STATUS_ON_FIRE)
+			bOnFire = true;
+		if (pVehicle->m_fHealth < 250.0f)
+			bOnFire = true;
+		UpdateCompareFlag(bOnFire);
+		return 0;
+	}
+	case COMMAND_IS_CAR_TYRE_BURST:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		bool bIsBurst = false;
+		CBike* pBike = (CBike*)pVehicle;
+		if (pVehicle->m_vehType == VEHICLE_APPEARANCE_BIKE) {
+			if (ScriptParams[1] == 4) {
+				for (int i = 0; i < 2; i++) {
+					if (pBike->m_wheelStatus[i] == WHEEL_STATUS_BURST)
+						bIsBurst = true;
+				}
+			}
+			else {
+				if (ScriptParams[1] == 2)
+					ScriptParams[1] = 0;
+				if (ScriptParams[1] == 3)
+					ScriptParams[1] = 1;
+				bIsBurst = pBike->m_wheelStatus[ScriptParams[1]] == WHEEL_STATUS_BURST;
+			}
+		}
+		else {
+			CAutomobile* pCar = (CAutomobile*)pVehicle;
+			if (ScriptParams[1] == 4) {
+				for (int i = 0; i < 4; i++) {
+					if (pCar->Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST)
+						bIsBurst = true;
+				}
+			}
+			else
+				bIsBurst = pCar->Damage.GetWheelStatus(ScriptParams[1] == WHEEL_STATUS_BURST);
+		}
+		UpdateCompareFlag(bIsBurst);
+	}
+	//case COMMAND_SET_CAR_DRIVE_STRAIGHT_AHEAD:
+	//case COMMAND_SET_CAR_WAIT:
+	//case COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE:
+	//case COMMAND_IS_PLAYER_FOOT_DOWN:
+	//case COMMAND_IS_CHAR_FOOT_DOWN:
+	case COMMAND_INITIALISE_OBJECT_PATH:
+		// TODO(MIAMI): script path
+		CollectParameters(&m_nIp, 2);
+		debug("INITALISE_OBJECT_PATH not yet implemented, skipping\n");
+		ScriptParams[0] = 0;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	case COMMAND_START_OBJECT_ON_PATH:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("START_OBJECT_ON_PATH not yet implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_SET_OBJECT_PATH_SPEED:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_OBJECT_PATH_SPEED not yet implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_SET_OBJECT_PATH_POSITION:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_OBJECT_PATH_POSITION not yet implemented, skipping\n");
+		return 0;
+	}
+	//case COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH:
+	case COMMAND_CLEAR_OBJECT_PATH:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLEAR_OBJECT_PATH not yet implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_HELI_GOTO_COORDS:
+	{
+		CollectParameters(&m_nIp, 5);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle && pVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		((CAutomobile*)pVehicle)->TellHeliToGoToCoors(*(float*)&ScriptParams[1], *(float*)&ScriptParams[2], *(float*)&ScriptParams[3], ScriptParams[4]);
+		return 0;
+	}
+	case COMMAND_IS_INT_VAR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr = ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed *pTarget = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CVector pos;
+		pTarget->CreateDeadPedPickupCoors(&pos.x, &pos.y, &pos.z);
+		*(CVector*)&ScriptParams[0] = pos;
+		StoreParameters(&m_nIp, 3);
+		return 0;
+	}
+	case COMMAND_CREATE_PROTECTION_PICKUP:
+	{
+		CollectParameters(&m_nIp, 5);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_REVENUE, PICKUP_ASSET_REVENUE, ScriptParams[3], ScriptParams[4]);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_IN_ANY_BOAT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BOAT);
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_IN_ANY_BOAT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_IN_ANY_HELI:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_IN_ANY_HELI:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_IN_ANY_PLANE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE);
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_IN_ANY_PLANE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_IN_WATER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		UpdateCompareFlag(pPed && pPed->bIsInWater);
+		return 0;
+	}
+	case COMMAND_SET_VAR_INT_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		*ptr = ScriptParams[0];
+		return 0;
+	}
+	case COMMAND_SET_LVAR_INT_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		*ptr = ScriptParams[0];
+		return 0;
+	}
 	default:
 		assert(0);
 	}
 	return -1;
 }
 
+
+int8 CRunningScript::ProcessCommands1200To1299(int32 command)
+{
+	switch (command) {
+	case COMMAND_IS_INT_VAR_GREATER_THAN_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr > ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_IS_INT_LVAR_GREATER_THAN_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr > ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_VAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		UpdateCompareFlag(ScriptParams[0] > *ptr);
+		return 0;
+	}
+	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_LVAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] > *ptr);
+		return 0;
+	}
+	case COMMAND_IS_INT_VAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr >= ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_IS_INT_LVAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	{
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(*ptr >= ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] >= *ptr);
+		return 0;
+	}
+	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_LVAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		int32* ptr = GetPointerToScriptVariable(&m_nIp, VAR_LOCAL);
+		UpdateCompareFlag(ScriptParams[0] >= *ptr);
+		return 0;
+	}
+	case COMMAND_GET_CHAR_WEAPON_IN_SLOT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		ScriptParams[0] = pPed->GetWeapon(ScriptParams[1]).m_eWeaponType;
+		ScriptParams[1] = pPed->GetWeapon(ScriptParams[1]).m_nAmmoTotal;
+		ScriptParams[2] = CPickups::ModelForWeapon((eWeaponType)ScriptParams[0]);
+		StoreParameters(&m_nIp, 3);
+		return 0;
+	}
+	case COMMAND_GET_CLOSEST_STRAIGHT_ROAD:
+	{
+		CollectParameters(&m_nIp, 5);
+		debug("GET_CLOSEST_STRAIGHT_ROAD not implemented!\n");
+		for (int i = 0; i < 7; i++)
+			ScriptParams[i] = 0;
+		StoreParameters(&m_nIp, 7); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SET_CAR_FORWARD_SPEED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		float speed = *(float*)&ScriptParams[1] / GAME_SPEED_TO_CARAI_SPEED;
+		pVehicle->SetMoveSpeed(pVehicle->GetForward() * speed);
+		// TODO(MIAMI): heli hack!
+		return 0;
+	}
+	case COMMAND_SET_AREA_VISIBLE:
+		CollectParameters(&m_nIp, 1);
+		CGame::currArea = ScriptParams[0];
+		// TODO(MIAMI) !!
+		//CStreaming::RemoveBuildingsNotInArea(ScriptParams[0]); 
+		return 0;
+	case COMMAND_SET_CUTSCENE_ANIM_TO_LOOP:
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		debug("SET_CUTSCENE_ANIM_TO_LOOP not implemented yet, skipping\n");
+		return 0;
+	}
+	case COMMAND_MARK_CAR_AS_CONVOY_CAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->bPartOfConvoy = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_RESET_HAVOC_CAUSED_BY_PLAYER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CWorld::Players[ScriptParams[0]].m_nHavocLevel = 0;
+		return 0;
+	}
+	case COMMAND_GET_HAVOC_CAUSED_BY_PLAYER:
+	{
+		CollectParameters(&m_nIp, 1);
+		ScriptParams[0] = CWorld::Players[ScriptParams[0]].m_nHavocLevel;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_CREATE_SCRIPT_ROADBLOCK:
+	{
+		CollectParameters(&m_nIp, 6);
+		CRoadBlocks::RegisterScriptRoadBlock(*(CVector*)&ScriptParams[0], *(CVector*)&ScriptParams[3]);
+		return 0;
+	}
+	case COMMAND_CLEAR_ALL_SCRIPT_ROADBLOCKS:
+	{
+		CRoadBlocks::ClearScriptRoadBlocks();
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_WALK_TO_CHAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		assert(pTargetPed);
+		pPed->bScriptObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FOLLOW_PED_IN_FORMATION, pPed);
+		return 0;
+	}
+	//case COMMAND_IS_PICKUP_IN_ZONE:
+	case COMMAND_GET_OFFSET_FROM_CHAR_IN_WORLD_COORDS:
+	{
+		CollectParameters(&m_nIp, 4);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVector result = Multiply3x3(pPed->GetMatrix(), *(CVector*)&ScriptParams[1]) + pPed->GetPosition();
+		*(CVector*)&ScriptParams[0] = result;
+		StoreParameters(&m_nIp, 3);
+		return 0;
+	}
+	case COMMAND_HAS_CHAR_BEEN_PHOTOGRAPHED:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		bool result = false;
+		if (pPed->bHasBeenPhotographed) {
+			result = true;
+			pPed->bHasBeenPhotographed = false;
+		}
+		UpdateCompareFlag(result);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_AIM_GUN_AT_CHAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		assert(pTargetPed);
+		pPed->bScriptObjectiveCompleted = false;
+		debug("SET_CHAR_OBJ_AIM_GUN_AT_CHAR is not implemented\n");
+		//pPed->SetObjective(OBJECTIVE_AIM_GUN_AT_PED, pTargetPed); // TODO(MIAMI) -- when objective is implemented
+		return 0;
+	}
+	case COMMAND_SWITCH_SECURITY_CAMERA:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("SWITCH_SECURITY_CAMERA is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	//case COMMAND_IS_CHAR_IN_FLYING_VEHICLE:
+	case COMMAND_IS_PLAYER_IN_FLYING_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && (pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI || pPed->m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE));
+		return 0;
+	}
+	//case COMMAND_HAS_SONY_CD_BEEN_READ:
+	//case COMMAND_GET_NUMBER_OF_SONY_CDS_READ:
+	//case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD_OLD:
+	//case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD:
+	case COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_COORD:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		int id = CRadar::SetShortRangeCoordBlip(BLIP_COORD, pos, 5, BLIP_DISPLAY_BOTH);
+		CRadar::SetBlipSprite(id, ScriptParams[3]);
+		ScriptParams[0] = id;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_ADD_MONEY_SPENT_ON_CLOTHES:
+		CollectParameters(&m_nIp, 1);
+		CStats::MoneySpentOnFashion(ScriptParams[0]);
+		return 0;
+		
+	case COMMAND_SET_HELI_ORIENTATION:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_HELI_ORIENTATION is not implemented\n"); // TODO(MIAMI);
+		return 0;
+	}
+	case COMMAND_CLEAR_HELI_ORIENTATION:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("SET_HELI_ORIENTATION is not implemented\n"); // TODO(MIAMI);
+		return 0;
+	}
+	case COMMAND_PLANE_GOTO_COORDS:
+	{
+		CollectParameters(&m_nIp, 5);
+		debug("PLANE_GOTO_COORS is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_GET_NTH_CLOSEST_CAR_NODE:
+	{
+		CollectParameters(&m_nIp, 4);
+		debug("GET_NTH_CLOSEST_CAR_NODE is not implemented\n"); // TODO(MIAMI)
+		ScriptParams[0] = 0;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	//case COMMAND_GET_NTH_CLOSEST_CHAR_NODE:
+	case COMMAND_DRAW_WEAPONSHOP_CORONA:
+	{
+		CollectParameters(&m_nIp, 9);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		CCoronas::RegisterCorona((uintptr)this + m_nIp, ScriptParams[6], ScriptParams[7], ScriptParams[8], 255, pos, *(float*)&ScriptParams[3],
+			150.0f, ScriptParams[4], ScriptParams[5], 1, 0, 0, 0.0f, false, 0.2f);
+		return 0;
+	}
+	case COMMAND_SET_ENABLE_RC_DETONATE_ON_CONTACT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle::bDisableRemoteDetonationOnContact = (ScriptParams[0] == 0);
+		return 0;
+	}
+	case COMMAND_FREEZE_CHAR_POSITION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bIsFrozen = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_CHAR_DROWNS_IN_WATER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bDrownsInWater = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_OBJECT_RECORDS_COLLISIONS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		pObject->bUseCollisionRecords = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_HAS_OBJECT_COLLIDED_WITH_ANYTHING:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		UpdateCompareFlag(pObject->m_nCollisionRecords != 0);
+		return 0;
+	}
+	case COMMAND_REMOVE_RC_BUGGY:
+	{
+		CWorld::Players[CWorld::PlayerInFocus].BlowUpRCBuggy(false);
+		return 0;
+	}
+	//case COMMAND_HAS_PHOTOGRAPH_BEEN_TAKEN:
+	case COMMAND_GET_CHAR_ARMOUR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		ScriptParams[0] = pPed->m_fArmour;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	//case COMMAND_SET_CHAR_ARMOUR:
+	case COMMAND_SET_HELI_STABILISER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->bHeliMinimumTilt = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_CAR_STRAIGHT_LINE_DISTANCE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->AutoPilot.m_nSwitchDistance = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_POP_CAR_BOOT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		debug("POP_CAR_BOOT is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SHUT_PLAYER_UP:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SHUT_PLAYER_UP is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_MOOD:
+	{
+		CollectParameters(&m_nIp, 3);
+		debug("SET_PLAYER_MOOD is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_REQUEST_COLLISION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVector2D pos;
+		pos.x = *(float*)&ScriptParams[0];
+		pos.y = *(float*)&ScriptParams[1];
+		CColStore::RequestCollision(pos);
+		return 0;
+	}
+	case COMMAND_LOCATE_OBJECT_2D:
+	case COMMAND_LOCATE_OBJECT_3D:
+		LocateObjectCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_IS_OBJECT_IN_WATER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		UpdateCompareFlag(pObject->bIsInWater);
+		return 0;
+	}
+	//case COMMAND_SET_CHAR_OBJ_STEAL_ANY_CAR_EVEN_MISSION_CAR:
+	case COMMAND_IS_OBJECT_IN_AREA_2D:
+	case COMMAND_IS_OBJECT_IN_AREA_3D:
+		ObjectInAreaCheckCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_TASK_TOGGLE_DUCK:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (ScriptParams[1]) {
+			pPed->bIsDucking = true;
+			pPed->SetDuck(ScriptParams[2], true);
+		}
+		else {
+			pPed->ClearDuck(true);
+			pPed->bIsDucking = false;
+		}
+		return 0;
+	}
+	case COMMAND_SET_ZONE_CIVILIAN_CAR_INFO:
+	{
+		char label[12];
+		int16 carDensities[CCarCtrl::NUM_CAR_CLASSES] = { 0 };
+		int16 boatDensities[CCarCtrl::NUM_BOAT_CLASSES] = { 0 };
+		int i;
+
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, label);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		CollectParameters(&m_nIp, 12);
+		for (i = 0; i < CCarCtrl::NUM_CAR_CLASSES; i++)
+			carDensities[i] = ScriptParams[i + 1];
+		for (i = 0; i < CCarCtrl::NUM_BOAT_CLASSES; i++)
+			boatDensities[i] = ScriptParams[i + 1 + CCarCtrl::NUM_CAR_CLASSES];
+		int zone = CTheZones::FindZoneByLabelAndReturnIndex(label, ZONE_INFO);
+		if (zone < 0) {
+			debug("Couldn't find zone - %s\n", label);
+			return 0;
+		}
+		while (zone >= 0) {
+			CTheZones::SetZoneCivilianCarInfo(zone, ScriptParams[0], carDensities, boatDensities);
+			zone = CTheZones::FindNextZoneByLabelAndReturnIndex(label, ZONE_INFO);
+		}
+		return 0;
+	}
+	case COMMAND_REQUEST_ANIMATION:
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		CStreaming::RequestAnim(CAnimManager::GetAnimationBlockIndex(key), STREAMFLAGS_SCRIPTOWNED);
+		return 0;
+	}
+	case COMMAND_HAS_ANIMATION_LOADED:
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		UpdateCompareFlag(CAnimManager::GetAnimationBlock(key)->isLoaded);
+		return 0;
+	}
+	case COMMAND_REMOVE_ANIMATION:
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		CStreaming::RemoveAnim(CAnimManager::GetAnimationBlockIndex(key));
+		return 0;
+	}
+	case COMMAND_IS_CHAR_WAITING_FOR_WORLD_COLLISION:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bIsStaticWaitingForCollision);
+		return 0;
+	}
+	case COMMAND_IS_CAR_WAITING_FOR_WORLD_COLLISION:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		UpdateCompareFlag(pVehicle->bIsStaticWaitingForCollision);
+		return 0;
+	}
+	case COMMAND_IS_OBJECT_WAITING_FOR_WORLD_COLLISION:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		UpdateCompareFlag(pObject->bIsStaticWaitingForCollision);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_SHUFFLE_INTO_DRIVERS_SEAT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		pPed->PedShuffle();
+		return 0;
+	}
+	case COMMAND_ATTACH_CHAR_TO_OBJECT:
+	{
+		CollectParameters(&m_nIp, 8);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[1]);
+		pPed->AttachPedToEntity(pObject, *(CVector*)&ScriptParams[2], ScriptParams[5], DEGTORAD(ScriptParams[6]), (eWeaponType)ScriptParams[7]);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_AS_PLAYER_FRIEND:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bIsPlayerFriend = ScriptParams[2];
+		return 0;
+	}
+	//case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER:
+	case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER_WITH_STRING:
+	{
+		char onscreen_str[12];
+		assert(CTheScripts::ScriptSpace[m_nIp++] == ARGUMENT_GLOBALVAR);
+		int16 var = CTheScripts::Read2BytesFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 2);
+		wchar* text = TheText.Get((char*)&CTheScripts::ScriptSpace[m_nIp]); // ???
+		strncpy(onscreen_str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		CUserDisplay::OnscnTimer.AddCounter(var, ScriptParams[0], onscreen_str, ScriptParams[1] - 1);
+		return 0;
+	}
+	case COMMAND_ADD_SET_PIECE:
+	{
+		CollectParameters(&m_nIp, 13);
+		CSetPieces::AddOne(ScriptParams[0],
+			*(CVector2D*)&ScriptParams[1], *(CVector2D*)&ScriptParams[3],
+			*(CVector2D*)&ScriptParams[5], *(CVector2D*)&ScriptParams[7],
+			*(CVector2D*)&ScriptParams[9], *(CVector2D*)&ScriptParams[11]);
+		return 0;
+	}
+	case COMMAND_SET_EXTRA_COLOURS:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_EXTRA_COLOURS not implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_CLEAR_EXTRA_COLOURS:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLEAR_EXTRA_COLOURS not implemented, skipping\n");
+		return 0;
+	}
+	//case COMMAND_CLOSE_CAR_BOOT:
+	case COMMAND_GET_WHEELIE_STATS:
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("GET_WHEELIE_STATS not implemented\n");
+			bShowed = true;
+		}
+		for (int i = 0; i < 6; i++)
+			ScriptParams[i] = 0;
+		StoreParameters(&m_nIp, 6);
+		return 0;
+	}
+	//case COMMAND_DISARM_CHAR:
+	case COMMAND_BURST_CAR_TYRE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		if (pVehicle->IsBike()) {
+			if (ScriptParams[1] == 2)
+				ScriptParams[1] = 0;
+			else if (ScriptParams[1] == 3)
+				ScriptParams[1] = 1;
+			pVehicle->BurstTyre(ScriptParams[1], true);
+		}
+		else {
+			pVehicle->BurstTyre(ScriptParams[1], true);
+		}
+		return 0;
+	}
+	case COMMAND_IS_CHAR_OBJ_NO_OBJ:
+	{
+		CollectParameters(&m_nIp, 1);
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->m_prevObjective == OBJECTIVE_NONE && pPed->m_objective == OBJECTIVE_NONE);
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_WEARING:
+	{
+		CollectParameters(&m_nIp, 1);
+		char key[12];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		for (int i = 0; i < KEY_LENGTH_IN_SCRIPT; i++)
+			key[i] = tolower(key[i]);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(strcmp(key, CModelInfo::GetModelInfo(pPed->GetModelIndex())->GetName()) == 0);
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_bDriveByAllowed = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_SPRINT_TO_COORD:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVector pos;
+		pos.x = *(float*)&ScriptParams[1];
+		pos.y = *(float*)&ScriptParams[2];
+		pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		pPed->bScriptObjectiveCompleted = false;
+		debug("SET_CHAR_OBJ_SPRINT_TO_COORD is not implemented\n");
+		//pPed->SetObjective(OBJECTIVE_SPRINT_TO_COORD, pos); // TODO(MIAMI) -- when objective is implemented
+		return 0;
+	}
+	case COMMAND_CREATE_SWAT_ROPE:
+	{
+		CollectParameters(&m_nIp, 3);
+		debug("SET_CHAR_OBJ_SPRINT_TO_COORD is not implemented\n");
+		return 0;
+	}
+	//case COMMAND_SET_FIRST_PERSON_CONTROL_CAMERA:
+	//case COMMAND_GET_NEAREST_TYRE_TO_POINT:
+	case COMMAND_SET_CAR_MODEL_COMPONENTS:
+	{
+		CollectParameters(&m_nIp, 3);
+		CVehicleModelInfo::SetComponentsToUse(ScriptParams[1], ScriptParams[2]);
+		return 0;
+	}
+	case COMMAND_SWITCH_LIFT_CAMERA:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("SWITCH_LIFT_CAMERA is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_CLOSE_ALL_CAR_DOORS:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("CLOSE_ALL_CAR_DOORS is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_GET_DISTANCE_BETWEEN_COORDS_2D:
+	{
+		CollectParameters(&m_nIp, 4);
+		*(float*)&ScriptParams[0] = (*(CVector2D*)&ScriptParams[0] - *(CVector2D*)&ScriptParams[2]).Magnitude();
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_GET_DISTANCE_BETWEEN_COORDS_3D:
+	{
+		CollectParameters(&m_nIp, 6);
+		*(float*)&ScriptParams[0] = (*(CVector*)&ScriptParams[0] - *(CVector*)&ScriptParams[3]).Magnitude();
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_POP_CAR_BOOT_USING_PHYSICS:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("POP_CAR_BOOT_USING_PHYSICS is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	//case COMMAND_SET_FIRST_PERSON_WEAPON_CAMERA:
+	case COMMAND_IS_CHAR_LEAVING_VEHICLE_TO_DIE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE);
+		return 0;
+	}
+	case COMMAND_SORT_OUT_OBJECT_COLLISION_WITH_CAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		pObject->m_pCollidingEntity = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		return 0;
+	}
+	//case COMMAND_GET_MAX_WANTED_LEVEL:
+	case COMMAND_IS_CHAR_WANDER_PATH_CLEAR:
+	{
+		CollectParameters(&m_nIp, 5);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(CWorld::IsWanderPathClear(pPed->GetPosition(), *(CVector*)&ScriptParams[0], *(float*)&ScriptParams[3], 4));
+		return 0;
+	}
+	//case COMMAND_PRINT_HELP_WITH_NUMBER:
+	case COMMAND_PRINT_HELP_FOREVER:
+	{
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		CHud::SetHelpMessage(text, false); // TODO(MIAMI): third param is true
+		return 0;
+	}
+	//case COMMAND_PRINT_HELP_FOREVER_WITH_NUMBER:
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+int8 CRunningScript::ProcessCommands1300To1399(int32 command)
+{
+	switch (command) {
+	case COMMAND_SET_CHAR_CAN_BE_DAMAGED_BY_MEMBERS_OF_GANG:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pTarget);
+		uint8 flag = 1 << (uint8)ScriptParams[1];
+		if (ScriptParams[2])
+			pTarget->m_gangFlags |= flag;
+		else
+			pTarget->m_gangFlags &= ~flag;
+
+		return 0;
+	}
+	case COMMAND_LOAD_AND_LAUNCH_MISSION_EXCLUSIVE:
+		return 0;
+	//case COMMAND_IS_MISSION_AUDIO_PLAYING:
+	case COMMAND_CREATE_LOCKED_PROPERTY_PICKUP:
+	{
+		CollectParameters(&m_nIp, 3);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		// TODO(MIAMI) - add text
+		CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY, PICKUP_PROPERTY_LOCKED, 0, 0, false, text);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_CREATE_FORSALE_PROPERTY_PICKUP:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		// TODO(MIAMI) - add text
+		CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY_FORSALE, PICKUP_PROPERTY_FORSALE, ScriptParams[3], 0, false, text);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_FREEZE_CAR_POSITION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->bIsFrozen = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CHAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CPed* pTestedPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		bool result = false;
+		if (pPed) {
+			if (pPed->m_lastDamEntity) {
+				if (pPed->m_lastDamEntity == pTestedPed)
+					result = true;
+				if (pTestedPed->bInVehicle && pPed->m_lastDamEntity == pTestedPed->m_pMyVehicle)
+					result = true;
+			}
+		}else
+			debug("HAS_CHAR_BEEN_DAMAGED_BY_CHAR - First character doesn't exist\n");
+		UpdateCompareFlag(result);
+		return 0;
+	}
+	//case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CAR:
+	//case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CHAR:
+	//case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CAR:
+	//case COMMAND_GET_RADIO_CHANNEL:
+	//case COMMAND_DISPLAY_TEXT_WITH_3_NUMBERS:
+	//case COMMAND_IS_CAR_DROWNING_IN_WATER:
+	case COMMAND_IS_CHAR_DROWNING_IN_WATER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		UpdateCompareFlag(pPed && pPed->bIsDrowning);
+		return 0;
+	}
+	case COMMAND_DISABLE_CUTSCENE_SHADOWS:
+	{
+		debug("DISABLE_CUTSCENE_SHADOWS not implemented, skipping\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY:
+	{
+		CollectParameters(&m_nIp, 3);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("HAS_GLASS_BEEN_SHATTERED_NEARBY not implemented, default to TRUE\n"); // TODO(MIAMI)
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		return 0;
+	}
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_BONE:
+	{
+		CollectParameters(&m_nIp, 3);
+		debug("ATTACH_CUTSCENE_OBJECT_TO_BONE not implemented, skipping\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_COMPONENT:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("ATTACH_CUTSCENE_OBJECT_TO_COMPONENT not implemented, skipping\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SET_CHAR_STAY_IN_CAR_WHEN_JACKED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bStayInCarOnJack = ScriptParams[1];
+		return 0;
+	}
+	//case COMMAND_IS_MISSION_AUDIO_LOADING:
+	case COMMAND_ADD_MONEY_SPENT_ON_WEAPONS:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_MONEY_SPENT_ON_WEAPON not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_ADD_MONEY_SPENT_ON_PROPERTY:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_MONEY_SPENT_ON_PROPERTY not implemented\n"); // TODO(MIAMI)
+		return 0;
+	//case COMMAND_ADD_MONEY_SPENT_ON_AUTO_PAINTING:
+	case COMMAND_SET_CHAR_ANSWERING_MOBILE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		if (ScriptParams[1])
+			pPed->SetAnswerMobile();
+		else
+			pPed->ClearAnswerMobile();
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_DRUNKENNESS:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("SET_PLAYER_DRUNKENNESS not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	//case COMMAND_GET_PLAYER_DRUNKENNESS:
+	//case COMMAND_SET_PLAYER_DRUG_LEVEL:
+	//case COMMAND_GET_PLAYER_DRUG_LEVEL:
+	//case COMMAND_ADD_LOAN_SHARK_VISITS:
+	case COMMAND_ADD_STORES_KNOCKED_OFF:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_STORES_KNOCKED_OFF not implemented\n"); // TODO(MIAMI)
+		return 0;
+	//case COMMAND_ADD_MOVIE_STUNTS:
+	case COMMAND_ADD_NUMBER_OF_ASSASSINATIONS:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_NUMBER_OF_ASSASSINATIONS not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_ADD_PIZZAS_DELIVERED:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_PIZZAS_DELIVERED not implemented\n"); // TODO(MIAMI)
+		return 0;
+	//case COMMAND_ADD_GARBAGE_PICKUPS:
+	case COMMAND_ADD_ICE_CREAMS_SOLD:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_ICE_CREAMS_SOLD not implemented\n"); // TODO(MIAMI)
+		return 0;
+	//case COMMAND_SET_TOP_SHOOTING_RANGE_SCORE:
+	//case COMMAND_ADD_SHOOTING_RANGE_RANK:
+	//case COMMAND_ADD_MONEY_SPENT_ON_GAMBLING:
+	//case COMMAND_ADD_MONEY_WON_ON_GAMBLING:
+	//case COMMAND_SET_LARGEST_GAMBLING_WIN:
+	case COMMAND_SET_CHAR_IN_PLAYERS_GROUP_CAN_FIGHT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bDontFight = !ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_CLEAR_CHAR_WAIT_STATE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->ClearWaitState();
+		return 0;
+	}
+	case COMMAND_GET_RANDOM_CAR_OF_TYPE_IN_AREA_NO_SAVE:
+	{
+		CollectParameters(&m_nIp, 5);
+		int handle = -1;
+		uint32 i = CPools::GetVehiclePool()->GetSize();
+		float infX = *(float*)&ScriptParams[0];
+		float infY = *(float*)&ScriptParams[1];
+		float supX = *(float*)&ScriptParams[2];
+		float supY = *(float*)&ScriptParams[3];
+		while (i--) {
+			CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i);
+			if (!pVehicle)
+				continue;
+			if (pVehicle->GetVehicleAppearance() != VEHICLE_APPEARANCE_CAR && pVehicle->GetVehicleAppearance() != VEHICLE_APPEARANCE_BIKE)
+				continue;
+			if (ScriptParams[4] != pVehicle->GetModelIndex() && ScriptParams[4] >= 0)
+				continue;
+			if (pVehicle->VehicleCreatedBy != RANDOM_VEHICLE)
+				continue;
+			if (!pVehicle->IsWithinArea(infX, infY, supX, supY))
+				continue;
+			handle = CPools::GetVehiclePool()->GetIndex(pVehicle);
+		}
+		ScriptParams[0] = handle;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_SET_CAN_BURST_CAR_TYRES:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->bTyresDontBurst = !ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_AUTO_AIM:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		pPed->bDoomAim = ScriptParams[1];
+	}
+	case COMMAND_FIRE_HUNTER_GUN:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("FIRE_HUNTER_GUN is not implemented, skipping\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SET_PROPERTY_AS_OWNED:
+		CollectParameters(&m_nIp, 1);
+		debug("SET_PROPERTY_AS_OWNED not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_ADD_BLOOD_RING_KILLS:
+		CollectParameters(&m_nIp, 1);
+		debug("ADD_BLOOD_RING_KILLS not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_SET_LONGEST_TIME_IN_BLOOD_RING:
+		CollectParameters(&m_nIp, 1);
+		debug("SET_LONGEST_TIME_IN_BLOOD_RING not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE:
+	{
+		debug("REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE not implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_TOUCHING_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		CPhysical* pTestedEntity = pPed;
+		if (pPed->bInVehicle && pPed->m_pMyVehicle)
+			pTestedEntity = pPed->m_pMyVehicle;
+		UpdateCompareFlag(pTestedEntity->GetHasCollidedWith(pVehicle));
+		return 0;
+	}
+	//case COMMAND_IS_CHAR_TOUCHING_VEHICLE:
+	case COMMAND_CHECK_FOR_PED_MODEL_AROUND_PLAYER:
+	{
+		CollectParameters(&m_nIp, 6);
+		CVector d1 = CWorld::Players[ScriptParams[0]].GetPos() - *(CVector*)&ScriptParams[1];
+		CVector d2 = CWorld::Players[ScriptParams[0]].GetPos() + *(CVector*)&ScriptParams[1];
+		int i = CPools::GetPedPool()->GetSize();
+		bool result = false;
+		while (i--) {
+			CPed* pPed = CPools::GetPedPool()->GetSlot(i);
+			if (!pPed)
+				continue;
+			if (ScriptParams[4] != pPed->GetModelIndex() && ScriptParams[5] != pPed->GetModelIndex())
+				continue;
+			if (pPed->IsWithinArea(d1.x, d1.y, d1.z, d2.x, d2.y, d2.z))
+				result = true;
+		}
+		UpdateCompareFlag(result);
+		return 0;
+	}
+	case COMMAND_CLEAR_CHAR_FOLLOW_PATH:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (pPed->GetPedState() == PED_FOLLOW_PATH) {
+			pPed->RestorePreviousState();
+			pPed->ClearFollowPath();
+		}
+		return 0;
+	}
+	case COMMAND_SET_CHAR_CAN_BE_SHOT_IN_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bCanBeShotInVehicle = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 2);
+		debug("ATTACH_CUTSCENE_OBJECT_TO_VEHICLE not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_LOAD_MISSION_TEXT:
+	{
+		char key[8];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		TheText.LoadMissionText(key);
+		return 0;
+	}
+	case COMMAND_SET_TONIGHTS_EVENT:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("skipping SET_TONIGHTS_EVENT\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_CLEAR_CHAR_LAST_DAMAGE_ENTITY:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		if (pPed)
+			pPed->m_lastDamEntity = nil;
+		else
+			debug("CLEAR_CHAR_LAST_DAMAGE_ENTITY - Character doesn't exist\n");
+		return 0;
+	}
+	//case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY:
+	case COMMAND_FREEZE_OBJECT_POSITION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		pObject->bIsFrozen = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_HAS_MET_DEBBIE_HARRY:
+	{
+		CollectParameters(&m_nIp, 1);
+		CTheScripts::bPlayerHasMetDebbieHarry = ScriptParams[0];
+		return 0;
+	}
+	case COMMAND_SET_RIOT_INTENSITY:
+	{
+		CollectParameters(&m_nIp, 1);
+		CTheScripts::RiotIntensity = ScriptParams[0];
+		return 0;
+	}
+	//case COMMAND_IS_CAR_IN_ANGLED_AREA_2D:
+	//case COMMAND_IS_CAR_IN_ANGLED_AREA_3D:
+	//case COMMAND_REMOVE_WEAPON_FROM_CHAR:
+	case COMMAND_SET_UP_TAXI_SHORTCUT:
+	{
+		CollectParameters(&m_nIp, 8);
+		CGameLogic::SetUpShortCut(
+			*(CVector*)&ScriptParams[0], *(float*)&ScriptParams[3],
+			*(CVector*)&ScriptParams[4], *(float*)&ScriptParams[7]);
+		return 0;
+	}
+	case COMMAND_CLEAR_TAXI_SHORTCUT:
+		CGameLogic::ClearShortCut();
+		return 0;
+	//case COMMAND_SET_CHAR_OBJ_GOTO_CAR_ON_FOOT:
+	//case COMMAND_GET_CLOSEST_WATER_NODE:
+	case COMMAND_ADD_PORN_LEAFLET_TO_RUBBISH:
+		debug("ADD_PORN_LEAFLET_TO_RUBBISH is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_CREATE_CLOTHES_PICKUP:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
+		CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_PICKUP_CLOTHES, PICKUP_ON_STREET, ScriptParams[3]);
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	//case COMMAND_CHANGE_BLIP_THRESHOLD:
+	case COMMAND_MAKE_PLAYER_FIRE_PROOF:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_bFireproof = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_INCREASE_PLAYER_MAX_HEALTH:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_nMaxHealth += ScriptParams[1];
+		pPlayerInfo->m_pPed->m_fHealth = pPlayerInfo->m_nMaxHealth;
+		return 0;
+	}
+	case COMMAND_INCREASE_PLAYER_MAX_ARMOUR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayerInfo = &CWorld::Players[ScriptParams[0]];
+		pPlayerInfo->m_nMaxArmour += ScriptParams[1];
+		pPlayerInfo->m_pPed->m_fArmour = pPlayerInfo->m_nMaxArmour;
+		return 0;
+	}
+	case COMMAND_CREATE_RANDOM_CHAR_AS_DRIVER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CPed* pPed = CPopulation::AddPedInCar(pVehicle, true);
+		pPed->CharCreatedBy = MISSION_CHAR;
+		pPed->bRespondsToThreats = false;
+		pPed->bAllowMedicsToReviveMe = false;
+		pPed->bIsPlayerFriend = false;
+		if (pVehicle->bIsBus)
+			pPed->bRenderPedInCar = false;
+		pPed->SetPosition(pVehicle->GetPosition());
+		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
+		pPed->SetPedState(PED_DRIVING);
+		pPed->m_pMyVehicle = pVehicle;
+		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
+		pVehicle->pDriver = pPed;
+		pVehicle->pDriver->RegisterReference((CEntity**)&pVehicle->pDriver);
+		pPed->bInVehicle = true;
+		pVehicle->SetStatus(STATUS_PHYSICS);
+		if (pVehicle->m_vehType == VEHICLE_TYPE_BOAT)
+			pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE;
+		pVehicle->bEngineOn = true;
+		pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
+		CPopulation::ms_nTotalMissionPeds++;
+		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
+		StoreParameters(&m_nIp, 1);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
+	case COMMAND_CREATE_RANDOM_CHAR_AS_PASSENGER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CPed* pPed = CPopulation::AddPedInCar(pVehicle, false);
+		pPed->CharCreatedBy = MISSION_CHAR;
+		pPed->bRespondsToThreats = false;
+		pPed->bAllowMedicsToReviveMe = false;
+		pPed->bIsPlayerFriend = false;
+		if (pVehicle->bIsBus)
+			pPed->bRenderPedInCar = false;
+		pPed->SetPosition(pVehicle->GetPosition());
+		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
+		CPopulation::ms_nTotalMissionPeds++;
+		pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
+		if (ScriptParams[1] >= 0)
+			pVehicle->AddPassenger(pPed, ScriptParams[1]);
+		else
+			pVehicle->AddPassenger(pPed);
+
+		pPed->m_pMyVehicle = pVehicle;
+		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
+		pPed->bInVehicle = true;
+		pPed->SetPedState(PED_DRIVING);
+		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
+		StoreParameters(&m_nIp, 1);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_IGNORE_THREATS_BEHIND_OBJECTS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		pPed->bIgnoreThreatsBehindObjects = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_ENSURE_PLAYER_HAS_DRIVE_BY_WEAPON:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		if (pPed->bInVehicle) {
+			if (pPed->GetWeapon(5).m_eWeaponType) { // TODO(MIAMI): enum
+				if (pPed->GetWeapon(5).m_nAmmoTotal < ScriptParams[1])
+					pPed->SetAmmo(pPed->GetWeapon(5).m_eWeaponType, ScriptParams[1]);
+			}
+			else {
+				pPed->GiveWeapon(WEAPONTYPE_UZI, ScriptParams[1], true);
+				if (pPed->m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
+					pPed->m_storedWeapon = pPed->GetWeapon()->m_eWeaponType;
+				pPed->SetCurrentWeapon(WEAPONTYPE_UZI);
+			}
+		}
+		return 0;
+	}
+	case COMMAND_MAKE_HELI_COME_CRASHING_DOWN:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("MAKE_HELI_COME_CRASHING_DOWN is not implemented\n");
+		return 0;
+	}
+	case COMMAND_ADD_EXPLOSION_NO_SOUND:
+	{
+		CollectParameters(&m_nIp, 4);
+		CExplosion::AddExplosion(nil, nil, (eExplosionType)ScriptParams[3], *(CVector*)&ScriptParams[0], 0); // TODO(MIAMI): last arg is 0
+		return 0;
+	}
+	case COMMAND_SET_OBJECT_AREA_VISIBLE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		pObject->m_area = ScriptParams[1];
+		return 0;
+	}
+	//case COMMAND_WAS_VEHICLE_EVER_POLICE:
+	case COMMAND_SET_CHAR_NEVER_TARGETTED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bNeverEverTargetThisPed = ScriptParams[1];
+		return 0;
+	}
+	case COMMAND_LOAD_UNCOMPRESSED_ANIM:
+	{
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		debug("LOAD_UNCOMPRESSED_ANIM not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_WAS_CUTSCENE_SKIPPED:
+	{
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("COMMAND_WAS_CUTSCENE_SKIPPED not implemented, default to TRUE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(true);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_CROUCH_WHEN_THREATENED:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		debug("SET_CHAR_CROUCH_WHEN_THREATENED not implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_IS_CHAR_IN_ANY_POLICE_VEHICLE:
+	{
+		CollectParameters(&m_nIp, 1);
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("IS_CHAR_IN_ANY_POLICE_VEHICLE not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
+	case COMMAND_DOES_CHAR_EXIST:
+		CollectParameters(&m_nIp, 1);
+		UpdateCompareFlag(CPools::GetPedPool()->GetAt(ScriptParams[0]) != 0);
+		return 0;
+	//case COMMAND_DOES_VEHICLE_EXIST:
+	//case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_CONTACT_POINT:
+	case COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_CONTACT_POINT:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVector pos = *(CVector*)&ScriptParams[0];
+		if (pos.z <= MAP_Z_LOW_LIMIT)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		CRadar::GetActualBlipArrayIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
+		int id = CRadar::SetShortRangeCoordBlip(BLIP_COORD, pos, 2, BLIP_DISPLAY_BOTH);
+		CRadar::SetBlipSprite(id, ScriptParams[3]);
+		ScriptParams[0] = id;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_STUCK:
+	{
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->m_nWaitState == WAITSTATE_STUCK);
+	}
+	case COMMAND_SET_ALL_TAXIS_HAVE_NITRO:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("SET_ALL_TAXIS_HAVE_NITRO is not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_SET_CHAR_STOP_SHOOT_DONT_SEEK_ENTITY:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (ScriptParams[1]) {
+			pPed->bKindaStayInSamePlace = true;
+			pPed->bStopAndShoot = true;
+		}
+		else {
+			pPed->bKindaStayInSamePlace = false;
+			pPed->bStopAndShoot = false;
+		}
+		pPed->m_nLastPedState = PED_NONE;
+	}
+	case COMMAND_FREEZE_CAR_POSITION_AND_DONT_LOAD_COLLISION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		if (ScriptParams[1]) {
+			pVehicle->bIsFrozen = true;
+			pVehicle->bInfiniteMass = true;
+			if (m_bIsMissionScript) {
+				CWorld::Remove(pVehicle);
+				pVehicle->bIsStaticWaitingForCollision = true;
+				CWorld::Add(pVehicle);
+			}
+		}
+		else {
+			pVehicle->bIsFrozen = false;
+			pVehicle->bInfiniteMass = false;
+		}
+		return 0;
+	}
+	//case COMMAND_FREEZE_CHAR_POSITION_AND_DONT_LOAD_COLLISION:
+	//case COMMAND_FREEZE_OBJECT_POSITION_AND_DONT_LOAD_COLLISION:
+	//case COMMAND_SET_FADE_AND_JUMPCUT_AFTER_RC_EXPLOSION:
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+int8 CRunningScript::ProcessCommands1400To1499(int32 command)
+{
+	switch (command) {
+	case COMMAND_REGISTER_VIGILANTE_LEVEL:
+		CollectParameters(&m_nIp, 1);
+		debug("REGISTER_VIGILANTE_LEVEL not implemented\n"); // TODO(MIAMI)
+	case COMMAND_CLEAR_ALL_CHAR_ANIMS:
+	{
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (!pPed->bInVehicle) {
+			pPed->m_pVehicleAnim = nil;
+			pPed->RestartNonPartialAnims();
+			RpAnimBlendClumpRemoveAllAssociations(pPed->GetClump());
+			pPed->SetPedState(PED_IDLE);
+			pPed->SetMoveState(PEDMOVE_STILL);
+			pPed->m_nLastPedState = PED_NONE;
+			pPed->ClearAimFlag();
+			pPed->ClearLookFlag();
+			pPed->bIsPointingGunAt = false;
+			if (pPed->IsPlayer())
+				((CPlayerPed*)pPed)->m_fMoveSpeed = 0.0f;
+			else
+				pPed->m_nStoredMoveState = PEDMOVE_STILL;
+			CAnimManager::AddAnimation(pPed->GetClump(), pPed->m_animGroup, ANIM_IDLE_STANCE);
+			pPed->bIsPedDieAnimPlaying = false;
+		}
+		return 0;
+	}
+	case COMMAND_SET_MAXIMUM_NUMBER_OF_CARS_IN_GARAGE:
+		CollectParameters(&m_nIp, 2);
+		CGarages::SetMaxNumStoredCarsForGarage(ScriptParams[0], ScriptParams[1]);
+		break;
+	case COMMAND_WANTED_STARS_ARE_FLASHING:
+	{
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("WANTED_STARS_ARE_FLASHING not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
+	case COMMAND_SET_ALLOW_HURRICANES:
+		CollectParameters(&m_nIp, 1);
+		CStats::NoMoreHurricanes = ScriptParams[0];
+		return 0;
+	case COMMAND_PLAY_ANNOUNCEMENT:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("PLAY_ANNOUNCEMENT not implemented, skipping\n");
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_IS_IN_STADIUM:
+	{
+		CollectParameters(&m_nIp, 1);
+		CTheScripts::bPlayerIsInTheStatium = ScriptParams[0];
+		return 0;
+	}
+	case COMMAND_GET_BUS_FARES_COLLECTED_BY_PLAYER:
+	{
+		CollectParameters(&m_nIp, 1);
+		debug("GET_BUS_FARES_COLLECTED_BY_PLAYER not implemented\n"); // TODO(MIAMI)
+		ScriptParams[0] = 0;
+		StoreParameters(&m_nIp, 1);
+	}
+	case COMMAND_SET_CHAR_OBJ_BUY_ICE_CREAM:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		assert(pVehicle);
+		ScriptParams[0] = 0;
+		if (pPed->m_objective == OBJECTIVE_NONE && !pPed->bHasAlreadyUsedAttractor) {
+			C2dEffect* pEffect = (C2dEffect*)GetPedAttractorManager()->GetEffectForIceCreamVan(pVehicle, pPed->GetPosition()); // has to be casted, because inner methods are const
+			if ((pPed->GetPosition() - pEffect->pos).MagnitudeSqr() < SQR(20.0f)) {
+				if (GetPedAttractorManager()->HasEmptySlot(pEffect) && GetPedAttractorManager()->IsApproachable(pEffect, pVehicle->GetMatrix(), 0, pPed)) {
+					if (GetPedAttractorManager()->RegisterPedWithAttractor(pPed, pEffect, pVehicle->GetMatrix()))
+						ScriptParams[0] = 1;
+				}
+			}
+		}
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_DISPLAY_RADAR:
+		CollectParameters(&m_nIp, 1);
+		debug("DISPLAY_RADAR not implemented\n");
+		return 0;
+	case COMMAND_REGISTER_BEST_POSITION:
+		CollectParameters(&m_nIp, 2);
+		debug("REGISTER_BEST_POSITION not implemented\n");
+		return 0;
+	case COMMAND_IS_PLAYER_IN_INFO_ZONE:
+	{
+		CollectParameters(&m_nIp, 1);
+		char key[KEY_LENGTH_IN_SCRIPT];
+		CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
+		m_nIp += KEY_LENGTH_IN_SCRIPT;
+		static bool bShowed = false;
+		if (!bShowed) {
+			debug("IS_PLAYER_IN_INFO_ZONE not implemented, default to FALSE\n");
+			bShowed = true;
+		}
+		UpdateCompareFlag(false);
+		return 0;
+	}
+	case COMMAND_CLEAR_CHAR_ICE_CREAM_PURCHASE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (pPed->m_attractor)
+			GetPedAttractorManager()->DeRegisterPed(pPed, pPed->m_attractor);
+		return 0;
+	}
+	case COMMAND_IS_IN_CAR_FIRE_BUTTON_PRESSED:
+		UpdateCompareFlag(CPad::GetPad(0)->GetCarGunFired());
+		return 0;
+	case COMMAND_HAS_CHAR_ATTEMPTED_ATTRACTOR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bHasAlreadyUsedAttractor);
+		return 0;
+	}
+	case COMMAND_SET_LOAD_COLLISION_FOR_CAR_FLAG:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		if (ScriptParams[1]) {
+			pVehicle->bDontLoadCollision = false;
+			if (m_bMissionFlag) {
+				CWorld::Remove(pVehicle);
+				pVehicle->bIsStaticWaitingForCollision = true;
+				CWorld::Add(pVehicle);
+			}
+		}
+		else {
+			pVehicle->bDontLoadCollision = true;
+			if (pVehicle->bIsStaticWaitingForCollision) {
+				pVehicle->bIsStaticWaitingForCollision = false;
+				if (!pVehicle->IsStatic())
+					pVehicle->AddToMovingList();
+			}
+		}
+		return 0;
+	}
+	case COMMAND_SET_LOAD_COLLISION_FOR_CHAR_FLAG:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		if (ScriptParams[1]) {
+			pPed->bDontLoadCollision = false;
+			if (m_bMissionFlag) {
+				CWorld::Remove(pPed);
+				pPed->bIsStaticWaitingForCollision = true;
+				CWorld::Add(pPed);
+			}
+		}
+		else {
+			pPed->bDontLoadCollision = true;
+			if (pPed->bIsStaticWaitingForCollision) {
+				pPed->bIsStaticWaitingForCollision = false;
+				if (!pPed->IsStatic())
+					pPed->AddToMovingList();
+			}
+		}
+		return 0;
+	}
+	//case COMMAND_SET_LOAD_COLLISION_FOR_OBJECT_FLAG:
+	case COMMAND_ADD_BIG_GUN_FLASH:
+	{
+		CollectParameters(&m_nIp, 6);
+		CWeapon::AddGunFlashBigGuns(*(CVector*)&ScriptParams[0], *(CVector*)&ScriptParams[3]);
+		return 0;
+	}
+	case COMMAND_HAS_CHAR_BOUGHT_ICE_CREAM:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(pPed->bBoughtIceCream);
+		return 0;
+	}
+	case COMMAND_GET_PROGRESS_PERCENTAGE:
+		*(float*)&ScriptParams[0] = CStats::GetPercentageProgress();
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	case COMMAND_SET_SHORTCUT_PICKUP_POINT:
+	{
+		CollectParameters(&m_nIp, 4);
+		CGameLogic::AddShortCutPointAfterDeath(*(CVector*)&ScriptParams[0], *(float*)&ScriptParams[3]);
+		return 0;
+	}
+	case COMMAND_SET_SHORTCUT_DROPOFF_POINT_FOR_MISSION:
+	{
+		CollectParameters(&m_nIp, 4);
+		CGameLogic::AddShortCutDropOffPointForMission(*(CVector*)&ScriptParams[0], *(float*)&ScriptParams[3]);
+		return 0;
+	}
+	case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_AREA:
+		CollectParameters(&m_nIp, 7);
+		debug("GET_RANDOM_ICE_CREAM_CUSTOMER_IN_AREA not implemented\n"); // TODO(MIAMI)
+		ScriptParams[0] = -1;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	//case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_ZONE:
+	case COMMAND_UNLOCK_ALL_CAR_DOORS_IN_AREA:
+		CollectParameters(&m_nIp, 4);
+		debug("UNLOCK_ALL_CAR_DOORS_IN_AREA not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_SET_GANG_ATTACK_PLAYER_WITH_COPS:
+		CollectParameters(&m_nIp, 2);
+		CGangs::SetWillAttackPlayerWithCops((ePedType)((int)PEDTYPE_GANG1 + ScriptParams[0]), !!ScriptParams[1]);
+		return 0;
+	case COMMAND_SET_CHAR_FRIGHTENED_IN_JACKED_CAR:
+		assert(0);
+	case COMMAND_SET_VEHICLE_TO_FADE_IN:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), ScriptParams[1]);
+		return 0;
+	}
+	case COMMAND_REGISTER_ODDJOB_MISSION_PASSED:
+		++CStats::MissionsPassed;
+		CStats::CheckPointReachedSuccessfully();
+		CTheScripts::LastMissionPassedTime = CTimer::GetTimeInMilliseconds();
+		CGameLogic::RemoveShortCutDropOffPointForMission();
+		return 0;
+	case COMMAND_IS_PLAYER_IN_SHORTCUT_TAXI:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		UpdateCompareFlag(pPed->bInVehicle && pPed->m_pMyVehicle && pPed->m_pMyVehicle == CGameLogic::pShortCutTaxi);
+		return 0;
+	}
+	case COMMAND_IS_CHAR_DUCKING:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		UpdateCompareFlag(RpAnimBlendClumpGetAssociation(pPed->GetClump(), ANIM_DUCK_DOWN) != nil);
+		return 0;
+	}
+	case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI:
+	{
+		CollectParameters(&m_nIp, 3);
+		debug("CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI not implemented\n"); // TODO(MIAMI)
+		return 0;
+	}
+	case COMMAND_REGISTER_FIRE_LEVEL:
+		CollectParameters(&m_nIp, 1);
+		debug("REGISTER_FIRE_LEVEL not implemented\n"); // TODO(MIAMI)
+		return 0;
+	case COMMAND_IS_AUSTRALIAN_GAME:
+		UpdateCompareFlag(false); // should we make some check?
+		return 0;
+	case COMMAND_DISARM_CAR_BOMB:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		if (pVehicle->m_bombType != CARBOMB_NONE) {
+			pVehicle->m_bombType = CARBOMB_NONE;
+			pVehicle->m_pBombRigger = nil;
+		}
+		return 0;
+	}
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+bool CRunningScript::CheckDamagedWeaponType(int32 actual, int32 type)
+{
+	if (actual == -1)
+		return false;
+
+	if (type == WEAPONTYPE_ANYMELEE) {
+		if (actual <= WEAPONTYPE_CHAINSAW)
+			return true;
+		if (actual - WEAPONTYPE_GRENADE <= WEAPONTYPE_MINIGUN)
+			return false;
+		return false;
+	}
+
+	if (type != WEAPONTYPE_ANYWEAPON)
+		return false;
+
+	switch (actual) {
+		case WEAPONTYPE_UNARMED:
+		case WEAPONTYPE_BRASSKNUCKLE:
+		case WEAPONTYPE_SCREWDRIVER:
+		case WEAPONTYPE_GOLFCLUB:
+		case WEAPONTYPE_NIGHTSTICK:
+		case WEAPONTYPE_KNIFE:
+		case WEAPONTYPE_BASEBALLBAT:
+		case WEAPONTYPE_HAMMER:
+		case WEAPONTYPE_CLEAVER:
+		case WEAPONTYPE_MACHETE:
+		case WEAPONTYPE_KATANA:
+		case WEAPONTYPE_CHAINSAW:
+		case WEAPONTYPE_GRENADE:
+		case WEAPONTYPE_DETONATOR_GRENADE:
+		case WEAPONTYPE_TEARGAS:
+		case WEAPONTYPE_MOLOTOV:
+		case WEAPONTYPE_ROCKET:
+		case WEAPONTYPE_COLT45:
+		case WEAPONTYPE_PYTHON:
+		case WEAPONTYPE_SHOTGUN:
+		case WEAPONTYPE_SPAS12_SHOTGUN:
+		case WEAPONTYPE_STUBBY_SHOTGUN:
+		case WEAPONTYPE_TEC9:
+		case WEAPONTYPE_UZI:
+		case WEAPONTYPE_SILENCED_INGRAM:
+		case WEAPONTYPE_MP5:
+		case WEAPONTYPE_M4:
+		case WEAPONTYPE_RUGER:
+		case WEAPONTYPE_SNIPERRIFLE:
+		case WEAPONTYPE_LASERSCOPE:
+		case WEAPONTYPE_ROCKETLAUNCHER:
+		case WEAPONTYPE_FLAMETHROWER:
+		case WEAPONTYPE_M60:
+		case WEAPONTYPE_MINIGUN:
+		case WEAPONTYPE_DETONATOR:
+		case WEAPONTYPE_HELICANNON:
+		case WEAPONTYPE_CAMERA:
+		case WEAPONTYPE_EXPLOSION:
+		case WEAPONTYPE_UZI_DRIVEBY:
+			return true;
+		case WEAPONTYPE_HEALTH:
+		case WEAPONTYPE_ARMOUR:
+		case WEAPONTYPE_RAMMEDBYCAR:
+		case WEAPONTYPE_RUNOVERBYCAR:
+		case WEAPONTYPE_DROWNING:
+		case WEAPONTYPE_FALL:
+		case WEAPONTYPE_UNIDENTIFIED:
+			return false;
+	}
+
+	return false;
+}
+
+bool CRunningScript::ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami)
+{
+	switch (mi)
+	{
+	case MI_COP: if (cop) return true;
+	case MI_SWAT: if (swat) return true;
+	case MI_FBI: if (fbi) return true;
+	case MI_ARMY: if (army) return true;
+	default:
+		return miami && (mi >= MI_VICE1 && mi <= MI_VICE8);
+	}
+}
+
+void CTheScripts::RemoveThisPed(CPed* pPed)
+{
+	if (pPed) {
+		bool bWasMissionPed = pPed->CharCreatedBy == MISSION_CHAR;
+		if (pPed->InVehicle() && pPed->m_pMyVehicle) {
+			if (pPed->m_pMyVehicle->pDriver == pPed) {
+				pPed->m_pMyVehicle->RemoveDriver();
+				pPed->m_pMyVehicle->SetStatus(STATUS_ABANDONED);
+				if (pPed->m_pMyVehicle->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
+					pPed->m_pMyVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+				if (pPed->m_nPedType == PEDTYPE_COP && pPed->m_pMyVehicle->IsLawEnforcementVehicle())
+					pPed->m_pMyVehicle->ChangeLawEnforcerState(0);
+			}
+			else {
+				pPed->m_pMyVehicle->RemovePassenger(pPed);
+			}
+		}
+		CWorld::RemoveReferencesToDeletedObject(pPed);
+		delete pPed;
+		if (bWasMissionPed)
+			--CPopulation::ms_nTotalMissionPeds;
+	}
+}
+
 int32 CTheScripts::GetNewUniqueScriptSphereIndex(int32 index)
 {
 	if (ScriptSphereArray[index].m_Index >= UINT16_MAX - 1)
@@ -10672,6 +13092,64 @@ void CRunningScript::LocateCarCommand(int32 command, uint32* pIp)
 	}
 }
 
+void CRunningScript::LocateObjectCommand(int32 command, uint32* pIp)
+{
+	bool b3D, result, debug;
+	float X, Y, Z, dX, dY, dZ;
+	switch (command) {
+	case COMMAND_LOCATE_OBJECT_3D:
+		b3D = true;
+		break;
+	default:
+		b3D = false;
+		break;
+	}
+	CollectParameters(pIp, b3D ? 8 : 6);
+	CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+	assert(pObject);
+	CVector pos = pObject->GetPosition();
+	X = *(float*)&ScriptParams[1];
+	Y = *(float*)&ScriptParams[2];
+	if (b3D) {
+		Z = *(float*)&ScriptParams[3];
+		dX = *(float*)&ScriptParams[4];
+		dY = *(float*)&ScriptParams[5];
+		dZ = *(float*)&ScriptParams[6];
+		debug = ScriptParams[7];
+	}
+	else {
+		dX = *(float*)&ScriptParams[3];
+		dY = *(float*)&ScriptParams[4];
+		debug = ScriptParams[5];
+	}
+	result = false;
+	bool in_area;
+	if (b3D) {
+		in_area = X - dX <= pos.x &&
+			X + dX >= pos.x &&
+			Y - dY <= pos.y &&
+			Y + dY >= pos.y &&
+			Z - dZ <= pos.z &&
+			Z + dZ >= pos.z;
+	}
+	else {
+		in_area = X - dX <= pos.x &&
+			X + dX >= pos.x &&
+			Y - dY <= pos.y &&
+			Y + dY >= pos.y;
+	}
+	result = in_area;
+	UpdateCompareFlag(result);
+	if (debug)
+		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, X - dX, Y - dY, X + dX, Y + dY, b3D ? Z : MAP_Z_LOW_LIMIT);
+	if (CTheScripts::DbgFlag) {
+		if (b3D)
+			CTheScripts::DrawDebugCube(X - dX, Y - dY, Z - dZ, X + dX, Y + dY, Z + dZ);
+		else
+			CTheScripts::DrawDebugSquare(X - dX, Y - dY, X + dX, Y + dY);
+	}
+}
+
 void CRunningScript::LocateSniperBulletCommand(int32 command, uint32* pIp)
 {
 	bool b3D, result, debug;
@@ -11169,6 +13647,88 @@ void CRunningScript::CarInAreaCheckCommand(int32 command, uint32* pIp)
 	}
 }
 
+void CRunningScript::ObjectInAreaCheckCommand(int32 command, uint32* pIp)
+{
+	bool b3D, result, debug;
+	float infX, infY, infZ, supX, supY, supZ;
+	switch (command) {
+	case COMMAND_IS_OBJECT_IN_AREA_3D:
+		b3D = true;
+		break;
+	default:
+		b3D = false;
+		break;
+	}
+	CollectParameters(pIp, b3D ? 8 : 6);
+	CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+	assert(pObject);
+	CVector pos = pObject->GetPosition();
+	infX = *(float*)&ScriptParams[1];
+	infY = *(float*)&ScriptParams[2];
+	if (b3D) {
+		infZ = *(float*)&ScriptParams[3];
+		supX = *(float*)&ScriptParams[4];
+		supY = *(float*)&ScriptParams[5];
+		supZ = *(float*)&ScriptParams[6];
+		if (infZ > supZ) {
+			infZ = *(float*)&ScriptParams[6];
+			supZ = *(float*)&ScriptParams[3];
+		}
+		debug = ScriptParams[7];
+	}
+	else {
+		supX = *(float*)&ScriptParams[3];
+		supY = *(float*)&ScriptParams[4];
+		debug = ScriptParams[5];
+	}
+	if (infX > supX) {
+		float tmp = infX;
+		infX = supX;
+		supX = tmp;
+	}
+	if (infY > supY) {
+		float tmp = infY;
+		infY = supY;
+		supY = tmp;
+	}
+	result = false;
+	bool in_area;
+	if (b3D) {
+		in_area = infX <= pos.x &&
+			supX >= pos.x &&
+			infY <= pos.y &&
+			supY >= pos.y &&
+			infZ <= pos.z &&
+			supZ >= pos.z;
+	}
+	else {
+		in_area = infX <= pos.x &&
+			supX >= pos.x &&
+			infY <= pos.y &&
+			supY >= pos.y;
+	}
+	if (in_area) {
+		switch (command) {
+		case COMMAND_IS_OBJECT_IN_AREA_2D:
+		case COMMAND_IS_OBJECT_IN_AREA_3D:
+			result = true;
+			break;
+		default:
+			assert(false);
+			break;
+		}
+	}
+	UpdateCompareFlag(result);
+	if (debug)
+		CTheScripts::HighlightImportantArea((uintptr)this + m_nIp, infX, infY, supX, supY, b3D ? (infZ + supZ) / 2 : MAP_Z_LOW_LIMIT);
+	if (CTheScripts::DbgFlag) {
+		if (b3D)
+			CTheScripts::DrawDebugCube(infX, infY, infZ, supX, supY, supZ);
+		else
+			CTheScripts::DrawDebugSquare(infX, infY, supX, supY);
+	}
+}
+
 void CRunningScript::DoDeatharrestCheck()
 {
 	if (!m_bDeatharrestEnabled)
@@ -11188,29 +13748,6 @@ void CRunningScript::DoDeatharrestCheck()
 	while (m_nStackPointer > 1)
 		--m_nStackPointer;
 	m_nIp = m_anStack[--m_nStackPointer];
-	int16 messageId;
-	if (pPlayer->IsRestartingAfterDeath())
-		messageId = 0;
-	else if (pPlayer->IsRestartingAfterArrest())
-		messageId = 5;
-	else
-		messageId = 10;
-	messageId += CGeneral::GetRandomNumberInRange(0, 5);
-	bool found = false;
-	for (int16 contact = 0; !found && contact < MAX_NUM_CONTACTS; contact++) {
-		int contactFlagOffset = CTheScripts::OnAMissionForContactFlag[contact];
-		if (contactFlagOffset && CTheScripts::ScriptSpace[contactFlagOffset] == 1) {
-			messageId += CTheScripts::BaseBriefIdForContact[contact];
-			found = true;
-		}
-	}
-	if (!found)
-		messageId = 8001;
-	char tmp[16];
-	sprintf(tmp, "%d", messageId);
-	CMessages::ClearSmallMessagesOnly();
-	wchar* text = TheText.Get(tmp);
-	// ...and do nothing about it
 	*(int32*)&CTheScripts::ScriptSpace[CTheScripts::OnAMissionFlag] = 0;
 	m_bDeatharrestExecuted = true;
 	m_nWakeTime = 0;
@@ -11354,8 +13891,8 @@ void CTheScripts::RenderTheScriptDebugLines()
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)0);
 }
 
-#define SCRIPT_DATA_SIZE sizeof(CTheScripts::OnAMissionFlag) + sizeof(CTheScripts::BaseBriefIdForContact) + sizeof(CTheScripts::OnAMissionForContactFlag) +\
-	sizeof(CTheScripts::CollectiveArray) + 4 * sizeof(uint32) * MAX_NUM_BUILDING_SWAPS + 2 * sizeof(uint32) * MAX_NUM_INVISIBILITY_SETTINGS + 5 * sizeof(uint32)
+#define SCRIPT_DATA_SIZE sizeof(CTheScripts::OnAMissionFlag) +\
+	4 * sizeof(uint32) * MAX_NUM_BUILDING_SWAPS + 2 * sizeof(uint32) * MAX_NUM_INVISIBILITY_SETTINGS + 5 * sizeof(uint32)
 
 void CTheScripts::SaveAllScripts(uint8* buf, uint32* size)
 {
@@ -11375,12 +13912,6 @@ INITSAVEBUF
 	uint32 script_data_size = SCRIPT_DATA_SIZE;
 	WriteSaveBuf(buf, script_data_size);
 	WriteSaveBuf(buf, OnAMissionFlag);
-	for (uint32 i = 0; i < MAX_NUM_CONTACTS; i++) {
-		WriteSaveBuf(buf, OnAMissionForContactFlag[i]);
-		WriteSaveBuf(buf, BaseBriefIdForContact[i]);
-	}
-	for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
-		WriteSaveBuf(buf, CollectiveArray[i]);
 	WriteSaveBuf(buf, NextFreeCollectiveIndex);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		CBuilding* pBuilding = BuildingSwapArray[i].m_pBuilding;
@@ -11453,12 +13984,6 @@ INITSAVEBUF
 		ScriptSpace[i] = ReadSaveBuf<uint8>(buf);
 	assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE);
 	OnAMissionFlag = ReadSaveBuf<uint32>(buf);
-	for (uint32 i = 0; i < MAX_NUM_CONTACTS; i++) {
-		OnAMissionForContactFlag[i] = ReadSaveBuf<uint32>(buf);
-		BaseBriefIdForContact[i] = ReadSaveBuf<uint32>(buf);
-	}
-	for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
-		CollectiveArray[i] = ReadSaveBuf<tCollectiveData>(buf);
 	NextFreeCollectiveIndex = ReadSaveBuf<uint32>(buf);
 	for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
 		uint32 type = ReadSaveBuf<uint32>(buf);
diff --git a/src/control/Script.h b/src/control/Script.h
index 7964ec6c..3044e770 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -6,6 +6,7 @@
 
 class CEntity;
 class CBuilding;
+class CPhysical;
 class CVehicle;
 class CPed;
 class CObject;
@@ -14,6 +15,12 @@ class CPlayerInfo;
 class CRunningScript;
 
 #define KEY_LENGTH_IN_SCRIPT 8
+#define SPHERE_MARKER_R 252
+#define SPHERE_MARKER_G 138
+#define SPHERE_MARKER_B 242
+#define SPHERE_MARKER_A 228
+#define SPHERE_MARKER_PULSE_PERIOD 2048
+#define SPHERE_MARKER_PULSE_FRACTION 0.1f
 
 struct intro_script_rectangle 
 {
@@ -131,6 +138,8 @@ public:
 	void AddEntityToList(int32, uint8);
 	void RemoveEntityFromList(int32, uint8);
 	void Process();
+	void CheckIfCollisionHasLoadedForMissionObject();
+	CPhysical* DoesThisEntityWaitForCollision(int i);
 };
 
 struct CUpsideDownCarCheckEntry
@@ -218,20 +227,18 @@ enum {
 };
 
 enum {
-	SIZE_MAIN_SCRIPT = 128 * 1024,
-	SIZE_MISSION_SCRIPT = 32 * 1024,
+	SIZE_MAIN_SCRIPT = 225512,
+	SIZE_MISSION_SCRIPT = 35000,
 	SIZE_SCRIPT_SPACE = SIZE_MAIN_SCRIPT + SIZE_MISSION_SCRIPT
 };
 
 enum {
 	MAX_NUM_SCRIPTS = 128,
-	MAX_NUM_CONTACTS = 16,
 	MAX_NUM_INTRO_TEXT_LINES = 2,
 	MAX_NUM_INTRO_RECTANGLES = 16,
 	MAX_NUM_SCRIPT_SRPITES = 16,
 	MAX_NUM_SCRIPT_SPHERES = 16,
-	MAX_NUM_COLLECTIVES = 32,
-	MAX_NUM_USED_OBJECTS = 200,
+	MAX_NUM_USED_OBJECTS = 220,
 	MAX_NUM_MISSION_SCRIPTS = 120,
 	MAX_NUM_BUILDING_SWAPS = 25,
 	MAX_NUM_INVISIBILITY_SETTINGS = 20,
@@ -242,13 +249,10 @@ class CTheScripts
 {
 	static uint8 ScriptSpace[SIZE_SCRIPT_SPACE];
 	static CRunningScript ScriptsArray[MAX_NUM_SCRIPTS];
-	static int32 BaseBriefIdForContact[MAX_NUM_CONTACTS];
-	static int32 OnAMissionForContactFlag[MAX_NUM_CONTACTS];
 	static intro_text_line IntroTextLines[MAX_NUM_INTRO_TEXT_LINES];
 	static intro_script_rectangle IntroRectangles[MAX_NUM_INTRO_RECTANGLES];
 	static CSprite2d ScriptSprites[MAX_NUM_SCRIPT_SRPITES];
 	static script_sphere_struct ScriptSphereArray[MAX_NUM_SCRIPT_SPHERES];
-	static tCollectiveData CollectiveArray[MAX_NUM_COLLECTIVES];
 	static tUsedObject UsedObjectArray[MAX_NUM_USED_OBJECTS];
 	static int32 MultiScriptArray[MAX_NUM_MISSION_SCRIPTS];
 	static tBuildingSwap BuildingSwapArray[MAX_NUM_BUILDING_SWAPS];
@@ -272,14 +276,17 @@ class CTheScripts
 	static uint32 LargestMissionScriptSize;
 	static uint32 MainScriptSize;
 	static uint8 FailCurrentMission;
-	static uint8 CountdownToMakePlayerUnsafe;
-	static uint8 DelayMakingPlayerUnsafeThisTime;
 	static uint16 NumScriptDebugLines;
 	static uint16 NumberOfIntroRectanglesThisFrame;
 	static uint16 NumberOfIntroTextLinesThisFrame;
 	static uint8 UseTextCommands;
 	static uint16 CommandsExecuted;
 	static uint16 ScriptsUpdated;
+	static uint8 RiotIntensity;
+	static uint32 LastMissionPassedTime;
+	static uint16 NumberOfExclusiveMissionScripts;
+	static bool bPlayerIsInTheStatium;
+	static bool bPlayerHasMetDebbieHarry;
 
 public:
 	static void Init();
@@ -303,9 +310,6 @@ public:
 
 	static int32* GetPointerToScriptVariable(int32 offset) { assert(offset >= 8 && offset < CTheScripts::GetSizeOfVariableSpace()); return (int32*)&ScriptSpace[offset]; }
 
-	static void ResetCountdownToMakePlayerUnsafe() { CountdownToMakePlayerUnsafe = 0; }
-	static bool IsCountdownToMakePlayerUnsafeOn() { return CountdownToMakePlayerUnsafe != 0; }
-
 	static int32 Read4BytesFromScript(uint32* pIp) {
 		int32 retval = ScriptSpace[*pIp + 3] << 24 | ScriptSpace[*pIp + 2] << 16 | ScriptSpace[*pIp + 1] << 8 | ScriptSpace[*pIp];
 		*pIp += 4;
@@ -368,10 +372,13 @@ private:
 	static int32 AddScriptSphere(int32 id, CVector pos, float radius);
 	static int32 GetNewUniqueScriptSphereIndex(int32 index);
 	static void RemoveScriptSphere(int32 index);
+	static void RemoveScriptTextureDictionary();
+	static void RemoveThisPed(CPed* pPed);
 
 	friend class CRunningScript;
 	friend class CHud;
 	friend void CMissionCleanup::Process();
+	friend class CColStore;
 #ifdef FIX_BUGS
 	friend void RetryMission(int, int);
 #endif
@@ -413,6 +420,7 @@ class CRunningScript
 	uint32 m_anStack[MAX_STACK_DEPTH];
 	uint16 m_nStackPointer;
 	int32 m_anLocalVariables[NUM_LOCAL_VARS + NUM_TIMERS];
+	bool m_bIsActive;
 	bool m_bCondResult;
 	bool m_bIsMissionScript;
 	bool m_bSkipWakeTime;
@@ -465,9 +473,11 @@ private:
 	int8 ProcessCommands800To899(int32);
 	int8 ProcessCommands900To999(int32);
 	int8 ProcessCommands1000To1099(int32);
-#ifndef GTA_PS2
 	int8 ProcessCommands1100To1199(int32);
-#endif
+	int8 ProcessCommands1200To1299(int32);
+	int8 ProcessCommands1300To1399(int32);
+	int8 ProcessCommands1400To1499(int32);
+
 	void LocatePlayerCommand(int32, uint32*);
 	void LocatePlayerCharCommand(int32, uint32*);
 	void LocatePlayerCarCommand(int32, uint32*);
@@ -481,6 +491,8 @@ private:
 	void PlayerInAngledAreaCheckCommand(int32, uint32*);
 	void CharInAreaCheckCommand(int32, uint32*);
 	void CarInAreaCheckCommand(int32, uint32*);
+	void LocateObjectCommand(int32, uint32*);
+	void ObjectInAreaCheckCommand(int32, uint32*);
 
 #ifdef MISSION_REPLAY
 	bool CanAllowMissionReplay();
@@ -488,10 +500,11 @@ private:
 
 	float LimitAngleOnCircle(float angle) { return angle < 0.0f ? angle + 360.0f : angle; }
 
-	bool ThisIsAValidRandomPed(uint32 pedtype) {
+	bool ThisIsAValidRandomPed(uint32 pedtype, int civ, int gang, int criminal) {
 		switch (pedtype) {
 		case PEDTYPE_CIVMALE:
 		case PEDTYPE_CIVFEMALE:
+			return civ;
 		case PEDTYPE_GANG1:
 		case PEDTYPE_GANG2:
 		case PEDTYPE_GANG3:
@@ -501,15 +514,23 @@ private:
 		case PEDTYPE_GANG7:
 		case PEDTYPE_GANG8:
 		case PEDTYPE_GANG9:
+			return gang;
 		case PEDTYPE_CRIMINAL:
 		case PEDTYPE_PROSTITUTE:
-			return true;
+			return criminal;
 		default:
 			return false;
 		}
 	}
+
+	bool CheckDamagedWeaponType(int32 actual, int32 type);
+	
+	static bool ThisIsAValidRandomCop(int32 mi, bool cop, bool swat, bool fbi, bool army, bool miami);
 };
 
+#ifdef USE_DEBUG_SCRIPT_LOADER
+extern int scriptToLoad;
+#endif
 #ifdef MISSION_REPLAY
 extern int AllowMissionReplay;
 extern uint32 WaitForMissionActivate;
diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h
index 77cf3f0f..67b1b9bc 100644
--- a/src/control/ScriptCommands.h
+++ b/src/control/ScriptCommands.h
@@ -995,7 +995,7 @@ enum {
 	COMMAND_FORCE_RANDOM_PED_TYPE,
 	COMMAND_SET_TEXT_DRAW_BEFORE_FADE,
 	COMMAND_GET_COLLECTABLE1S_COLLECTED,
-	COMMAND_REGISTER_EL_BURRO_TIME,
+	COMMAND_SET_CHAR_OBJ_LEAVE_ANY_CAR,
 	COMMAND_SET_SPRITES_DRAW_BEFORE_FADE,
 	COMMAND_SET_TEXT_RIGHT_JUSTIFY,
 	COMMAND_PRINT_HELP,
@@ -1022,17 +1022,17 @@ enum {
 	COMMAND_MAKE_PLAYER_SAFE,
 	COMMAND_SET_CAR_STAYS_IN_CURRENT_LEVEL,
 	COMMAND_SET_CHAR_STAYS_IN_CURRENT_LEVEL,
-	COMMAND_REGISTER_4X4_ONE_TIME,
-	COMMAND_REGISTER_4X4_TWO_TIME,
-	COMMAND_REGISTER_4X4_THREE_TIME,
-	COMMAND_REGISTER_4X4_MAYHEM_TIME,
+	COMMAND_SET_DRUNK_INPUT_DELAY,
+	COMMAND_SET_CHAR_MONEY,
+	COMMAND_INCREASE_CHAR_MONEY,
+	COMMAND_GET_OFFSET_FROM_OBJECT_IN_WORLD_COORDS,
 	COMMAND_REGISTER_LIFE_SAVED,
 	COMMAND_REGISTER_CRIMINAL_CAUGHT,
 	COMMAND_REGISTER_AMBULANCE_LEVEL,
 	COMMAND_REGISTER_FIRE_EXTINGUISHED,
 	COMMAND_TURN_PHONE_ON,
 	COMMAND_REGISTER_LONGEST_DODO_FLIGHT,
-	COMMAND_REGISTER_DEFUSE_BOMB_TIME,
+	COMMAND_GET_OFFSET_FROM_CAR_IN_WORLD_COORDS,
 	COMMAND_SET_TOTAL_NUMBER_OF_KILL_FRENZIES,
 	COMMAND_BLOW_UP_RC_BUGGY,
 	COMMAND_REMOVE_CAR_FROM_CHASE,
@@ -1108,7 +1108,6 @@ enum {
 	COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER,
 	COMMAND_LOAD_END_OF_GAME_TUNE,
 	COMMAND_ENABLE_PLAYER_CONTROL_CAMERA,
-#ifndef GTA_PS2
 	COMMAND_SET_OBJECT_ROTATION,
 	COMMAND_GET_DEBUG_CAMERA_COORDINATES,
 	COMMAND_GET_DEBUG_CAMERA_FRONT_VECTOR,
@@ -1145,7 +1144,7 @@ enum {
 	COMMAND_LOCATE_CHAR_ANY_MEANS_OBJECT_3D,
 	COMMAND_LOCATE_CHAR_ON_FOOT_OBJECT_3D,
 	COMMAND_LOCATE_CHAR_IN_CAR_OBJECT_3D,
-	COMMAND_SET_CAR_HANDBRAKE_TURN_LEFT,
+	COMMAND_SET_CAR_TEMP_ACTION,
 	COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT,
 	COMMAND_SET_CAR_HANDBRAKE_STOP,
 	COMMAND_IS_CHAR_ON_ANY_BIKE,
@@ -1156,8 +1155,286 @@ enum {
 	COMMAND_IS_CHAR_LYING_DOWN,
 	COMMAND_CAN_CHAR_SEE_DEAD_CHAR,
 	COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER,
-#ifndef GTA3_1_1_PATCH
-	COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER
-#endif
-#endif
+	COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER,
+	COMMAND_SET_CHAR_CEASE_ATTACK_TIMER,
+	COMMAND_GET_REMOTE_CONTROLLED_CAR,
+	COMMAND_IS_PC_VERSION,
+	COMMAND_REPLAY,
+	COMMAND_IS_REPLAY_PLAYING,
+	COMMAND_IS_MODEL_AVAILABLE,
+	COMMAND_SHUT_CHAR_UP,
+	COMMAND_SET_ENABLE_RC_DETONATE,
+	COMMAND_SET_CAR_RANDOM_ROUTE_SEED,
+	COMMAND_IS_ANY_PICKUP_AT_COORDS,
+	COMMAND_GET_FIRST_PICKUP_COORDS,
+	COMMAND_GET_NEXT_PICKUP_COORDS,
+	COMMAND_REMOVE_ALL_CHAR_WEAPONS,
+	COMMAND_HAS_PLAYER_GOT_WEAPON,
+	COMMAND_HAS_CHAR_GOT_WEAPON,
+	COMMAND_IS_PLAYER_FACING_CHAR,
+	COMMAND_SET_TANK_DETONATE_CARS,
+	COMMAND_GET_POSITION_OF_ANALOGUE_STICKS,
+	COMMAND_IS_CAR_ON_FIRE,
+	COMMAND_IS_CAR_TYRE_BURST,
+	COMMAND_SET_CAR_DRIVE_STRAIGHT_AHEAD,
+	COMMAND_SET_CAR_WAIT,
+	COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE,
+	COMMAND_IS_PLAYER_FOOT_DOWN,
+	COMMAND_IS_CHAR_FOOT_DOWN,
+	COMMAND_INITIALISE_OBJECT_PATH,
+	COMMAND_START_OBJECT_ON_PATH,
+	COMMAND_SET_OBJECT_PATH_SPEED,
+	COMMAND_SET_OBJECT_PATH_POSITION,
+	COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH,
+	COMMAND_CLEAR_OBJECT_PATH,
+	COMMAND_HELI_GOTO_COORDS,
+	COMMAND_IS_INT_VAR_EQUAL_TO_CONSTANT,
+	COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT,
+	COMMAND_GET_DEAD_CHAR_PICKUP_COORDS,
+	COMMAND_CREATE_PROTECTION_PICKUP,
+	COMMAND_IS_CHAR_IN_ANY_BOAT,
+	COMMAND_IS_PLAYER_IN_ANY_BOAT,
+	COMMAND_IS_CHAR_IN_ANY_HELI,
+	COMMAND_IS_PLAYER_IN_ANY_HELI,
+	COMMAND_IS_CHAR_IN_ANY_PLANE,
+	COMMAND_IS_PLAYER_IN_ANY_PLANE,
+	COMMAND_IS_CHAR_IN_WATER,
+	COMMAND_SET_VAR_INT_TO_CONSTANT,
+	COMMAND_SET_LVAR_INT_TO_CONSTANT,
+	COMMAND_IS_INT_VAR_GREATER_THAN_CONSTANT,
+	COMMAND_IS_INT_LVAR_GREATER_THAN_CONSTANT,
+	COMMAND_IS_CONSTANT_GREATER_THAN_INT_VAR,
+	COMMAND_IS_CONSTANT_GREATER_THAN_INT_LVAR,
+	COMMAND_IS_INT_VAR_GREATER_OR_EQUAL_TO_CONSTANT,
+	COMMAND_IS_INT_LVAR_GREATER_OR_EQUAL_TO_CONSTANT,
+	COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR,
+	COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_LVAR,
+	COMMAND_GET_CHAR_WEAPON_IN_SLOT,
+	COMMAND_GET_CLOSEST_STRAIGHT_ROAD,
+	COMMAND_SET_CAR_FORWARD_SPEED,
+	COMMAND_SET_AREA_VISIBLE,
+	COMMAND_SET_CUTSCENE_ANIM_TO_LOOP,
+	COMMAND_MARK_CAR_AS_CONVOY_CAR,
+	COMMAND_RESET_HAVOC_CAUSED_BY_PLAYER,
+	COMMAND_GET_HAVOC_CAUSED_BY_PLAYER,
+	COMMAND_CREATE_SCRIPT_ROADBLOCK,
+	COMMAND_CLEAR_ALL_SCRIPT_ROADBLOCKS,
+	COMMAND_SET_CHAR_OBJ_WALK_TO_CHAR,
+	COMMAND_IS_PICKUP_IN_ZONE,
+	COMMAND_GET_OFFSET_FROM_CHAR_IN_WORLD_COORDS,
+	COMMAND_HAS_CHAR_BEEN_PHOTOGRAPHED,
+	COMMAND_SET_CHAR_OBJ_AIM_GUN_AT_CHAR,
+	COMMAND_SWITCH_SECURITY_CAMERA,
+	COMMAND_IS_CHAR_IN_FLYING_VEHICLE,
+	COMMAND_IS_PLAYER_IN_FLYING_VEHICLE,
+	COMMAND_HAS_SONY_CD_BEEN_READ,
+	COMMAND_GET_NUMBER_OF_SONY_CDS_READ,
+	COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD_OLD,
+	COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD,
+	COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_COORD,
+	COMMAND_ADD_MONEY_SPENT_ON_CLOTHES,
+	COMMAND_SET_HELI_ORIENTATION,
+	COMMAND_CLEAR_HELI_ORIENTATION,
+	COMMAND_PLANE_GOTO_COORDS,
+	COMMAND_GET_NTH_CLOSEST_CAR_NODE,
+	COMMAND_GET_NTH_CLOSEST_CHAR_NODE,
+	COMMAND_DRAW_WEAPONSHOP_CORONA,
+	COMMAND_SET_ENABLE_RC_DETONATE_ON_CONTACT,
+	COMMAND_FREEZE_CHAR_POSITION,
+	COMMAND_SET_CHAR_DROWNS_IN_WATER,
+	COMMAND_SET_OBJECT_RECORDS_COLLISIONS,
+	COMMAND_HAS_OBJECT_COLLIDED_WITH_ANYTHING,
+	COMMAND_REMOVE_RC_BUGGY,
+	COMMAND_HAS_PHOTOGRAPH_BEEN_TAKEN,
+	COMMAND_GET_CHAR_ARMOUR,
+	COMMAND_SET_CHAR_ARMOUR,
+	COMMAND_SET_HELI_STABILISER,
+	COMMAND_SET_CAR_STRAIGHT_LINE_DISTANCE,
+	COMMAND_POP_CAR_BOOT,
+	COMMAND_SHUT_PLAYER_UP,
+	COMMAND_SET_PLAYER_MOOD,
+	COMMAND_REQUEST_COLLISION,
+	COMMAND_LOCATE_OBJECT_2D,
+	COMMAND_LOCATE_OBJECT_3D,
+	COMMAND_IS_OBJECT_IN_WATER,
+	COMMAND_SET_CHAR_OBJ_STEAL_ANY_CAR_EVEN_MISSION_CAR,
+	COMMAND_IS_OBJECT_IN_AREA_2D,
+	COMMAND_IS_OBJECT_IN_AREA_3D,
+	COMMAND_TASK_TOGGLE_DUCK,
+	COMMAND_SET_ZONE_CIVILIAN_CAR_INFO,
+	COMMAND_REQUEST_ANIMATION,
+	COMMAND_HAS_ANIMATION_LOADED,
+	COMMAND_REMOVE_ANIMATION,
+	COMMAND_IS_CHAR_WAITING_FOR_WORLD_COLLISION,
+	COMMAND_IS_CAR_WAITING_FOR_WORLD_COLLISION,
+	COMMAND_IS_OBJECT_WAITING_FOR_WORLD_COLLISION,
+	COMMAND_SET_CHAR_SHUFFLE_INTO_DRIVERS_SEAT,
+	COMMAND_ATTACH_CHAR_TO_OBJECT,
+	COMMAND_SET_CHAR_AS_PLAYER_FRIEND,
+	COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER,
+	COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER_WITH_STRING,
+	COMMAND_ADD_SET_PIECE,
+	COMMAND_SET_EXTRA_COLOURS,
+	COMMAND_CLEAR_EXTRA_COLOURS,
+	COMMAND_CLOSE_CAR_BOOT,
+	COMMAND_GET_WHEELIE_STATS,
+	COMMAND_DISARM_CHAR,
+	COMMAND_BURST_CAR_TYRE,
+	COMMAND_IS_CHAR_OBJ_NO_OBJ,
+	COMMAND_IS_PLAYER_WEARING,
+	COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY,
+	COMMAND_SET_CHAR_OBJ_SPRINT_TO_COORD,
+	COMMAND_CREATE_SWAT_ROPE,
+	COMMAND_SET_FIRST_PERSON_CONTROL_CAMERA,
+	COMMAND_GET_NEAREST_TYRE_TO_POINT,
+	COMMAND_SET_CAR_MODEL_COMPONENTS,
+	COMMAND_SWITCH_LIFT_CAMERA,
+	COMMAND_CLOSE_ALL_CAR_DOORS,
+	COMMAND_GET_DISTANCE_BETWEEN_COORDS_2D,
+	COMMAND_GET_DISTANCE_BETWEEN_COORDS_3D,
+	COMMAND_POP_CAR_BOOT_USING_PHYSICS,
+	COMMAND_SET_FIRST_PERSON_WEAPON_CAMERA,
+	COMMAND_IS_CHAR_LEAVING_VEHICLE_TO_DIE,
+	COMMAND_SORT_OUT_OBJECT_COLLISION_WITH_CAR,
+	COMMAND_GET_MAX_WANTED_LEVEL,
+	COMMAND_IS_CHAR_WANDER_PATH_CLEAR,
+	COMMAND_PRINT_HELP_WITH_NUMBER,
+	COMMAND_PRINT_HELP_FOREVER,
+	COMMAND_PRINT_HELP_FOREVER_WITH_NUMBER,
+	COMMAND_SET_CHAR_CAN_BE_DAMAGED_BY_MEMBERS_OF_GANG,
+	COMMAND_LOAD_AND_LAUNCH_MISSION_EXCLUSIVE,
+	COMMAND_IS_MISSION_AUDIO_PLAYING,
+	COMMAND_CREATE_LOCKED_PROPERTY_PICKUP,
+	COMMAND_CREATE_FORSALE_PROPERTY_PICKUP,
+	COMMAND_FREEZE_CAR_POSITION,
+	COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CHAR,
+	COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CAR,
+	COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CHAR,
+	COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CAR,
+	COMMAND_GET_RADIO_CHANNEL,
+	COMMAND_DISPLAY_TEXT_WITH_3_NUMBERS,
+	COMMAND_IS_CAR_DROWNING_IN_WATER,
+	COMMAND_IS_CHAR_DROWNING_IN_WATER,
+	COMMAND_DISABLE_CUTSCENE_SHADOWS,
+	COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY,
+	COMMAND_ATTACH_CUTSCENE_OBJECT_TO_BONE,
+	COMMAND_ATTACH_CUTSCENE_OBJECT_TO_COMPONENT,
+	COMMAND_SET_CHAR_STAY_IN_CAR_WHEN_JACKED,
+	COMMAND_IS_MISSION_AUDIO_LOADING,
+	COMMAND_ADD_MONEY_SPENT_ON_WEAPONS,
+	COMMAND_ADD_MONEY_SPENT_ON_PROPERTY,
+	COMMAND_ADD_MONEY_SPENT_ON_AUTO_PAINTING,
+	COMMAND_SET_CHAR_ANSWERING_MOBILE,
+	COMMAND_SET_PLAYER_DRUNKENNESS,
+	COMMAND_GET_PLAYER_DRUNKENNESS,
+	COMMAND_SET_PLAYER_DRUG_LEVEL,
+	COMMAND_GET_PLAYER_DRUG_LEVEL,
+	COMMAND_ADD_LOAN_SHARK_VISITS,
+	COMMAND_ADD_STORES_KNOCKED_OFF,
+	COMMAND_ADD_MOVIE_STUNTS,
+	COMMAND_ADD_NUMBER_OF_ASSASSINATIONS,
+	COMMAND_ADD_PIZZAS_DELIVERED,
+	COMMAND_ADD_GARBAGE_PICKUPS,
+	COMMAND_ADD_ICE_CREAMS_SOLD,
+	COMMAND_SET_TOP_SHOOTING_RANGE_SCORE,
+	COMMAND_ADD_SHOOTING_RANGE_RANK,
+	COMMAND_ADD_MONEY_SPENT_ON_GAMBLING,
+	COMMAND_ADD_MONEY_WON_ON_GAMBLING,
+	COMMAND_SET_LARGEST_GAMBLING_WIN,
+	COMMAND_SET_CHAR_IN_PLAYERS_GROUP_CAN_FIGHT,
+	COMMAND_CLEAR_CHAR_WAIT_STATE,
+	COMMAND_GET_RANDOM_CAR_OF_TYPE_IN_AREA_NO_SAVE,
+	COMMAND_SET_CAN_BURST_CAR_TYRES,
+	COMMAND_SET_PLAYER_AUTO_AIM,
+	COMMAND_FIRE_HUNTER_GUN,
+	COMMAND_SET_PROPERTY_AS_OWNED,
+	COMMAND_ADD_BLOOD_RING_KILLS,
+	COMMAND_SET_LONGEST_TIME_IN_BLOOD_RING,
+	COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE,
+	COMMAND_IS_PLAYER_TOUCHING_VEHICLE,
+	COMMAND_IS_CHAR_TOUCHING_VEHICLE,
+	COMMAND_CHECK_FOR_PED_MODEL_AROUND_PLAYER,
+	COMMAND_CLEAR_CHAR_FOLLOW_PATH,
+	COMMAND_SET_CHAR_CAN_BE_SHOT_IN_VEHICLE,
+	COMMAND_ATTACH_CUTSCENE_OBJECT_TO_VEHICLE,
+	COMMAND_LOAD_MISSION_TEXT,
+	COMMAND_SET_TONIGHTS_EVENT,
+	COMMAND_CLEAR_CHAR_LAST_DAMAGE_ENTITY,
+	COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY,
+	COMMAND_FREEZE_OBJECT_POSITION,
+	COMMAND_SET_PLAYER_HAS_MET_DEBBIE_HARRY,
+	COMMAND_SET_RIOT_INTENSITY,
+	COMMAND_IS_CAR_IN_ANGLED_AREA_2D,
+	COMMAND_IS_CAR_IN_ANGLED_AREA_3D,
+	COMMAND_REMOVE_WEAPON_FROM_CHAR,
+	COMMAND_SET_UP_TAXI_SHORTCUT,
+	COMMAND_CLEAR_TAXI_SHORTCUT,
+	COMMAND_SET_CHAR_OBJ_GOTO_CAR_ON_FOOT,
+	COMMAND_GET_CLOSEST_WATER_NODE,
+	COMMAND_ADD_PORN_LEAFLET_TO_RUBBISH,
+	COMMAND_CREATE_CLOTHES_PICKUP,
+	COMMAND_CHANGE_BLIP_THRESHOLD,
+	COMMAND_MAKE_PLAYER_FIRE_PROOF,
+	COMMAND_INCREASE_PLAYER_MAX_HEALTH,
+	COMMAND_INCREASE_PLAYER_MAX_ARMOUR,
+	COMMAND_CREATE_RANDOM_CHAR_AS_DRIVER,
+	COMMAND_CREATE_RANDOM_CHAR_AS_PASSENGER,
+	COMMAND_SET_CHAR_IGNORE_THREATS_BEHIND_OBJECTS,
+	COMMAND_ENSURE_PLAYER_HAS_DRIVE_BY_WEAPON,
+	COMMAND_MAKE_HELI_COME_CRASHING_DOWN,
+	COMMAND_ADD_EXPLOSION_NO_SOUND,
+	COMMAND_SET_OBJECT_AREA_VISIBLE,
+	COMMAND_WAS_VEHICLE_EVER_POLICE,
+	COMMAND_SET_CHAR_NEVER_TARGETTED,
+	COMMAND_LOAD_UNCOMPRESSED_ANIM,
+	COMMAND_WAS_CUTSCENE_SKIPPED,
+	COMMAND_SET_CHAR_CROUCH_WHEN_THREATENED,
+	COMMAND_IS_CHAR_IN_ANY_POLICE_VEHICLE,
+	COMMAND_DOES_CHAR_EXIST,
+	COMMAND_DOES_VEHICLE_EXIST,
+	COMMAND_ADD_SHORT_RANGE_BLIP_FOR_CONTACT_POINT,
+	COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_CONTACT_POINT,
+	COMMAND_IS_CHAR_STUCK,
+	COMMAND_SET_ALL_TAXIS_HAVE_NITRO,
+	COMMAND_SET_CHAR_STOP_SHOOT_DONT_SEEK_ENTITY,
+	COMMAND_FREEZE_CAR_POSITION_AND_DONT_LOAD_COLLISION,
+	COMMAND_FREEZE_CHAR_POSITION_AND_DONT_LOAD_COLLISION,
+	COMMAND_FREEZE_OBJECT_POSITION_AND_DONT_LOAD_COLLISION,
+	COMMAND_SET_FADE_AND_JUMPCUT_AFTER_RC_EXPLOSION,
+	COMMAND_REGISTER_VIGILANTE_LEVEL,
+	COMMAND_CLEAR_ALL_CHAR_ANIMS,
+	COMMAND_SET_MAXIMUM_NUMBER_OF_CARS_IN_GARAGE,
+	COMMAND_WANTED_STARS_ARE_FLASHING,
+	COMMAND_SET_ALLOW_HURRICANES,
+	COMMAND_PLAY_ANNOUNCEMENT,
+	COMMAND_SET_PLAYER_IS_IN_STADIUM,
+	COMMAND_GET_BUS_FARES_COLLECTED_BY_PLAYER,
+	COMMAND_SET_CHAR_OBJ_BUY_ICE_CREAM,
+	COMMAND_DISPLAY_RADAR,
+	COMMAND_REGISTER_BEST_POSITION,
+	COMMAND_IS_PLAYER_IN_INFO_ZONE,
+	COMMAND_CLEAR_CHAR_ICE_CREAM_PURCHASE,
+	COMMAND_IS_IN_CAR_FIRE_BUTTON_PRESSED,
+	COMMAND_HAS_CHAR_ATTEMPTED_ATTRACTOR,
+	COMMAND_SET_LOAD_COLLISION_FOR_CAR_FLAG,
+	COMMAND_SET_LOAD_COLLISION_FOR_CHAR_FLAG,
+	COMMAND_SET_LOAD_COLLISION_FOR_OBJECT_FLAG,
+	COMMAND_ADD_BIG_GUN_FLASH,
+	COMMAND_HAS_CHAR_BOUGHT_ICE_CREAM,
+	COMMAND_GET_PROGRESS_PERCENTAGE,
+	COMMAND_SET_SHORTCUT_PICKUP_POINT,
+	COMMAND_SET_SHORTCUT_DROPOFF_POINT_FOR_MISSION,
+	COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_AREA,
+	COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_ZONE,
+	COMMAND_UNLOCK_ALL_CAR_DOORS_IN_AREA,
+	COMMAND_SET_GANG_ATTACK_PLAYER_WITH_COPS,
+	COMMAND_SET_CHAR_FRIGHTENED_IN_JACKED_CAR,
+	COMMAND_SET_VEHICLE_TO_FADE_IN,
+	COMMAND_REGISTER_ODDJOB_MISSION_PASSED,
+	COMMAND_IS_PLAYER_IN_SHORTCUT_TAXI,
+	COMMAND_IS_CHAR_DUCKING,
+	COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI,
+	COMMAND_REGISTER_FIRE_LEVEL,
+	COMMAND_IS_AUSTRALIAN_GAME,
+	COMMAND_DISARM_CAR_BOMB,
 };
\ No newline at end of file
diff --git a/src/control/SetPieces.cpp b/src/control/SetPieces.cpp
new file mode 100644
index 00000000..9b4e0075
--- /dev/null
+++ b/src/control/SetPieces.cpp
@@ -0,0 +1,319 @@
+#include "common.h"
+
+#include "SetPieces.h"
+#include "Automobile.h"
+#include "CarAI.h"
+#include "CopPed.h"
+#include "GenericGameStorage.h"
+#include "PlayerPed.h"
+#include "Timer.h"
+#include "Vehicle.h"
+#include "Wanted.h"
+#include "World.h"
+
+#define TIME_BETWEEN_SETPIECE_SPAWNS 20000
+
+//--MIAMI: file done
+
+bool CSetPieces::bDebug;
+uint32 CSetPieces::NumSetPieces;
+CSetPiece CSetPieces::aSetPieces[NUM_SETPIECES];
+
+void CSetPieces::Init(void)
+{
+	bDebug = false;
+	NumSetPieces = 0;
+}
+
+void CSetPieces::AddOne(uint8 type, CVector2D vTriggerInf, CVector2D vTriggerSup, CVector2D vSpawn1, CVector2D vTarget1, CVector2D vSpawn2, CVector2D vTarget2)
+{
+	if (NumSetPieces >= NUM_SETPIECES)
+		return;
+	aSetPieces[NumSetPieces].m_nType = (eSetPieceType)type;
+	aSetPieces[NumSetPieces].m_vTriggerInf.x = Min(vTriggerInf.x, vTriggerSup.x);
+	aSetPieces[NumSetPieces].m_vTriggerInf.y = Min(vTriggerInf.y, vTriggerSup.y);
+	aSetPieces[NumSetPieces].m_vTriggerSup.x = Max(vTriggerInf.x, vTriggerSup.x);
+	aSetPieces[NumSetPieces].m_vTriggerSup.y = Max(vTriggerInf.y, vTriggerSup.y);
+	aSetPieces[NumSetPieces].m_vSpawn1 = vSpawn1;
+	aSetPieces[NumSetPieces].m_vSpawn2 = vSpawn2;
+	aSetPieces[NumSetPieces].m_vTarget1 = vTarget1;
+	aSetPieces[NumSetPieces].m_vTarget2 = vTarget2;
+	++NumSetPieces;
+}
+
+void CSetPieces::Update(void)
+{
+	int nFirst = NumSetPieces * (CTimer::GetFrameCounter() % 8) / 8;
+	int nLast = NumSetPieces * (CTimer::GetFrameCounter() % 8 + 1) / 8;
+	for (int i = nFirst; i < nLast; i++)
+		aSetPieces[i].Update();
+}
+
+void CSetPieces::Save(uint8* buf, uint32* size)
+{
+INITSAVEBUF
+	WriteSaveBuf(buf, NumSetPieces);
+	for (int i = 0; i < NUM_SETPIECES; i++)
+		WriteSaveBuf(buf, aSetPieces[i]);
+	*size = sizeof(NumSetPieces) + NUM_SETPIECES * sizeof(CSetPiece);
+VALIDATESAVEBUF(*size)
+}
+
+void CSetPieces::Load(uint8* buf, uint32 size)
+{
+INITSAVEBUF
+	NumSetPieces = ReadSaveBuf<uint32>(buf);
+	for (int i = 0; i < NUM_SETPIECES; i++)
+		aSetPieces[i] = ReadSaveBuf<CSetPiece>(buf);
+VALIDATESAVEBUF(size)
+}
+
+void CSetPiece::Update(void)
+{
+	if (m_nLastTimeCreated != 0 && CTimer::GetTimeInMilliseconds() <= m_nLastTimeCreated + TIME_BETWEEN_SETPIECE_SPAWNS)
+		return;
+	CVector pos = FindPlayerCoors();
+	if (pos.x < m_vTriggerInf.x || pos.x > m_vTriggerSup.x ||
+		pos.y < m_vTriggerInf.y || pos.y > m_vTriggerSup.y)
+		return;
+	switch (m_nType) {
+	case SETPIECE_TWOCOPCARSINALLEY:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
+			return;
+		CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
+		if (!pVehicle1)
+			return;
+		CVehicle* pVehicle2 = TryToGenerateCopCar(m_vSpawn2, m_vTarget2);
+		if (!pVehicle2) {
+			CWorld::Remove(pVehicle1);
+			delete pVehicle1;
+			return;
+		}
+		pVehicle1->SetStatus(STATUS_PHYSICS);
+		pVehicle1->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 4;
+		pVehicle1->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_SLOW_DOWN_FOR_CARS;
+		pVehicle1->AutoPilot.m_nCarMission = MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1;
+		pVehicle1->AutoPilot.m_vecDestinationCoors.x = m_vTarget1.x;
+		pVehicle1->AutoPilot.m_vecDestinationCoors.y = m_vTarget1.y;
+		pVehicle1->AutoPilot.m_vecDestinationCoors.z = 0.0f;
+		pVehicle1->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 25000;
+		CCarAI::AddPoliceCarOccupants(pVehicle1);
+		pVehicle2->SetStatus(STATUS_PHYSICS);
+		pVehicle2->AutoPilot.m_fMaxTrafficSpeed = pVehicle2->AutoPilot.m_nCruiseSpeed = 4;
+		pVehicle2->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_SLOW_DOWN_FOR_CARS;
+		pVehicle2->AutoPilot.m_nCarMission = MISSION_SLOWLY_DRIVE_TOWARDS_PLAYER_1;
+		pVehicle2->AutoPilot.m_vecDestinationCoors.x = m_vTarget2.x;
+		pVehicle2->AutoPilot.m_vecDestinationCoors.y = m_vTarget2.y;
+		pVehicle2->AutoPilot.m_vecDestinationCoors.z = 0.0f;
+		pVehicle2->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 25000;
+		CCarAI::AddPoliceCarOccupants(pVehicle2);
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		break;
+	}
+	case SETPIECE_CARBLOCKINGPLAYERFROMSIDE:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
+			return;
+		if (!FindPlayerVehicle())
+			return;
+		if (DotProduct2D(FindPlayerSpeed(), (CVector2D)FindPlayerCoors() - m_vSpawn1) >= 0.0f)
+			return;
+		CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
+		if (!pVehicle1)
+			return;
+		pVehicle1->SetStatus(STATUS_PHYSICS);
+		pVehicle1->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle1->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH;
+		pVehicle1->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FORWARDANDBACK;
+		pVehicle1->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle1->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle1->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle1->SetMoveSpeed(2.0f * pVehicle1->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle1);
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	case SETPIECE_CARRAMMINGPLAYERFROMSIDE:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
+			return;
+		if (!FindPlayerVehicle())
+			return;
+		if (DotProduct2D(FindPlayerSpeed(), (CVector2D)FindPlayerCoors() - m_vSpawn1) >= 0.0f)
+			return;
+		CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
+		if (!pVehicle1)
+			return;
+		pVehicle1->SetStatus(STATUS_PHYSICS);
+		pVehicle1->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle1->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
+		pVehicle1->AutoPilot.m_nCarMission = MISSION_RAMCAR_CLOSE;
+		pVehicle1->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle1->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle1->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle1->SetMoveSpeed(2.0f * pVehicle1->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle1);
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	case SETPIECE_CREATECOPPERONFOOT:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
+			return;
+		CCopPed* pCop = TryToGenerateCopPed(m_vSpawn1);
+		if (!pCop)
+			return;
+		float z = CWorld::FindGroundZForCoord(m_vTarget1.x, m_vTarget1.y);
+		pCop->bScriptObjectiveCompleted = false;
+		pCop->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, CVector(m_vTarget1.x, m_vTarget1.y, z));
+		pCop->m_nExtendedRangeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	case SETPIECE_CREATETWOCOPPERSONFOOT:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 1 || FindPlayerVehicle())
+			return;
+		CCopPed* pCop = TryToGenerateCopPed(m_vSpawn1);
+		if (!pCop)
+			return;
+		float z = CWorld::FindGroundZForCoord(m_vTarget1.x, m_vTarget1.y);
+		pCop->bScriptObjectiveCompleted = false;
+		pCop->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, CVector(m_vTarget1.x, m_vTarget1.y, z));
+		pCop->m_nExtendedRangeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+		CCopPed* pCop2 = TryToGenerateCopPed(m_vSpawn2);
+		if (!pCop2) {
+			CWorld::Remove(pCop);
+			delete pCop;
+			return;
+		}
+		z = CWorld::FindGroundZForCoord(m_vTarget2.x, m_vTarget2.y);
+		pCop2->bScriptObjectiveCompleted = false;
+		pCop2->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, CVector(m_vTarget2.x, m_vTarget2.y, z));
+		pCop2->m_nExtendedRangeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	case SETPIECE_TWOCARSBLOCKINGPLAYERFROMSIDE:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
+			return;
+		if (!FindPlayerVehicle())
+			return;
+		if (DotProduct2D(FindPlayerSpeed(), (CVector2D)FindPlayerCoors() - m_vSpawn1) >= 0.0f)
+			return;
+		CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
+		if (!pVehicle1)
+			return;
+		pVehicle1->SetStatus(STATUS_PHYSICS);
+		pVehicle1->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle1->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH;
+		pVehicle1->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FORWARDANDBACK;
+		pVehicle1->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle1->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle1->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle1->SetMoveSpeed(2.0f * pVehicle1->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle1);
+		CVehicle* pVehicle2 = TryToGenerateCopCar(m_vSpawn2, m_vTarget2);
+		if (!pVehicle2) {
+			CWorld::Remove(pVehicle1);
+			delete pVehicle1;
+			return;
+		}
+		pVehicle2->SetStatus(STATUS_PHYSICS);
+		pVehicle2->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle2->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH;
+		pVehicle2->AutoPilot.m_nCarMission = MISSION_BLOCKPLAYER_FORWARDANDBACK;
+		pVehicle2->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle2->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle2->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle2->SetMoveSpeed(2.0f * pVehicle2->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle2);
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	case SETPIECE_TWOCARSRAMMINGPLAYERFROMSIDE:
+	{
+		if (FindPlayerPed()->m_pWanted->m_nWantedLevel < 2)
+			return;
+		if (!FindPlayerVehicle())
+			return;
+		if (DotProduct2D(FindPlayerSpeed(), (CVector2D)FindPlayerCoors() - m_vSpawn1) >= 0.0f)
+			return;
+		CVehicle* pVehicle1 = TryToGenerateCopCar(m_vSpawn1, m_vTarget1);
+		if (!pVehicle1)
+			return;
+		pVehicle1->SetStatus(STATUS_PHYSICS);
+		pVehicle1->AutoPilot.m_fMaxTrafficSpeed = pVehicle1->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle1->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
+		pVehicle1->AutoPilot.m_nCarMission = MISSION_RAMCAR_CLOSE;
+		pVehicle1->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle1->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle1->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle1->SetMoveSpeed(2.0f * pVehicle1->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle1);
+		CVehicle* pVehicle2 = TryToGenerateCopCar(m_vSpawn2, m_vTarget2);
+		if (!pVehicle2) {
+			CWorld::Remove(pVehicle2);
+			delete pVehicle2;
+			return;
+		}
+		pVehicle2->SetStatus(STATUS_PHYSICS);
+		pVehicle2->AutoPilot.m_fMaxTrafficSpeed = pVehicle2->AutoPilot.m_nCruiseSpeed = 16;
+		pVehicle2->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
+		pVehicle2->AutoPilot.m_nCarMission = MISSION_RAMCAR_CLOSE;
+		pVehicle2->AutoPilot.m_nTempAction = TEMPACT_GOFORWARD;
+		pVehicle2->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 100;
+		pVehicle2->m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 10000;
+		pVehicle2->SetMoveSpeed(2.0f * pVehicle2->GetForward() / 3.0f);
+		CCarAI::AddPoliceCarOccupants(pVehicle2);
+		m_nLastTimeCreated = CTimer::GetTimeInMilliseconds();
+		return;
+	}
+	}
+}
+
+CVehicle* CSetPiece::TryToGenerateCopCar(CVector2D vSpawn, CVector2D vTarget)
+{
+	CVehicle* pVehicle = new CAutomobile(MI_POLICE, RANDOM_VEHICLE);
+	CVector pos(vSpawn.x, vSpawn.y, 1000.0f);
+	CColPoint point;
+	CEntity* pEntity;
+	if (CWorld::ProcessVerticalLine(pos, -1000.0f, point, pEntity, true, false, false, false, true, false, nil))
+		pos.z = point.point.z + pVehicle->GetHeightAboveRoad();
+	CVector vDirection(vTarget.x - vSpawn.x, vTarget.y - vSpawn.y, 0.0f);
+	vDirection.Normalise();
+	pVehicle->GetForward() = CVector(vDirection.x, vDirection.y, 0.0f);
+	pVehicle->GetRight() = CVector(vDirection.y, -vDirection.x, 0.0f);
+	pVehicle->GetUp() = CVector(0.0f, 0.0f, 1.0f);
+	pVehicle->SetPosition(pos);
+	int16 total;
+	CWorld::FindObjectsKindaColliding(pos, pVehicle->GetColModel()->spheres->radius, false, &total, 16, nil, false, true, true, false, false);
+	if (total != 0) {
+		delete pVehicle;
+		return nil;
+	}
+	pVehicle->ChangeLawEnforcerState(true);
+	CWorld::Add(pVehicle);
+	return pVehicle;
+}
+
+CCopPed* CSetPiece::TryToGenerateCopPed(CVector2D vSpawn)
+{
+	CCopPed* pCop = new CCopPed(COP_STREET);
+	CVector pos(vSpawn.x, vSpawn.y, 1000.0f);
+	CColPoint point;
+	CEntity* pEntity;
+	if (CWorld::ProcessVerticalLine(pos, -1000.0f, point, pEntity, true, false, false, false, true, false, nil))
+		pos.z = point.point.z + 0.9f;
+	pCop->SetPosition(pos);
+	int16 total;
+	CWorld::FindObjectsKindaColliding(pos, pCop->GetColModel()->spheres->radius, false, &total, 16, nil, false, true, true, false, false);
+	if (total != 0) {
+		delete pCop;
+		return nil;
+	}
+	CWorld::Add(pCop);
+	return pCop;
+}
\ No newline at end of file
diff --git a/src/control/SetPieces.h b/src/control/SetPieces.h
new file mode 100644
index 00000000..5776d35a
--- /dev/null
+++ b/src/control/SetPieces.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "config.h"
+
+class CVehicle;
+class CCopPed;
+
+enum eSetPieceType : uint8
+{
+	SETPIECE_NONE = 0,
+	SETPIECE_TWOCOPCARSINALLEY,
+	SETPIECE_CARBLOCKINGPLAYERFROMSIDE,
+	SETPIECE_CARRAMMINGPLAYERFROMSIDE,
+	SETPIECE_CREATECOPPERONFOOT,
+	SETPIECE_CREATETWOCOPPERSONFOOT,
+	SETPIECE_TWOCARSBLOCKINGPLAYERFROMSIDE,
+	SETPIECE_TWOCARSRAMMINGPLAYERFROMSIDE
+};
+
+class CSetPiece
+{
+public:
+	eSetPieceType m_nType;
+	uint32 m_nLastTimeCreated;
+	CVector2D m_vTriggerInf;
+	CVector2D m_vTriggerSup;
+	CVector2D m_vSpawn1;
+	CVector2D m_vSpawn2;
+	CVector2D m_vTarget1;
+	CVector2D m_vTarget2;
+
+	CVehicle* TryToGenerateCopCar(CVector2D, CVector2D);
+	CCopPed* TryToGenerateCopPed(CVector2D);
+	void Update(void);
+};
+
+class CSetPieces
+{
+	static bool bDebug;
+	static uint32 NumSetPieces;
+	static CSetPiece aSetPieces[NUM_SETPIECES];
+public:
+	static void Init(void);
+	static void AddOne(uint8 type, CVector2D, CVector2D, CVector2D, CVector2D, CVector2D, CVector2D);
+	static void Save(uint8*, uint32*);
+	static void Load(uint8*, uint32);
+	static void Update(void);
+};
diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp
index 278366a3..54c97d06 100644
--- a/src/control/TrafficLights.cpp
+++ b/src/control/TrafficLights.cpp
@@ -108,6 +108,7 @@ CTrafficLights::DisplayActualLight(CEntity *ent)
 	CBrightLights::RegisterOne(pos1, ent->GetUp(), ent->GetRight(), CVector(0.0f, 0.0f, 0.0f), id + BRIGHTLIGHT_TRAFFIC_GREEN);
 	CBrightLights::RegisterOne(pos2, ent->GetUp(), -ent->GetRight(), CVector(0.0f, 0.0f, 0.0f), id + BRIGHTLIGHT_TRAFFIC_GREEN);
 
+/*
 	static const float top = -0.127f;
 	static const float bot = -0.539f;
 	static const float mid = bot + (top-bot)/3.0f;
@@ -131,6 +132,7 @@ CTrafficLights::DisplayActualLight(CEntity *ent)
 			1.0f, 0.5f,  0.0f, 0.5f,  1.0f, 1.0f,  0.0f, 1.0f,
 			SHINYTEXT_WALK, 255, 255, 255, 60.0f);
 	}
+*/
 }
 
 void
@@ -145,7 +147,7 @@ CTrafficLights::ScanForLightsOnMap(void)
 		CPtrList &list = CWorld::GetSector(x, y)->m_lists[ENTITYLIST_DUMMIES];
 		for(node = list.first; node; node = node->next){
 			CEntity *light = (CEntity*)node->item;
-			if(light->GetModelIndex() != MI_TRAFFICLIGHTS)
+			if (!IsTrafficLight(light->GetModelIndex()))
 				continue;
 
 			// Check cars
@@ -274,8 +276,12 @@ CTrafficLights::ShouldCarStopForLight(CVehicle *vehicle, bool alwaysStop)
 bool
 CTrafficLights::ShouldCarStopForBridge(CVehicle *vehicle)
 {
+#ifdef GTA_BRIDGE
 	return ThePaths.m_carPathLinks[vehicle->AutoPilot.m_nNextPathNodeInfo].bBridgeLights &&
 		!ThePaths.m_carPathLinks[vehicle->AutoPilot.m_nCurrentPathNodeInfo].bBridgeLights;
+#else
+	return false;
+#endif
 }
 
 int
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index f49f811f..35106a6b 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -368,13 +368,7 @@ CAnimViewer::Update(void)
 					} else {
 						// Originally it was GetPad(1)->LeftShoulder2
 						if (pad->NewState.Triangle) {
-#ifdef PED_SKIN
-							if(IsClumpSkinned(pTarget->GetClump()))
-								((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->AnimatePedColModelSkinned(pTarget->GetClump());
-							else
-#endif
-								CPedModelInfo::AnimatePedColModel(((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->GetHitColModel(),
-								                                  RpClumpGetFrame(pTarget->GetClump()));
+							((CPedModelInfo *)CModelInfo::GetModelInfo(pTarget->GetModelIndex()))->AnimatePedColModelSkinned(pTarget->GetClump());
 							AsciiToUnicode("Ped Col model will be animated as long as you hold the button", gUString);
 							CMessages::AddMessage(gUString, 100, 0);
 						}
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index 53c49634..fd45a374 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -25,6 +25,7 @@
 #include "Debug.h"
 #include "Camera.h"
 #include "DMAudio.h"
+#include "Bike.h"
 
 bool PrintDebugCode = false;
 int16 DebugCamMode;
@@ -281,12 +282,12 @@ CCam::Process(void)
 				if(DirectionWasLooking != LOOKING_BEHIND)
 					TheCamera.m_bJust_Switched = true;
 				DirectionWasLooking = LOOKING_BEHIND;
-			}else if(CPad::GetPad(0)->GetLookLeft()){
+			}else if(!((CVehicle*)CamTargetEntity)->IsRealHeli() && CPad::GetPad(0)->GetLookLeft()){
 				LookLeft();
 				if(DirectionWasLooking != LOOKING_LEFT)
 					TheCamera.m_bJust_Switched = true;
 				DirectionWasLooking = LOOKING_LEFT;
-			}else if(CPad::GetPad(0)->GetLookRight()){
+			}else if(!((CVehicle*)CamTargetEntity)->IsRealHeli() && CPad::GetPad(0)->GetLookRight()){
 				LookRight();
 				if(DirectionWasLooking != LOOKING_RIGHT)
 					TheCamera.m_bJust_Switched = true;
@@ -309,7 +310,7 @@ CCam::Process(void)
 	}
 
 	if(Mode == MODE_SNIPER || Mode == MODE_ROCKETLAUNCHER || Mode == MODE_M16_1STPERSON ||
-	   Mode == MODE_1STPERSON || Mode == MODE_HELICANNON_1STPERSON || GetWeaponFirstPersonOn())
+	   Mode == MODE_1STPERSON || Mode == MODE_HELICANNON_1STPERSON || Mode == MODE_CAMERA || GetWeaponFirstPersonOn())
 		ClipIfPedInFrontOfPlayer();
 }
 
@@ -1597,7 +1598,7 @@ CCam::Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrient
 	CWorld::pIgnoreEntity = nil;
 
 	float ViewPlaneHeight = Tan(DEGTORAD(FOV) / 2.0f);
-	float ViewPlaneWidth = ViewPlaneHeight * CDraw::FindAspectRatio() * fTweakFOV;
+	float ViewPlaneWidth = ViewPlaneHeight * CDraw::CalculateAspectRatio() * fTweakFOV;
 	float Near = RwCameraGetNearClipPlane(Scene.camera);
 	float radius = ViewPlaneWidth*Near;
 	entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
@@ -1628,20 +1629,6 @@ CCam::Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrient
 			entity = nil;
 	}
 
-	if(CamTargetEntity->m_rwObject){
-		// what's going on here?
-		if(RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_PUMP) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_THROW) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_THROWU) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_START_THROW)){
-			CPed *player = FindPlayerPed();
-			float PlayerDist = (Source - player->GetPosition()).Magnitude();
-			if(PlayerDist < 2.75f)
-				Near = PlayerDist/2.75f * DEFAULT_NEAR - 0.3f;
-			RwCameraSetNearClipPlane(Scene.camera, Max(Near, 0.1f));
-		}
-	}
-
 	TheCamera.m_bCamDirectlyInFront = false;
 	TheCamera.m_bCamDirectlyBehind = false;
 
@@ -2444,7 +2431,7 @@ CCam::Process_Rocket(const CVector &CameraTarget, float, float, float)
 		ResetStatics = false;
 	}
 
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
@@ -2583,7 +2570,7 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
 	HeadPos.x = 0.0f;
 	HeadPos.y = 0.0f;
 	HeadPos.z = 0.0f;
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f * Cos(m_fInitialPlayerOrientation);
@@ -2672,7 +2659,7 @@ CCam::Process_1stPerson(const CVector &CameraTarget, float TargetOrientation, fl
 			ResetStatics = false;
 		}
 
-		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+		((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 		Source = HeadPos;
 		Source.z += 0.1f;
 		Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
@@ -2940,7 +2927,7 @@ CCam::Process_Sniper(const CVector &CameraTarget, float TargetOrientation, float
 		ResetStatics = false;
 	}
 
-	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
@@ -3645,7 +3632,7 @@ CCam::Process_Fixed(const CVector &CameraTarget, float, float, float)
 	if(TheCamera.m_bUseSpecialFovTrain)
 		FOV = TheCamera.m_fFovForTrain;
 
-	if(CMenuManager::m_ControlMethod == 0 && Using3rdPersonMouseCam()){
+	if(FrontEndMenuManager.m_ControlMethod == 0 && Using3rdPersonMouseCam()){
 		CPed *player = FindPlayerPed();
 		if(player && player->CanStrafeOrMouseControl()){
 			float Heading = Front.Heading();
@@ -4539,6 +4526,8 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
 			Rotating = false;
 	}
 
+	if(TheCamera.m_bUseTransitionBeta)
+		Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
 
 	if(TheCamera.m_bUseTransitionBeta)
 		Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
@@ -4586,7 +4575,7 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
 	CWorld::pIgnoreEntity = nil;
 
 	float ViewPlaneHeight = Tan(DEGTORAD(FOV) / 2.0f);
-	float ViewPlaneWidth = ViewPlaneHeight * CDraw::FindAspectRatio() * fTweakFOV;
+	float ViewPlaneWidth = ViewPlaneHeight * CDraw::CalculateAspectRatio() * fTweakFOV;
 	float Near = RwCameraGetNearClipPlane(Scene.camera);
 	float radius = ViewPlaneWidth*Near;
 	entity = CWorld::TestSphereAgainstWorld(Source + Front*Near, radius, nil, true, true, false, true, false, false);
@@ -4640,9 +4629,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 	uint8 camSetArrPos = 0;
 
 	// We may need those later
-	bool isPlane = car->GetModelIndex() == MI_DODO;
-	bool isHeli = false;
-	bool isBike = false;
+	bool isPlane = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE;
+	bool isHeli = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI;
+	bool isBike = car->GetVehicleAppearance() == VEHICLE_APPEARANCE_BIKE || car->IsBike();
 	bool isCar = car->IsCar() && !isPlane && !isHeli && !isBike;
 
 	CPad* pad = CPad::GetPad(0);
@@ -4653,8 +4642,10 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 
 	if (car->GetModelIndex() == MI_FIRETRUCK) {
 		camSetArrPos = 7;
-	} else if (car->GetModelIndex() == MI_RCBANDIT) {
+	} else if (car->GetModelIndex() == MI_RCBANDIT || car->GetModelIndex() == MI_RCBARON) {
 		camSetArrPos = 5;
+	} else if (car->GetModelIndex() == MI_RCGOBLIN || car->GetModelIndex() == MI_RCRAIDER) {
+		camSetArrPos = 6;
 	} else if (car->IsBoat()) {
 		camSetArrPos = 4;
 	} else if (isBike) {
@@ -4711,6 +4702,14 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 
 	float newDistance = TheCamera.CarZoomValueSmooth + CARCAM_SET[camSetArrPos][1] + approxCarLength;
 
+	// Taken from VC CCam::Cam_On_A_String_Unobscured. If we don't this, we will end up seeing the world from the inside of RC Goblin/Raider.
+	// I couldn't find where SA does that. It's possible that they've increased the size of these veh.'s collision bounding box.
+	if (car->m_modelIndex == MI_RCRAIDER || car->m_modelIndex == MI_RCBANDIT) {
+		newDistance += 6.0f;
+	} else if (car->m_modelIndex == MI_RCBARON) {
+		newDistance += 9.5f;
+	}
+
 	float minDistForThisCar = approxCarLength * CARCAM_SET[camSetArrPos][3];
 
 	if (!isHeli || car->GetStatus() == STATUS_PLAYER_REMOTE) {
@@ -4725,6 +4724,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 		TargetCoors += 0.6f * car->GetUp() * colMaxZ;
 	}
 
+	if (car->m_modelIndex == MI_RCGOBLIN)
+		zoomModeAlphaOffset += 0.178997f;
+
 	float minDistForVehType = CARCAM_SET[camSetArrPos][4];
 
 	if (TheCamera.CarZoomIndicator == CAM_ZOOM_1 && (camSetArrPos < 2 || camSetArrPos == 7)) {
@@ -4739,6 +4741,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 	if (ResetStatics) {
 		FOV = DefaultFOV;
 
+		// TODO(Miami): Remove that when cam is done!
 		// GTA 3 has this in veh. camera
 		if (TheCamera.m_bIdleOn)
 			TheCamera.m_uiTimeWeEnteredIdle = CTimer::GetTimeInMilliseconds();
@@ -4775,10 +4778,12 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 		ResetStatics = false;
 		Rotating = false;
 		m_bCollisionChecksOn = true;
-		// TheCamera.m_bResetOldMatrix = 1;
+
+
+		// TODO(Miami): Uncomment that when cam is done!
 
 		// Garage exit cam is not working well in III...
-		// if (!TheCamera.m_bJustCameOutOfGarage) // && !sthForScript)
+		// if (!TheCamera.m_bJustCameOutOfGarage)
 		// {
 		Alpha = 0.0f;
 		Beta = car->GetForward().Heading() - HALFPI;
@@ -4800,7 +4805,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 		m_aTargetHistoryPosTwo = TargetCoors - newDistance * Front;
 
 		m_nCurrentHistoryPoints = 0;
-		if (!TheCamera.m_bJustCameOutOfGarage) // && !sthForScript)
+		if (!TheCamera.m_bJustCameOutOfGarage)
 			Alpha = -zoomModeAlphaOffset;
 	}
 
@@ -4852,9 +4857,9 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 	// This is also original LCS and SA bug, or some attempt to fix lag. We'll never know
 
 	// if (car->m_vecMoveSpeed.MagnitudeSqr() < sq(0.2f))
-		if (car->GetModelIndex() != MI_FIRETRUCK) {
-			// if (!isBike || GetMysteriousWheelRelatedThingBike(car) > 3)
-				// if (!isHeli && (!isPlane || car->GetWheelsOnGround())) {
+		if (car->GetModelIndex() != MI_FIRETRUCK)
+			if (!isBike || ((CBike*)car)->m_nWheelsOnGround > 3)
+				if (!isHeli && (!isPlane || ((CAutomobile*)car)->m_nWheelsOnGround)) {
 
 					CVector left = CrossProduct(car->GetForward(), CVector(0.0f, 0.0f, 1.0f));
 					left.Normalise();
@@ -4908,7 +4913,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 
 	bool correctAlpha = true;
 	//	if (SA checks if we aren't in work car, why?) {
-	if (!isCar || car->GetModelIndex() != MI_YARDIE) {
+	if (!isCar || car->GetModelIndex() != MI_VOODOO) {
 		correctAlpha = false;
 	}
 	else {
@@ -5012,8 +5017,8 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 		Beta += TWOPI;
 
 	if ((camSetArrPos <= 1 || camSetArrPos == 7) && targetAlpha < Alpha && carPosChange >= newDistance) {
-		if (isCar && ((CAutomobile*)car)->m_nWheelsOnGround > 1)
-			// || isBike && GetMysteriousWheelRelatedThingBike(car) > 1)
+		if (isCar && ((CAutomobile*)car)->m_nWheelsOnGround > 1 ||
+			isBike && ((CBike*)car)->m_nWheelsOnGround > 1)
 			alphaSpeedFromStickY += (targetAlpha - Alpha) * 0.075f;
 	}
 
@@ -5163,19 +5168,13 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
 	if (camSetArrPos == 5 && Source.z < 1.0f) // RC Bandit and Baron
 		Source.z = 1.0f;
 
-	// Obviously some specific place in LC
-	if (Source.x > 11.0f && Source.x < 91.0f) {
-		if (Source.y > -680.0f && Source.y < -600.0f && Source.z < 24.4f)
-			Source.z = 24.4f;
-	}
-
 	// CCam::FixSourceAboveWaterLevel
 	if (CameraTarget.z >= -2.0f) {
 		float level = -6000.0;
-		// +0.5f is needed for III
+
 		if (CWaterLevel::GetWaterLevelNoWaves(Source.x, Source.y, Source.z, &level)) {
-			if (Source.z < level + 0.5f)
-				Source.z = level + 0.5f;
+			if (Source.z < level)
+				Source.z = level;
 		}
 	}
 	Front = TargetCoors - Source;
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 53bee20f..d9cc5c32 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -61,6 +61,8 @@ enum
 CCamera TheCamera;
 bool CCamera::m_bUseMouse3rdPerson = true;
 bool bDidWeProcessAnyCinemaCam;
+float CCamera::m_f3rdPersonCHairMultX;
+float CCamera::m_f3rdPersonCHairMultY;
 
 #ifdef IMPROVED_CAMERA
 #define KEYJUSTDOWN(k) ControlsManager.GetIsKeyboardKeyJustDown((RsKeyCodes)k)
@@ -80,10 +82,6 @@ CCamera::CCamera(void)
 	Init();
 }
 
-CCamera::CCamera(float)
-{
-}
-
 void
 CCamera::Init(void)
 {
@@ -91,12 +89,7 @@ CCamera::Init(void)
 	float fMouseAccelHorzntl = m_fMouseAccelHorzntl;
 	float fMouseAccelVertical = m_fMouseAccelVertical;
 #endif
-#ifdef FIX_BUGS
-	static const CCamera DummyCamera = CCamera(0.f);
-	*this = DummyCamera;
-#else
-	memset(this, 0, sizeof(CCamera));	// getting rid of vtable, eh?
-#endif
+	memset(this, 0, sizeof(CCamera));	// this is fine, no vtable
 #ifdef GTA3_1_1_PATCH
 	m_fMouseAccelHorzntl = fMouseAccelHorzntl;
 	m_fMouseAccelVertical = fMouseAccelVertical;
@@ -642,7 +635,11 @@ CCamera::CamControl(void)
 					m_bInitialNodeFound = false;
 					m_bInitialNoNodeStaticsSet = false;
 				}
+#ifdef GTA_TRAIN
 				Process_Train_Camera_Control();
+#else
+				assert(0 && "this can't happen");
+#endif
 			}else{
 				if(((CVehicle*)pTargetEntity)->IsBoat())
 					boatTarget = true;
@@ -701,8 +698,8 @@ CCamera::CamControl(void)
 									garageDoorPos2.z = 0.0f;
 #endif
 								}
-								garageCenter.x = (pToGarageWeAreIn->m_fX1 + pToGarageWeAreIn->m_fX2)/2.0f;
-								garageCenter.y = (pToGarageWeAreIn->m_fY1 + pToGarageWeAreIn->m_fY2)/2.0f;
+								garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+								garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
 								garageCenter.z = 0.0f;
 								if(whichDoor == 1)
 									garageCenterToDoor = garageDoorPos1 - garageCenter;
@@ -940,11 +937,13 @@ CCamera::CamControl(void)
 			if(CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer())
 				stairs = true;
 			// Some hack for Mr Whoopee in a bomb shop
+#ifndef MIAMI	// uhh, check this
 			if(Cams[ActiveCam].Using3rdPersonMouseCam() && CCollision::ms_collisionInMemory == LEVEL_COMMERCIAL){
 				if(pTargetEntity->GetPosition().x < 83.0f && pTargetEntity->GetPosition().x > 18.0f &&
 				   pTargetEntity->GetPosition().y < -305.0f && pTargetEntity->GetPosition().y > -390.0f)
 					disableGarageCam = true;
 			}
+#endif
 			if(!disableGarageCam && (CGarages::IsPointInAGarageCameraZone(pTargetEntity->GetPosition()) || stairs)){
 				if(!m_bGarageFixedCamPositionSet && m_bLookingAtPlayer){
 					if(pToGarageWeAreIn || stairs){
@@ -983,8 +982,8 @@ CCamera::CamControl(void)
 						}
 
 						if(pToGarageWeAreIn){
-							garageCenter.x = (pToGarageWeAreIn->m_fX1 + pToGarageWeAreIn->m_fX2)/2.0f;
-							garageCenter.y = (pToGarageWeAreIn->m_fY1 + pToGarageWeAreIn->m_fY2)/2.0f;
+							garageCenter.x = pToGarageWeAreIn->GetGarageCenterX();
+							garageCenter.y = pToGarageWeAreIn->GetGarageCenterY();
 							garageCenter.z = 0.0f;
 						}else{
 							garageDoorPos1.z = 0.0f;
@@ -1017,8 +1016,8 @@ CCamera::CamControl(void)
 						if(PedZoomIndicator == CAM_ZOOM_TOPDOWN && !stairs){
 							garageCamPos = garageCenter;
 							garageCamPos.z += FindPlayerPed()->GetPosition().z + 2.1f;
-							if(pToGarageWeAreIn && garageCamPos.z > pToGarageWeAreIn->m_fX2)	// What?
-								garageCamPos.z = pToGarageWeAreIn->m_fX2;
+							if(pToGarageWeAreIn && garageCamPos.z > pToGarageWeAreIn->m_fSupX)	// What?
+								garageCamPos.z = pToGarageWeAreIn->m_fSupX;
 						}else
 							garageCamPos.z = ground + 3.1f;
 						SetCamPositionForFixedMode(garageCamPos, CVector(0.0f, 0.0f, 0.0f));
@@ -1533,7 +1532,6 @@ CCamera::UpdateTargetEntity(void)
 			pTargetEntity = FindPlayerVehicle();
 		else{
 			pTargetEntity = FindPlayerPed();
-#ifndef GTA_PS2_STUFF
 			// this keeps the camera on the player while entering cars
 			if(PLAYER->GetPedState() == PED_ENTER_CAR ||
 			   PLAYER->GetPedState() == PED_CARJACK ||
@@ -1543,7 +1541,6 @@ CCamera::UpdateTargetEntity(void)
 			if(!enteringCar)
 				if(Cams[ActiveCam].CamTargetEntity != pTargetEntity)
 					Cams[ActiveCam].CamTargetEntity = pTargetEntity;
-#endif
 		}
 
 		bool cantOpen = true;
@@ -1562,16 +1559,9 @@ CCamera::UpdateTargetEntity(void)
 
 		if((PLAYER->GetPedState() == PED_CARJACK || PLAYER->GetPedState() == PED_OPEN_DOOR) && !cantOpen){
 			if(!enteringCar && CarZoomIndicator != CAM_ZOOM_1STPRS)
-#ifdef GTA_PS2_STUFF
-// dunno if this has any amazing effects
-			{
-#endif
 				pTargetEntity = PLAYER->m_pMyVehicle;
 			if(PLAYER->m_pMyVehicle == nil)
 				pTargetEntity = PLAYER;
-#ifdef GTA_PS2_STUFF
-			}
-#endif
 		}
 
 		if(PLAYER->GetPedState() == PED_EXIT_CAR)
@@ -2717,6 +2707,7 @@ CCamera::DontProcessObbeCinemaCamera(void)
 	bDidWeProcessAnyCinemaCam = false;
 }
 
+#ifdef GTA_TRAIN
 void
 CCamera::LoadTrainCamNodes(char const *name)
 {
@@ -2894,6 +2885,7 @@ CCamera::Process_Train_Camera_Control(void)
 		}
 	}
 }
+#endif
 
 
 void
@@ -3045,33 +3037,25 @@ CCamera::SetNearClipScript(float clip)
 void
 CCamera::ProcessFade(void)
 {
-	float fade = (CTimer::GetTimeInMilliseconds() - m_uiFadeTimeStarted)/1000.0f;
-	// Why even set CDraw::FadeValue if m_fFLOATingFade sets it anyway?
 	if(m_bFading){
 		if(m_iFadingDirection == FADE_IN){
 			if(m_fTimeToFadeOut != 0.0f){
-				m_fFLOATingFade = 255.0f - 255.0f*fade/m_fTimeToFadeOut;
-				if(m_fFLOATingFade <= 0.0f){
-					m_bFading = false;
-					CDraw::FadeValue = 0;
-					m_fFLOATingFade = 0.0f;
-				}
+				m_fFLOATingFade -= CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
 			}else{
+				m_fFLOATingFade = 0.0f;
+			}
+			if (m_fFLOATingFade <= 0.0f) {
 				m_bFading = false;
-				CDraw::FadeValue = 0;
 				m_fFLOATingFade = 0.0f;
 			}
 		}else if(m_iFadingDirection == FADE_OUT){
 			if(m_fTimeToFadeOut != 0.0f){
-				m_fFLOATingFade = 255.0f*fade/m_fTimeToFadeOut;
-				if(m_fFLOATingFade >= 255.0f){
-					m_bFading = false;
-					CDraw::FadeValue = 255;
-					m_fFLOATingFade = 255.0f;
-				}
+				m_fFLOATingFade += CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
 			}else{
+				m_fFLOATingFade = 255.0f;
+			}
+			if (m_fFLOATingFade >= 255.0f) {
 				m_bFading = false;
-				CDraw::FadeValue = 255;
 				m_fFLOATingFade = 255.0f;
 			}
 		}
@@ -3133,22 +3117,13 @@ CCamera::Fade(float timeout, int16 direction)
 		m_iMusicFadingDirection = direction;
 		m_fTimeToFadeMusic = timeout;
 		m_uiFadeTimeStartedMusic = CTimer::GetTimeInMilliseconds();
-// Not on PS2
-		if(!m_bJustJumpedOutOf1stPersonBecauseOfTarget && m_iMusicFadingDirection == FADE_OUT){
-			unknown++;
-			if(unknown >= 2){
-				m_bJustJumpedOutOf1stPersonBecauseOfTarget = true;
-				unknown = 0;
-			}else
-				m_bMoveCamToAvoidGeom = true;
-		}
 	}
 }
 
 void
 CCamera::SetFadeColour(uint8 r, uint8 g, uint8 b)
 {
-	m_FadeTargetIsSplashScreen = r == 0 && g == 0 && b == 0;
+	m_FadeTargetIsSplashScreen = r == 2 && g == 2 && b == 2;
 	CDraw::FadeRed = r;
 	CDraw::FadeGreen = g;
 	CDraw::FadeBlue = b;
@@ -3189,7 +3164,7 @@ CCamera::RenderMotionBlur(void)
 
 	CMBlur::MotionBlurRender(m_pRwCamera,
 		m_BlurRed, m_BlurGreen, m_BlurBlue,
-		m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
+		m_motionBlur, m_BlurType);
 }
 
 void
@@ -3306,6 +3281,18 @@ CCamera::Find3rdPersonQuickAimPitch(void)
 	return -(DEGTORAD(((0.5f - m_f3rdPersonCHairMultY) * 1.8f * 0.5f * Cams[ActiveCam].FOV)) + rot);
 }
 
+bool
+CCamera::Using1stPersonWeaponMode(void)
+{
+	switch(PlayerWeaponMode.Mode)
+	case CCam::MODE_SNIPER:
+	case CCam::MODE_M16_1STPERSON:
+	case CCam::MODE_ROCKETLAUNCHER:
+	case CCam::MODE_HELICANNON_1STPERSON:
+	case CCam::MODE_CAMERA:
+		return true;
+	return false;
+}
 
 
 void
@@ -3330,8 +3317,9 @@ CCamera::CalculateDerivedValues(void)
 	// left plane
 	m_vecFrustumNormals[1] = CVector(-c, -s, 0.0f);
 
-	c /= CDraw::FindAspectRatio();
-	s /= CDraw::FindAspectRatio();
+	CDraw::CalculateAspectRatio();
+	c /= SCREEN_ASPECT_RATIO;
+	s /= SCREEN_ASPECT_RATIO;
 	// bottom plane
 	m_vecFrustumNormals[2] = CVector(0.0f, -s, -c);
 	// top plane
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 80fc878e..669ac740 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -85,13 +85,15 @@ public:
 		MODE_SPECIAL_FIXED_FOR_SYPHON,
 		MODE_FIGHT_CAM,
 		MODE_TOP_DOWN_PED,
+		MODE_LIGHTHOUSE,
 		MODE_SNIPER_RUNABOUT,
 		MODE_ROCKETLAUNCHER_RUNABOUT,
 		MODE_1STPERSON_RUNABOUT,
 		MODE_M16_1STPERSON_RUNABOUT,
 		MODE_FIGHT_CAM_RUNABOUT,
 		MODE_EDITOR,
-		MODE_HELICANNON_1STPERSON, // vice city leftover
+		MODE_HELICANNON_1STPERSON,
+		MODE_CAMERA,
 	};
 
 	bool    bBelowMinDist; //used for follow ped mode
@@ -380,6 +382,7 @@ public:
 	bool m_WideScreenOn;
 	bool m_1rstPersonRunCloseToAWall;
 	bool m_bHeadBob;
+	bool m_bVehicleSuspenHigh;
 	bool m_bFailedCullZoneTestPreviously;
 
 	bool m_FadeTargetIsSplashScreen;
@@ -472,8 +475,8 @@ public:
 	// not static yet
 	float m_fMouseAccelHorzntl;// acceleration multiplier for 1st person controls
 	float m_fMouseAccelVertical;// acceleration multiplier for 1st person controls
-	float m_f3rdPersonCHairMultX;
-	float m_f3rdPersonCHairMultY;
+	static float m_f3rdPersonCHairMultX;
+	static float m_f3rdPersonCHairMultY;
 
 
 	CCam Cams[3];
@@ -549,7 +552,6 @@ public:
 
 	// High level and misc
 	CCamera(void);
-	CCamera(float);
 	void Init(void);
 	void Process(void);
 	void CamControl(void);
@@ -626,6 +628,7 @@ public:
 	void UpdateAimingCoors(CVector const &coors);
 	void Find3rdPersonCamTargetVector(float dist, CVector pos, CVector &source, CVector &target);
 	float Find3rdPersonQuickAimPitch(void);
+	bool Using1stPersonWeaponMode(void);
 
 	// Physical camera
 	void SetRwCamera(RwCamera *cam);
diff --git a/src/core/ColStore.cpp b/src/core/ColStore.cpp
new file mode 100644
index 00000000..070967e5
--- /dev/null
+++ b/src/core/ColStore.cpp
@@ -0,0 +1,237 @@
+#include "common.h"
+
+#include "templates.h"
+#include "General.h"
+#include "ModelInfo.h"
+#include "Streaming.h"
+#include "FileLoader.h"
+#include "Script.h"
+#include "Timer.h"
+#include "Camera.h"
+#include "Frontend.h"
+#include "Physical.h"
+#include "ColStore.h"
+
+CPool<ColDef,ColDef> *CColStore::ms_pColPool;
+
+void
+CColStore::Initialise(void)
+{
+	if(ms_pColPool == nil)
+		ms_pColPool = new CPool<ColDef,ColDef>(COLSTORESIZE, "CollisionFiles");
+	AddColSlot("generic");	// slot 0. not streamed
+}
+
+void
+CColStore::Shutdown(void)
+{
+	int i;
+	for(i = 0; i < COLSTORESIZE; i++)
+		RemoveColSlot(i);
+	if(ms_pColPool)
+		delete ms_pColPool;
+	ms_pColPool = nil;
+}
+
+int
+CColStore::AddColSlot(const char *name)
+{
+	ColDef *def = ms_pColPool->New();
+	assert(def);
+	def->isLoaded = false;
+	def->unused = 0;
+	def->bounds.left = 1000000.0f;
+	def->bounds.top = 1000000.0f;
+	def->bounds.right = -1000000.0f;
+	def->bounds.bottom = -1000000.0f;
+	def->minIndex = INT16_MAX;
+	def->maxIndex = INT16_MIN;
+	strcpy(def->name, name);
+	return ms_pColPool->GetJustIndex(def);
+}
+
+void
+CColStore::RemoveColSlot(int slot)
+{
+	if(GetSlot(slot)){
+		if(GetSlot(slot)->isLoaded)
+			RemoveCol(slot);
+		ms_pColPool->Delete(GetSlot(slot));
+	}
+}
+
+int
+CColStore::FindColSlot(const char *name)
+{
+	ColDef *def;
+	int size = ms_pColPool->GetSize();
+	for(int i = 0; i < size; i++){
+		def = GetSlot(i);
+		if(def && !CGeneral::faststricmp(def->name, name))
+			return i;
+	}
+	return -1;
+}
+
+char*
+CColStore::GetColName(int32 slot)
+{
+	return GetSlot(slot)->name;
+}
+
+CRect&
+CColStore::GetBoundingBox(int32 slot)
+{
+	return GetSlot(slot)->bounds;
+}
+
+void
+CColStore::IncludeModelIndex(int32 slot, int32 modelIndex)
+{
+	ColDef *def = GetSlot(slot);
+	if(modelIndex < def->minIndex)
+		def->minIndex = modelIndex;
+	if(modelIndex > def->maxIndex)
+		def->maxIndex = modelIndex;
+}
+
+bool
+CColStore::LoadCol(int32 slot, uint8 *buffer, int32 bufsize)
+{
+	bool success;
+	ColDef *def = GetSlot(slot);
+	if(def->minIndex > def->maxIndex)
+		success = CFileLoader::LoadCollisionFileFirstTime(buffer, bufsize, slot);
+	else
+		success = CFileLoader::LoadCollisionFile(buffer, bufsize, slot);
+	if(success)
+		def->isLoaded = true;
+	else
+		debug("Failed to load Collision\n");
+	return success;
+}
+
+void
+CColStore::RemoveCol(int32 slot)
+{
+	int id;
+	GetSlot(slot)->isLoaded = false;
+	for(id = 0; id < MODELINFOSIZE; id++){
+		CBaseModelInfo *mi = CModelInfo::GetModelInfo(id);
+		if(mi){
+			CColModel *col = mi->GetColModel();
+			if(col && col->level == slot)
+				col->RemoveCollisionVolumes();
+		}
+	}
+}
+
+void
+CColStore::LoadAllCollision(void)
+{
+	int i;
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(GetSlot(i))
+			CStreaming::RequestCol(i, 0);
+
+	CStreaming::LoadAllRequestedModels(false);
+}
+
+void
+CColStore::RemoveAllCollision(void)
+{
+	int i;
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(GetSlot(i))
+			if(CStreaming::CanRemoveCol(i))
+				CStreaming::RemoveCol(i);
+}
+
+static bool bLoadAtSecondPosition;
+static CVector2D secondPosition;
+
+void
+CColStore::AddCollisionNeededAtPosn(const CVector2D &pos)
+{
+	bLoadAtSecondPosition = true;
+	secondPosition = pos;
+}
+
+void
+CColStore::LoadCollision(const CVector2D &pos)
+{
+	int i;
+
+	if(CStreaming::ms_disableStreaming)
+		return;
+
+	for(i = 1; i < COLSTORESIZE; i++){
+		if(GetSlot(i) == nil)
+			continue;
+
+		bool wantThisOne = false;
+
+		if(GetBoundingBox(i).IsPointInside(pos) ||
+		   bLoadAtSecondPosition && GetBoundingBox(i).IsPointInside(secondPosition, -119.0f) ||
+		   CGeneral::faststrcmp(GetColName(i), "yacht") == 0){
+			wantThisOne = true;
+		}else{
+			for (int j = 0; j < MAX_CLEANUP; j++) {
+				CPhysical* pEntity = CTheScripts::MissionCleanup.DoesThisEntityWaitForCollision(j);
+				if (pEntity && !pEntity->bDontLoadCollision && !pEntity->bIsFrozen) {
+					if (GetBoundingBox(i).IsPointInside(pEntity->GetPosition(), -80.0f))
+						wantThisOne = true;
+				}
+			}
+		}
+
+		if(wantThisOne)
+			CStreaming::RequestCol(i, STREAMFLAGS_PRIORITY);
+		else
+			CStreaming::RemoveCol(i);
+	}
+	bLoadAtSecondPosition = false;
+}
+
+void
+CColStore::RequestCollision(const CVector2D &pos)
+{
+	int i;
+
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(GetSlot(i) && GetBoundingBox(i).IsPointInside(pos, -115.0f))
+			CStreaming::RequestCol(i, STREAMFLAGS_PRIORITY);
+}
+
+void
+CColStore::EnsureCollisionIsInMemory(const CVector2D &pos)
+{
+	int i;
+
+	if(CStreaming::ms_disableStreaming)
+		return;
+
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(GetSlot(i) && GetBoundingBox(i).IsPointInside(pos, -110.0f) &&
+		   !CStreaming::HasColLoaded(i)){
+			CStreaming::RequestCol(i, 0);
+			if(TheCamera.GetScreenFadeStatus() == FADE_0)
+				FrontEndMenuManager.MessageScreen("LOADCOL", false);
+			CTimer::Suspend();
+			CStreaming::LoadAllRequestedModels(false);
+			CTimer::Resume();
+		}
+}
+
+//--MIAMI: done
+bool
+CColStore::HasCollisionLoaded(const CVector2D &pos)
+{
+	int i;
+
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(GetSlot(i) && GetBoundingBox(i).IsPointInside(pos, -115.0f) &&
+		   !GetSlot(i)->isLoaded)
+			return false;
+	return true;
+}
diff --git a/src/core/ColStore.h b/src/core/ColStore.h
new file mode 100644
index 00000000..8e2a3a70
--- /dev/null
+++ b/src/core/ColStore.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "templates.h"
+
+struct ColDef {	// made up name
+	int32 unused;
+	bool isLoaded;
+	CRect bounds;
+	char name[20];
+	int16 minIndex;
+	int16 maxIndex;
+};
+
+class CColStore
+{
+	static CPool<ColDef,ColDef> *ms_pColPool;
+
+public:
+	static void Initialise(void);
+	static void Shutdown(void);
+	static int AddColSlot(const char *name);
+	static void RemoveColSlot(int32 slot);
+	static int FindColSlot(const char *name);
+	static char *GetColName(int32 slot);
+	static CRect &GetBoundingBox(int32 slot);
+	static void IncludeModelIndex(int32 slot, int32 modelIndex);
+	static bool LoadCol(int32 storeID, uint8 *buffer, int32 bufsize);
+	static void RemoveCol(int32 slot);
+	static void AddCollisionNeededAtPosn(const CVector2D &pos);
+	static void LoadAllCollision(void);
+	static void RemoveAllCollision(void);
+	static void LoadCollision(const CVector2D &pos);
+	static void RequestCollision(const CVector2D &pos);
+	static void EnsureCollisionIsInMemory(const CVector2D &pos);
+	static bool HasCollisionLoaded(const CVector2D &pos);
+
+	static ColDef *GetSlot(int slot) {
+		assert(slot >= 0);
+		assert(ms_pColPool);
+		assert(slot < ms_pColPool->GetSize());
+		return ms_pColPool->GetSlot(slot);
+	}
+};
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 23eaa8dd..b68214af 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -20,6 +20,8 @@
 #include "SurfaceTable.h"
 #include "Lines.h"
 #include "Collision.h"
+#include "Camera.h"
+#include "ColStore.h"
 
 enum Direction
 {
@@ -34,57 +36,30 @@ enum Direction
 eLevelName CCollision::ms_collisionInMemory;
 CLinkList<CColModel*> CCollision::ms_colModelCache;
 
+//--MIAMI: done
 void
 CCollision::Init(void)
 {
 	ms_colModelCache.Init(NUMCOLCACHELINKS);
 	ms_collisionInMemory = LEVEL_NONE;
+	CColStore::Initialise();
 }
 
+//--MIAMI: done
 void
 CCollision::Shutdown(void)
 {
 	ms_colModelCache.Shutdown();
+	CColStore::Shutdown();
 }
 
+//--MIAMI: done
 void
 CCollision::Update(void)
 {
-	CVector playerCoors;
-	playerCoors = FindPlayerCoors();
-	eLevelName level = CTheZones::m_CurrLevel;
-	bool forceLevelChange = false;
-
-	if(CTimer::GetTimeInMilliseconds() < 2000 || CCutsceneMgr::IsCutsceneProcessing())
-		return;
-
-	// hardcode a level if there are no zones
-	if(level == LEVEL_NONE){
-		if(CGame::currLevel == LEVEL_INDUSTRIAL &&
-		   playerCoors.x < 400.0f){
-			level = LEVEL_COMMERCIAL;
-			forceLevelChange = true;
-		}else if(CGame::currLevel == LEVEL_SUBURBAN &&
-		         playerCoors.x > -450.0f && playerCoors.y < -1400.0f){
-			level = LEVEL_COMMERCIAL;
-			forceLevelChange = true;
-		}else{
-			if(playerCoors.x > 800.0f){
-				level = LEVEL_INDUSTRIAL;
-				forceLevelChange = true;
-			}else if(playerCoors.x < -800.0f){
-				level = LEVEL_SUBURBAN;
-				forceLevelChange = true;
-			}
-		}
-	}
-	if(level != LEVEL_NONE && level != CGame::currLevel)
-		CGame::currLevel = level;
-	if(ms_collisionInMemory != CGame::currLevel)
-		LoadCollisionWhenINeedIt(forceLevelChange);
-	CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel);
 }
 
+//--MIAMI: unused
 eLevelName
 GetCollisionInSectorList(CPtrList &list)
 {
@@ -101,6 +76,7 @@ GetCollisionInSectorList(CPtrList &list)
 	return LEVEL_NONE;
 }
 
+//--MIAMI: unused
 // Get a level this sector is in based on collision models
 eLevelName
 GetCollisionInSector(CSector &sect)
@@ -121,111 +97,16 @@ GetCollisionInSector(CSector &sect)
 	return (eLevelName)level;
 }
 
+//--MIAMI: done
 void
 CCollision::LoadCollisionWhenINeedIt(bool forceChange)
 {
-	eLevelName level, l;
-	bool multipleLevels;
-	CVector playerCoors;
-	CVehicle *veh;
-	CEntryInfoNode *ei;
-	int sx, sy;
-	int xmin, xmax, ymin, ymax;
-	int x, y;
-
-	level = LEVEL_NONE;
-
-	playerCoors = FindPlayerCoors();
-	sx = CWorld::GetSectorIndexX(playerCoors.x);
-	sy = CWorld::GetSectorIndexY(playerCoors.y);
-	multipleLevels = false;
-
-	veh = FindPlayerVehicle();
-	if(veh && veh->IsTrain()){
-		if(((CTrain*)veh)->m_nDoorState != TRAIN_DOOR_OPEN)
-			return;
-	}else if(playerCoors.z < -4.0f && !CCullZones::DoINeedToLoadCollision())
-		return;
-
-	// Figure out whose level's collisions we're most likely to be interested in
-	if(!forceChange){
-		if(veh && veh->IsBoat()){
-			// on water we expect to be between levels
-			multipleLevels = true;
-		}else{
-			xmin = Max(sx - 1, 0);
-			xmax = Min(sx + 1, NUMSECTORS_X-1);
-			ymin = Max(sy - 1, 0);
-			ymax = Min(sy + 1, NUMSECTORS_Y-1);
-
-			for(x = xmin; x <= xmax; x++)
-				for(y = ymin; y <= ymax; y++){
-					l = GetCollisionInSector(*CWorld::GetSector(x, y));
-					if(l != LEVEL_NONE){
-						if(level == LEVEL_NONE)
-							level = l;
-						if(level != l)
-							multipleLevels = true;
-					}
-				}
-		}
-
-		if(multipleLevels && veh && veh->IsBoat())
-			for(ei = veh->m_entryInfoList.first; ei; ei = ei->next){
-				level = GetCollisionInSector(*ei->sector);
-				if(level != LEVEL_NONE)
-					break;
-			}
-	}
-
-	if(level == CGame::currLevel || forceChange){
-		CTimer::Stop();
-		DMAudio.SetEffectsFadeVol(0);
-		CPad::StopPadsShaking();
-		LoadCollisionScreen(CGame::currLevel);
-		DMAudio.Service();
-
-		CPopulation::DealWithZoneChange(ms_collisionInMemory, CGame::currLevel, false);
-		CStreaming::RemoveIslandsNotUsed(LEVEL_INDUSTRIAL);
-		CStreaming::RemoveIslandsNotUsed(LEVEL_COMMERCIAL);
-		CStreaming::RemoveIslandsNotUsed(LEVEL_SUBURBAN);
-		CStreaming::RemoveBigBuildings(LEVEL_INDUSTRIAL);
-		CStreaming::RemoveBigBuildings(LEVEL_COMMERCIAL);
-		CStreaming::RemoveBigBuildings(LEVEL_SUBURBAN);
-		CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel);
-		CStreaming::RemoveUnusedModelsInLoadedList();
-		CGame::TidyUpMemory(true, true);
-		CFileLoader::LoadCollisionFromDatFile(CGame::currLevel);
-		ms_collisionInMemory = CGame::currLevel;
-		CReplay::EmptyReplayBuffer();
-		if(CGame::currLevel != LEVEL_NONE)
-			LoadSplash(GetLevelSplashScreen(CGame::currLevel));
-		CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
-		CStreaming::RemoveUnusedBuildings(CGame::currLevel);
-		CStreaming::RequestBigBuildings(CGame::currLevel);
-		CStreaming::LoadAllRequestedModels(true);
-		CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel);
-
-		CGame::TidyUpMemory(true, true);
-		CTimer::Update();
-		DMAudio.SetEffectsFadeVol(127);
-	}
 }
 
+//--MIAMI: done
 void
 CCollision::SortOutCollisionAfterLoad(void)
 {
-	if(ms_collisionInMemory == CGame::currLevel)
-		return;
-
-	CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel);
-	if(CGame::currLevel != LEVEL_NONE){
-		CFileLoader::LoadCollisionFromDatFile(CGame::currLevel);
-		if(!CGame::playingIntro)
-			LoadSplash(GetLevelSplashScreen(CGame::currLevel));
-	}
-	ms_collisionInMemory = CGame::currLevel;
-	CGame::TidyUpMemory(true, false);
 }
 
 void
@@ -249,14 +130,14 @@ CCollision::LoadCollisionScreen(eLevelName level)
 
 
 bool
-CCollision::TestSphereSphere(const CColSphere &s1, const CColSphere &s2)
+CCollision::TestSphereSphere(const CSphere &s1, const CSphere &s2)
 {
 	float d = s1.radius + s2.radius;
 	return (s1.center - s2.center).MagnitudeSqr() < d*d;
 }
 
 bool
-CCollision::TestSphereBox(const CColSphere &sph, const CColBox &box)
+CCollision::TestSphereBox(const CSphere &sph, const CBox &box)
 {
 	if(sph.center.x + sph.radius < box.min.x) return false;
 	if(sph.center.x - sph.radius > box.max.x) return false;
@@ -268,7 +149,7 @@ CCollision::TestSphereBox(const CColSphere &sph, const CColBox &box)
 }
 
 bool
-CCollision::TestLineBox(const CColLine &line, const CColBox &box)
+CCollision::TestLineBox(const CColLine &line, const CBox &box)
 {
 	float t, x, y, z;
 	// If either line point is in the box, we have a collision
@@ -353,7 +234,7 @@ CCollision::TestLineBox(const CColLine &line, const CColBox &box)
 }
 
 bool
-CCollision::TestVerticalLineBox(const CColLine &line, const CColBox &box)
+CCollision::TestVerticalLineBox(const CColLine &line, const CBox &box)
 {
 	if(line.p0.x <= box.min.x) return false;
 	if(line.p0.y <= box.min.y) return false;
@@ -533,8 +414,9 @@ CCollision::TestSphereTriangle(const CColSphere &sphere,
 	return dist < sphere.radius;
 }
 
+//--MIAMI: TODO
 bool
-CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough)
+CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough)
 {
 	static CMatrix matTransform;
 	int i;
@@ -1161,10 +1043,11 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
 	return true;
 }
 
+//--MIAMI: TODO
 bool
 CCollision::ProcessLineOfSight(const CColLine &line,
 	const CMatrix &matrix, CColModel &model,
-	CColPoint &point, float &mindist, bool ignoreSeeThrough)
+	CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough)
 {
 	static CMatrix matTransform;
 	int i;
@@ -1200,10 +1083,11 @@ CCollision::ProcessLineOfSight(const CColLine &line,
 	return false;
 }
 
+//--MIAMI: TODO
 bool
 CCollision::ProcessVerticalLine(const CColLine &line,
 	const CMatrix &matrix, CColModel &model,
-	CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly)
+	CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough, CStoredCollPoly *poly)
 {
 	static CStoredCollPoly TempStoredPoly;
 	int i;
@@ -1974,7 +1858,7 @@ CColModel::CColModel(void)
 	vertices = nil;
 	triangles = nil;
 	trianglePlanes = nil;
-	level = CGame::currLevel;
+	level = 0;	// generic col slot
 	ownsCollisionVolumes = true;
 }
 
diff --git a/src/core/Collision.h b/src/core/Collision.h
index 895f012a..12af5225 100644
--- a/src/core/Collision.h
+++ b/src/core/Collision.h
@@ -10,26 +10,37 @@
 #define MAX_COLLISION_POINTS 32
 #endif
 
-struct CColSphere
+struct CSphere
 {
 	CVector center;
 	float radius;
+	void Set(float radius, const CVector &center) { this->center = center; this->radius = radius; }
+};
+
+struct CBox
+{
+	CVector min;
+	CVector max;
+	CVector GetSize(void) { return max - min; }
+	void Set(const CVector &min, const CVector &max) {  this->min = min; this->max = max; }
+};
+
+struct CColSphere : public CSphere
+{
 	uint8 surface;
 	uint8 piece;
 
 	void Set(float radius, const CVector &center, uint8 surf, uint8 piece);
-	void Set(float radius, const CVector &center) { this->center = center; this->radius = radius; }
+	using CSphere::Set;
 };
 
-struct CColBox
+struct CColBox : public CBox
 {
-	CVector min;
-	CVector max;
 	uint8 surface;
 	uint8 piece;
 
 	void Set(const CVector &min, const CVector &max, uint8 surf, uint8 piece);
-	CVector GetSize(void) { return max - min; }
+	using CBox::Set;
 };
 
 struct CColLine
@@ -85,15 +96,16 @@ struct CStoredCollPoly
 	bool valid;
 };
 
+//--MIAMI: done struct
 struct CColModel
 {
-	CColSphere boundingSphere;
-	CColBox boundingBox;
+	CSphere boundingSphere;
+	CBox boundingBox;
 	int16 numSpheres;
-	int16 numLines;
 	int16 numBoxes;
 	int16 numTriangles;
-	int32 level;
+	int8 numLines;
+	uint8 level;	// colstore slot but probably still named level
 	bool ownsCollisionVolumes;
 	CColSphere *spheres;
 	CColLine *lines;
@@ -132,14 +144,14 @@ public:
 	static void CalculateTrianglePlanes(CColModel *model);
 
 	// all these return true if there's a collision
-	static bool TestSphereSphere(const CColSphere &s1, const CColSphere &s2);
-	static bool TestSphereBox(const CColSphere &sph, const CColBox &box);
-	static bool TestLineBox(const CColLine &line, const CColBox &box);
-	static bool TestVerticalLineBox(const CColLine &line, const CColBox &box);
+	static bool TestSphereSphere(const CSphere &s1, const CSphere &s2);
+	static bool TestSphereBox(const CSphere &sph, const CBox &box);
+	static bool TestLineBox(const CColLine &line, const CBox &box);
+	static bool TestVerticalLineBox(const CColLine &line, const CBox &box);
 	static bool TestLineTriangle(const CColLine &line, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
 	static bool TestLineSphere(const CColLine &line, const CColSphere &sph);
 	static bool TestSphereTriangle(const CColSphere &sphere, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane);
-	static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough);
+	static bool TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough);
 
 	static bool ProcessSphereSphere(const CColSphere &s1, const CColSphere &s2, CColPoint &point, float &mindistsq);
 	static bool ProcessSphereBox(const CColSphere &sph, const CColBox &box, CColPoint &point, float &mindistsq);
@@ -148,8 +160,8 @@ public:
 	static bool ProcessLineTriangle(const CColLine &line , const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindist);
 	static bool ProcessLineSphere(const CColLine &line, const CColSphere &sphere, CColPoint &point, float &mindist);
 	static bool ProcessSphereTriangle(const CColSphere &sph, const CVector *verts, const CColTriangle &tri, const CColTrianglePlane &plane, CColPoint &point, float &mindistsq);
-	static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough);
-	static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, CStoredCollPoly *poly);
+	static bool ProcessLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough);
+	static bool ProcessVerticalLine(const CColLine &line, const CMatrix &matrix, CColModel &model, CColPoint &point, float &mindist, bool ignoreSeeThrough, bool ignoreShootThrough, CStoredCollPoly *poly);
 	static int32 ProcessColModels(const CMatrix &matrixA, CColModel &modelA, const CMatrix &matrixB, CColModel &modelB, CColPoint *spherepoints, CColPoint *linepoints, float *linedists);
 	static bool IsStoredPolyStillValidVerticalLine(const CVector &pos, float z, CColPoint &point, CStoredCollPoly *poly);
 
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index 6a5080e5..2a5d20f0 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -205,6 +205,8 @@ void CControllerConfigManager::InitDefaultControlConfiguration()
 																		          
 	SetControllerKeyAssociatedWithAction    (PED_LOOKBEHIND,                      rsPADEND,   KEYBOARD);
 	SetControllerKeyAssociatedWithAction    (PED_LOOKBEHIND,                      rsCAPSLK,   OPTIONAL_EXTRA);
+
+	SetControllerKeyAssociatedWithAction    (PED_DUCK,                            'C',        KEYBOARD);
 																		          
 	SetControllerKeyAssociatedWithAction    (PED_FIREWEAPON,                      rsPADINS,   KEYBOARD);
 	SetControllerKeyAssociatedWithAction    (PED_FIREWEAPON,                      rsLCTRL,    OPTIONAL_EXTRA);
@@ -217,6 +219,8 @@ void CControllerConfigManager::InitDefaultControlConfiguration()
 																		          
 	SetControllerKeyAssociatedWithAction    (PED_JUMPING,                         rsRCTRL,    KEYBOARD);
 	SetControllerKeyAssociatedWithAction    (PED_JUMPING,                         ' ',        OPTIONAL_EXTRA);
+
+	SetControllerKeyAssociatedWithAction    (PED_ANSWER_PHONE,                    rsTAB,      KEYBOARD);
 																              
 	if ( _dwOperatingSystemVersion == OS_WIN98 )											              
 		SetControllerKeyAssociatedWithAction(PED_SPRINT,                          rsSHIFT,    OPTIONAL_EXTRA); // BUG: must be KEYBOARD ?											              
@@ -259,7 +263,7 @@ void CControllerConfigManager::InitDefaultControlConfiguration()
 	SetControllerKeyAssociatedWithAction    (VEHICLE_TURRETDOWN,                  rsPADRIGHT, KEYBOARD);
 										    
 	SetControllerKeyAssociatedWithAction    (CAMERA_CHANGE_VIEW_ALL_SITUATIONS,   rsHOME,     KEYBOARD);
-	SetControllerKeyAssociatedWithAction    (CAMERA_CHANGE_VIEW_ALL_SITUATIONS,   'C',        OPTIONAL_EXTRA);
+	SetControllerKeyAssociatedWithAction    (CAMERA_CHANGE_VIEW_ALL_SITUATIONS,   'V',        OPTIONAL_EXTRA);
 
 	for (int32 i = 0; i < MAX_SIMS; i++)
 	{
@@ -336,13 +340,14 @@ void CControllerConfigManager::InitDefaultControlConfigJoyPad(uint32 buttons)
 			SetControllerKeyAssociatedWithAction(TOGGLE_SUBMISSIONS,                11, JOYSTICK);
 		case 10:
 			SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                      10, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_DUCK,                          10, JOYSTICK);
 		case 9:
 			SetControllerKeyAssociatedWithAction(CAMERA_CHANGE_VIEW_ALL_SITUATIONS,  9, JOYSTICK);
 		case 8:
 			SetControllerKeyAssociatedWithAction(VEHICLE_HANDBRAKE,                  8, JOYSTICK);
 			SetControllerKeyAssociatedWithAction(PED_LOCK_TARGET,                    8, JOYSTICK);
 		case 7:
-			SetControllerKeyAssociatedWithAction(PED_CENTER_CAMERA_BEHIND_PLAYER,    7, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE,                   7, JOYSTICK);
 			SetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION,       7, JOYSTICK);
 		case 6:
 			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,             6, JOYSTICK);
@@ -384,13 +389,14 @@ void CControllerConfigManager::InitDefaultControlConfigJoyPad(uint32 buttons)
 			SetControllerKeyAssociatedWithAction(TOGGLE_SUBMISSIONS,                11, JOYSTICK);
 		case 10:
 			SetControllerKeyAssociatedWithAction(VEHICLE_HORN,                      10, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_DUCK,                          10, JOYSTICK);
 		case 9:
 			SetControllerKeyAssociatedWithAction(CAMERA_CHANGE_VIEW_ALL_SITUATIONS,  9, JOYSTICK);
 		case 8:
 			SetControllerKeyAssociatedWithAction(VEHICLE_HANDBRAKE,                  8, JOYSTICK);
 			SetControllerKeyAssociatedWithAction(PED_LOCK_TARGET,                    8, JOYSTICK);
 		case 7:
-			SetControllerKeyAssociatedWithAction(PED_CENTER_CAMERA_BEHIND_PLAYER,    7, JOYSTICK);
+			SetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE,                   7, JOYSTICK);
 			SetControllerKeyAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION,       7, JOYSTICK);
 		case 6:
 			SetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,             6, JOYSTICK);
@@ -432,6 +438,8 @@ void CControllerConfigManager::InitialiseControllerActionNameArray()
 	SETACTIONNAME(PED_CYCLE_TARGET_RIGHT);
 	SETACTIONNAME(PED_CENTER_CAMERA_BEHIND_PLAYER);
 	SETACTIONNAME(VEHICLE_LOOKBEHIND);
+	SETACTIONNAME(PED_DUCK);
+	SETACTIONNAME(PED_ANSWER_PHONE);
 	SETACTIONNAME(VEHICLE_LOOKLEFT);
 	SETACTIONNAME(VEHICLE_LOOKRIGHT);
 	SETACTIONNAME(VEHICLE_HORN);
@@ -454,6 +462,10 @@ void CControllerConfigManager::InitialiseControllerActionNameArray()
 	SETACTIONNAME(GO_RIGHT);
 	SETACTIONNAME(GO_FORWARD);
 	SETACTIONNAME(GO_BACK);
+	SETACTIONNAME(VEHICLE_TURRETLEFT);
+	SETACTIONNAME(VEHICLE_TURRETRIGHT);
+	SETACTIONNAME(VEHICLE_TURRETUP);
+	SETACTIONNAME(VEHICLE_TURRETDOWN);
 	SETACTIONNAME(NETWORK_TALK);
 	SETACTIONNAME(TOGGLE_DPAD);
 	SETACTIONNAME(SWITCH_DEBUG_CAM_ON);
@@ -754,6 +766,8 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstPersonOnl
 		state.Square = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_OUT, type))
 		state.Cross = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
+		state.RightShock = 255;
 }
 
 void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnly(int32 button, eControllerType type, CControllerState &state)
@@ -762,14 +776,18 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnl
 		state.RightShock = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_JUMPING, type))
 		state.Square = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE, type))
+		state.LeftShoulder1 = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_LEFT, type))
 		state.LeftShoulder2 = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT, type))
 		state.RightShoulder2 = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
 		state.Cross = 255;
+	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
+		state.RightShock = 255;
 	
-	if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 	{
 		if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type))
 			state.LeftShoulder2 = 255;
@@ -835,7 +853,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstAndThirdP
 			state.RightStickX = 128;
 	}
 
-	if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 	{
 		if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_UP, type))
 		{
@@ -1616,8 +1634,12 @@ void CControllerConfigManager::DeleteMatching3rdPersonControls(e_ControllerActio
 			ClearSettingsAssociatedWithAction(PED_JUMPING, type);
 		if (key == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
 			ClearSettingsAssociatedWithAction(PED_SPRINT, type);
+		if (key == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
+			ClearSettingsAssociatedWithAction(PED_DUCK, type);
+		if (key == GetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE, type))
+			ClearSettingsAssociatedWithAction(PED_ANSWER_PHONE, type);
 
-		if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 		{
 			if (key == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type))
 				ClearSettingsAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type);
@@ -1640,7 +1662,7 @@ void CControllerConfigManager::DeleteMatching1rst3rdPersonControls(e_ControllerA
 		if (key == GetControllerKeyAssociatedWithAction(GO_BACK, type))
 			ClearSettingsAssociatedWithAction(GO_BACK, type);
 
-		if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 		{
 			if (key == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_LEFT, type))
 				ClearSettingsAssociatedWithAction(PED_1RST_PERSON_LOOK_LEFT, type);
@@ -1803,6 +1825,8 @@ e_ControllerActionType CControllerConfigManager::GetActionType(e_ControllerActio
 	case PED_CYCLE_WEAPON_RIGHT:
 	case PED_JUMPING:
 	case PED_SPRINT:
+	case PED_DUCK:
+	case PED_ANSWER_PHONE:
 	case PED_CYCLE_TARGET_LEFT:
 	case PED_CYCLE_TARGET_RIGHT:
 	case PED_CENTER_CAMERA_BEHIND_PLAYER:
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index 7d0e1073..5f0b6862 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -32,6 +32,8 @@ enum e_ControllerAction
 	PED_JUMPING,
 	PED_SPRINT,
 	PED_LOOKBEHIND,
+	PED_DUCK,
+	PED_ANSWER_PHONE,
 	VEHICLE_ACCELERATE,
 	VEHICLE_BRAKE,
 	VEHICLE_CHANGE_RADIO_STATION,
diff --git a/src/core/EventList.cpp b/src/core/EventList.cpp
index 675040ea..c3508a51 100644
--- a/src/core/EventList.cpp
+++ b/src/core/EventList.cpp
@@ -67,8 +67,6 @@ CEventList::RegisterEvent(eEventType type, eEventEntity entityType, CEntity *ent
 	switch(entityType){
 	case EVENT_ENTITY_PED:
 		ref = CPools::GetPedRef((CPed*)ent);
-		if(ent->GetModelIndex() >= MI_GANG01 && ent->GetModelIndex() <= MI_CRIMINAL02)
-			copsDontCare = true;
 		break;
 	case EVENT_ENTITY_VEHICLE:
 		ref = CPools::GetVehicleRef((CVehicle*)ent);
diff --git a/src/core/EventList.h b/src/core/EventList.h
index 8840afc4..f2c3d7a8 100644
--- a/src/core/EventList.h
+++ b/src/core/EventList.h
@@ -22,10 +22,12 @@ enum eEventType
 	EVENT_PED_SET_ON_FIRE,
 	EVENT_COP_SET_ON_FIRE,
 	EVENT_CAR_SET_ON_FIRE,
-	EVENT_ASSAULT_NASTYWEAPON, // not sure
+	EVENT_ASSAULT_NASTYWEAPON,
+	EVENT_ASSAULT_NASTYWEAPON_POLICE,
 	EVENT_ICECREAM,
 	EVENT_ATM,
-	EVENT_SHOPSTALL, // used on graffitis
+	EVENT_SHOPSTALL,
+	EVENT_SHOPWINDOW,
 	EVENT_LAST_EVENT
 };
 
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 6e7188c5..1463b4a5 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1,4 +1,5 @@
 #include "common.h"
+#include <ctype.h>
 #include "main.h"
 
 #include "Quaternion.h"
@@ -24,6 +25,11 @@
 #include "ZoneCull.h"
 #include "CdStream.h"
 #include "FileLoader.h"
+#include "Streaming.h"
+#include "ColStore.h"
+#include "Occlusion.h"
+
+//--MIAMI: file done
 
 char CFileLoader::ms_line[256];
 
@@ -46,14 +52,12 @@ CFileLoader::LoadLevel(const char *filename)
 {
 	int fd;
 	RwTexDictionary *savedTxd;
-	eLevelName savedLevel;
 	bool objectsLoaded;
 	char *line;
 	char txdname[64];
 
 	savedTxd = RwTexDictionaryGetCurrent();
 	objectsLoaded = false;
-	savedLevel = CGame::currLevel;
 	if(savedTxd == nil){
 		savedTxd = RwTexDictionaryCreate();
 		RwTexDictionarySetCurrent(savedTxd);
@@ -77,12 +81,8 @@ CFileLoader::LoadLevel(const char *filename)
 			AddTexDictionaries(savedTxd, txd);
 			RwTexDictionaryDestroy(txd);
 		}else if(strncmp(line, "COLFILE", 7) == 0){
-			int level;
-			sscanf(line+8, "%d", &level);
-			CGame::currLevel = (eLevelName)level;
 			LoadingScreenLoadingFile(line+10);
-			LoadCollisionFile(line+10);
-			CGame::currLevel = savedLevel;
+			LoadCollisionFile(line+10, 0);
 		}else if(strncmp(line, "MODELFILE", 9) == 0){
 			LoadingScreenLoadingFile(line + 10);
 			LoadModelFile(line + 10);
@@ -94,15 +94,17 @@ CFileLoader::LoadLevel(const char *filename)
 			LoadObjectTypes(line + 4);
 		}else if(strncmp(line, "IPL", 3) == 0){
 			if(!objectsLoaded){
-				CModelInfo::ConstructMloClumps();
+				LoadingScreenLoadingFile("Collision");
 				CObjectData::Initialise("DATA\\OBJECT.DAT");
+				CStreaming::Init();
+				CColStore::LoadAllCollision();
+				for(int i = 0; i < MODELINFOSIZE; i++)
+					if(CModelInfo::GetModelInfo(i))
+						CModelInfo::GetModelInfo(i)->ConvertAnimFileIndex();
 				objectsLoaded = true;
 			}
 			LoadingScreenLoadingFile(line + 4);
 			LoadScene(line + 4);
-		}else if(strncmp(line, "MAPZONE", 7) == 0){
-			LoadingScreenLoadingFile(line + 8);
-			LoadMapZones(line + 8);
 		}else if(strncmp(line, "SPLASH", 6) == 0){
 			LoadSplash(GetRandomSplashScreen());
 		}else if(strncmp(line, "CDIMAGE", 7) == 0){
@@ -112,30 +114,13 @@ CFileLoader::LoadLevel(const char *filename)
 
 	CFileMgr::CloseFile(fd);
 	RwTexDictionarySetCurrent(savedTxd);
-}
-
-void
-CFileLoader::LoadCollisionFromDatFile(int currlevel)
-{
-	int fd;
-	char *line;
-
-	fd = CFileMgr::OpenFile(CGame::aDatFile, "r");
-	assert(fd > 0);
-
-	for(line = LoadLine(fd); line; line = LoadLine(fd)){
-		if(*line == '#')
-			continue;
-
-		if(strncmp(line, "COLFILE", 7) == 0){
-			int level;
-			sscanf(line+8, "%d", &level);
-			if(currlevel == level)
-				LoadCollisionFile(line+10);
-		}
-	}
 
-	CFileMgr::CloseFile(fd);
+	int i;
+	for(i = 1; i < COLSTORESIZE; i++)
+		if(CColStore::GetSlot(i))
+			CColStore::GetBoundingBox(i).Grow(120.0f);
+	CWorld::RepositionCertainDynamicObjects();
+	CColStore::RemoveAllCollision();
 }
 
 char*
@@ -179,7 +164,7 @@ struct ColHeader
 };
 
 void
-CFileLoader::LoadCollisionFile(const char *filename)
+CFileLoader::LoadCollisionFile(const char *filename, uint8 colSlot)
 {
 	int fd;
 	char modelname[24];
@@ -188,6 +173,7 @@ CFileLoader::LoadCollisionFile(const char *filename)
 
 	debug("Loading collision file %s\n", filename);
 	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
 
 	while(CFileMgr::Read(fd, (char*)&header, sizeof(header))){
 		assert(strncmp(header.ident, "COLL", 4) == 0);
@@ -196,10 +182,11 @@ CFileLoader::LoadCollisionFile(const char *filename)
 
 		mi = CModelInfo::GetModelInfo(modelname, nil);
 		if(mi){
-			if(mi->GetColModel()){
+			if(mi->GetColModel() && mi->DoesOwnColModel()){
 				LoadCollisionModel(work_buff+24, *mi->GetColModel(), modelname);
 			}else{
 				CColModel *model = new CColModel;
+				model->level = colSlot;
 				LoadCollisionModel(work_buff+24, *model, modelname);
 				mi->SetColModel(model, true);
 			}
@@ -211,6 +198,79 @@ CFileLoader::LoadCollisionFile(const char *filename)
 	CFileMgr::CloseFile(fd);
 }
 
+
+bool
+CFileLoader::LoadCollisionFileFirstTime(uint8 *buffer, uint32 size, uint8 colSlot)
+{
+	uint32 modelsize;
+	char modelname[24];
+	CBaseModelInfo *mi;
+	ColHeader *header;
+	int modelIndex;
+
+	while(size > 8){
+		header = (ColHeader*)buffer;
+		modelsize = header->size;
+		if(strncmp(header->ident, "COLL", 4) != 0)
+			return size-8 < CDSTREAM_SECTOR_SIZE;
+		memcpy(modelname, buffer+8, 24);
+		memcpy(work_buff, buffer+32, modelsize-24);
+		size -= 32 + (modelsize-24);
+		buffer += 32 + (modelsize-24);
+		if(modelsize > 15*1024)
+			debug("colmodel %s is huge, size %d\n", modelname, modelsize);
+
+		mi = CModelInfo::GetModelInfo(modelname, &modelIndex);
+		if(mi){
+			CColStore::IncludeModelIndex(colSlot, modelIndex);
+			CColModel *model = new CColModel;
+			model->level = colSlot;
+			LoadCollisionModel(work_buff, *model, modelname);
+			mi->SetColModel(model, true);
+		}else{
+			debug("colmodel %s can't find a modelinfo\n", modelname);
+		}
+	}
+	return true;
+}
+
+bool
+CFileLoader::LoadCollisionFile(uint8 *buffer, uint32 size, uint8 colSlot)
+{
+	uint32 modelsize;
+	char modelname[24];
+	CBaseModelInfo *mi;
+	ColHeader *header;
+
+	while(size > 8){
+		header = (ColHeader*)buffer;
+		modelsize = header->size;
+		if(strncmp(header->ident, "COLL", 4) != 0)
+			return size-8 < CDSTREAM_SECTOR_SIZE;
+		memcpy(modelname, buffer+8, 24);
+		memcpy(work_buff, buffer+32, modelsize-24);
+		size -= 32 + (modelsize-24);
+		buffer += 32 + (modelsize-24);
+		if(modelsize > 15*1024)
+			debug("colmodel %s is huge, size %d\n", modelname, modelsize);
+
+		mi = CModelInfo::GetModelInfo(modelname, CColStore::GetSlot(colSlot)->minIndex, CColStore::GetSlot(colSlot)->maxIndex);
+		if(mi){
+			if(mi->GetColModel()){
+				LoadCollisionModel(work_buff, *mi->GetColModel(), modelname);
+			}else{
+				CColModel *model = new CColModel;
+				model->level = colSlot;
+				LoadCollisionModel(work_buff, *model, modelname);
+				mi->SetColModel(model, true);
+			}
+		}else{
+			debug("colmodel %s can't find a modelinfo\n", modelname);
+		}
+	}
+	return true;
+}
+
 void
 CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
 {
@@ -240,13 +300,15 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
 	model.numLines = *(int16*)buf;
 	buf += 4;
 	if(model.numLines > 0){
-		model.lines = (CColLine*)RwMalloc(model.numLines*sizeof(CColLine));
+		//model.lines = (CColLine*)RwMalloc(model.numLines*sizeof(CColLine));
 		for(i = 0; i < model.numLines; i++){
-			model.lines[i].Set(*(CVector*)buf, *(CVector*)(buf+12));
+			//model.lines[i].Set(*(CVector*)buf, *(CVector*)(buf+12));
 			buf += 24;
 		}
 	}else
 		model.lines = nil;
+	model.numLines = 0;
+	model.lines = nil;
 
 	model.numBoxes = *(int16*)buf;
 	buf += 4;
@@ -265,10 +327,12 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname)
 		model.vertices = (CVector*)RwMalloc(numVertices*sizeof(CVector));
 		for(i = 0; i < numVertices; i++){
 			model.vertices[i] = *(CVector*)buf;
+#if 0
 			if(Abs(model.vertices[i].x) >= 256.0f ||
 			   Abs(model.vertices[i].y) >= 256.0f ||
 			   Abs(model.vertices[i].z) >= 256.0f)
 				printf("%s:Collision volume too big\n", modelname);
+#endif
 			buf += 12;
 		}
 	}else
@@ -291,7 +355,7 @@ GetNameAndLOD(char *nodename, char *name, int *n)
 {
 	char *underscore = nil;
 	for(char *s = nodename; *s != '\0'; s++){
-		if(s[0] == '_' && (s[1] == 'l' || s[1] == 'L'))
+		if(s[0] == '_' && (s[1] == 'l' || s[1] == 'L') && isdigit(s[2]))
 			underscore = s;
 	}
 	if(underscore){
@@ -317,11 +381,11 @@ CFileLoader::FindRelatedModelInfoCB(RpAtomic *atomic, void *data)
 	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(name, nil);
 	if(mi){
 		assert(mi->IsSimple());
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 		mi->SetAtomic(n, atomic);
 		RpClumpRemoveAtomic(clump, atomic);
 		RpAtomicSetFrame(atomic, RwFrameCreate());
 		CVisibilityPlugins::SetAtomicModelInfo(atomic, mi);
-		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	}else{
 		debug("Can't find Atomic %s\n", name);
 	}
@@ -387,14 +451,6 @@ CFileLoader::LoadClumpFile(RwStream *stream, uint32 id)
 		return false;
 	mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(id);
 	mi->SetClump(clump);
-	if (mi->GetModelType() == MITYPE_PED && id != 0 && RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)) {
-		// Read LOD ped
-		clump = RpClumpStreamRead(stream);
-		if(clump){
-			((CPedModelInfo*)mi)->SetLowDetailClump(clump);
-			RpClumpDestroy(clump);
-		}
-	}
 	return true;
 }
 
@@ -456,11 +512,11 @@ CFileLoader::SetRelatedModelInfoCB(RpAtomic *atomic, void *data)
 
 	nodename = GetFrameNodeName(RpAtomicGetFrame(atomic));
 	GetNameAndLOD(nodename, name, &n);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	gpRelatedModelInfo->SetAtomic(n, atomic);
 	RpClumpRemoveAtomic(clump, atomic);
 	RpAtomicSetFrame(atomic, RwFrameCreate());
 	CVisibilityPlugins::SetAtomicModelInfo(atomic, gpRelatedModelInfo);
-	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	return atomic;
 }
 
@@ -498,8 +554,9 @@ CFileLoader::LoadObjectTypes(const char *filename)
 	enum {
 		NONE,
 		OBJS,
-		MLO,
+		MLO,	// unused but enum still has it
 		TOBJ,
+		WEAP,
 		HIER,
 		CARS,
 		PEDS,
@@ -510,16 +567,17 @@ CFileLoader::LoadObjectTypes(const char *filename)
 	int fd;
 	int section;
 	int pathIndex;
-	char pathTypeStr[20];
 	int id, pathType;
-	int mlo;
+	int minID, maxID;
 
 	section = NONE;
+	minID = INT32_MAX;
+	maxID = -1;
 	pathIndex = -1;
-	mlo = 0;
 	debug("Loading object types from %s...\n", filename);
 
 	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
 	for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
 		if(*line == '\0' || *line == '#')
 			continue;
@@ -527,25 +585,27 @@ CFileLoader::LoadObjectTypes(const char *filename)
 		if(section == NONE){
 			if(strncmp(line, "objs", 4) == 0) section = OBJS;
 			else if(strncmp(line, "tobj", 4) == 0) section = TOBJ;
+			else if(strncmp(line, "weap", 4) == 0) section = WEAP;
 			else if(strncmp(line, "hier", 4) == 0) section = HIER;
 			else if(strncmp(line, "cars", 4) == 0) section = CARS;
 			else if(strncmp(line, "peds", 4) == 0) section = PEDS;
 			else if(strncmp(line, "path", 4) == 0) section = PATH;
 			else if(strncmp(line, "2dfx", 4) == 0) section = TWODFX;
 		}else if(strncmp(line, "end", 3) == 0){
-			section = section == MLO ? OBJS : NONE;
+			section = NONE;
 		}else switch(section){
 		case OBJS:
-			if(strncmp(line, "sta", 3) == 0)
-				mlo = LoadMLO(line);
-			else
-				LoadObject(line);
-			break;
-		case MLO:
-			LoadMLOInstance(mlo, line);
+			id = LoadObject(line);
+			if(id > maxID) maxID = id;
+			if(id < minID) minID = id;
 			break;
 		case TOBJ:
-			LoadTimeObject(line);
+			id = LoadTimeObject(line);
+			if(id > maxID) maxID = id;
+			if(id < minID) minID = id;
+			break;
+		case WEAP:
+			LoadWeaponObject(line);
 			break;
 		case HIER:
 			LoadClumpObject(line);
@@ -558,17 +618,15 @@ CFileLoader::LoadObjectTypes(const char *filename)
 			break;
 		case PATH:
 			if(pathIndex == -1){
-				id = LoadPathHeader(line, pathTypeStr);
-				if(strncmp(pathTypeStr, "ped", 4) == 0)
-					pathType = 1;
-				else if(strncmp(pathTypeStr, "car", 4) == 0)
-					pathType = 0;
+				id = LoadPathHeader(line, pathType);
 				pathIndex = 0;
 			}else{
-				if(pathType == 1)
+				if(pathType == 0)
 					LoadPedPathNode(line, id, pathIndex);
-				else if(pathType == 0)
-					LoadCarPathNode(line, id, pathIndex);
+				else if (pathType == 1)
+					LoadCarPathNode(line, id, pathIndex, false);
+				else if (pathType == 2)
+					LoadCarPathNode(line, id, pathIndex, true);
 				pathIndex++;
 				if(pathIndex == 12)
 					pathIndex = -1;
@@ -581,26 +639,30 @@ CFileLoader::LoadObjectTypes(const char *filename)
 	}
 	CFileMgr::CloseFile(fd);
 
-	for(id = 0; id < MODELINFOSIZE; id++){
+	for(id = minID; id <= maxID; id++){
 		CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
-		if(mi && mi->IsSimple())
-			mi->SetupBigBuilding();
+		if(mi && mi->IsBuilding())
+			mi->SetupBigBuilding(minID, maxID);
 	}
 }
 
 void
 SetModelInfoFlags(CSimpleModelInfo *mi, uint32 flags)
 {
-	mi->m_normalCull =	!!(flags & 1);
+	mi->m_wetRoadReflection =	!!(flags & 1);
 	mi->m_noFade =	!!(flags & 2);
 	mi->m_drawLast =	!!(flags & (4|8));
 	mi->m_additive =	!!(flags & 8);
 	mi->m_isSubway =	!!(flags & 0x10);
 	mi->m_ignoreLight =	!!(flags & 0x20);
 	mi->m_noZwrite =	!!(flags & 0x40);
+	mi->m_noShadows =	!!(flags & 0x80);
+	mi->m_ignoreDrawDist =	!!(flags & 0x100);
+	mi->m_isCodeGlass =	!!(flags & 0x200);
+	mi->m_isArtistGlass =	!!(flags & 0x400);
 }
 
-void
+int
 CFileLoader::LoadObject(const char *line)
 {
 	int id, numObjs;
@@ -611,7 +673,7 @@ CFileLoader::LoadObject(const char *line)
 	CSimpleModelInfo *mi;
 
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
-		return;
+		return 0;	// game returns return value
 
 	switch(numObjs){
 	case 1:
@@ -643,60 +705,11 @@ CFileLoader::LoadObject(const char *line)
 	mi->m_firstDamaged = damaged;
 	mi->SetTexDictionary(txd);
 	MatchModelString(model, id);
-}
 
-int
-CFileLoader::LoadMLO(const char *line)
-{
-	char smth[8];
-	char name[24];
-	int modelIndex;
-	float someFloat;
-
-	sscanf(line, "%s %s %d %f", smth, name, &modelIndex, &someFloat);
-	CMloModelInfo *minfo = CModelInfo::AddMloModel(modelIndex);
-	minfo->SetName(name);
-	minfo->field_34 = someFloat;
-	int instId = CModelInfo::GetMloInstanceStore().allocPtr;
-	minfo->firstInstance = instId;
-	minfo->lastInstance = instId;
-	minfo->SetTexDictionary("generic");
-	return modelIndex;
-}
-
-void
-CFileLoader::LoadMLOInstance(int id, const char *line)
-{
-	char name[24];
-	RwV3d pos, scale, rot;
-	float angle;
-	int modelIndex;
-
-	CMloModelInfo *minfo = (CMloModelInfo*)CModelInfo::GetModelInfo(id);
-	sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f",
-		&modelIndex,
-		name,
-		&pos.x, &pos.y, &pos.z,
-		&scale.x, &scale.y, &scale.z,
-		&rot.x, &rot.y, &rot.z,
-		&angle);
-	float rad = Acos(angle) * 2.0f;
-	CInstance *inst = CModelInfo::GetMloInstanceStore().alloc();
-	minfo->lastInstance++;
-
-	RwMatrix *matrix = RwMatrixCreate();
-	RwMatrixScale(matrix, &scale, rwCOMBINEREPLACE);
-	RwMatrixRotate(matrix, &rot, -RADTODEG(rad), rwCOMBINEPOSTCONCAT);
-	RwMatrixTranslate(matrix, &pos, rwCOMBINEPOSTCONCAT);
-
-	inst->GetMatrix() = CMatrix(matrix);
-	inst->GetMatrix().UpdateRW();
-
-	inst->m_modelIndex = modelIndex;
-	RwMatrixDestroy(matrix);
+	return id;
 }
 
-void
+int
 CFileLoader::LoadTimeObject(const char *line)
 {
 	int id, numObjs;
@@ -708,7 +721,7 @@ CFileLoader::LoadTimeObject(const char *line)
 	CTimeModelInfo *mi, *other;
 
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
-		return;
+		return 0;	// game returns return value
 
 	switch(numObjs){
 	case 1:
@@ -744,6 +757,29 @@ CFileLoader::LoadTimeObject(const char *line)
 	if(other)
 		other->SetOtherTimeModel(id);
 	MatchModelString(model, id);
+
+	return id;
+}
+
+int
+CFileLoader::LoadWeaponObject(const char *line)
+{
+	int id, numObjs;
+	char model[24], txd[24], animFile[16];
+	float dist;
+	CWeaponModelInfo *mi;
+
+	sscanf(line, "%d %s %s %s %d %f", &id, model, txd, animFile, &numObjs, &dist);
+
+	mi = CModelInfo::AddWeaponModel(id);
+	mi->SetName(model);
+	mi->SetNumAtomics(1);
+	mi->m_lodDistances[0] = dist;
+	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
+	mi->SetColModel(&CTempColModels::ms_colModelWeapon);
+	MatchModelString(model, id);
+	return id;
 }
 
 void
@@ -766,21 +802,22 @@ CFileLoader::LoadVehicleObject(const char *line)
 {
 	int id;
 	char model[24], txd[24];
-	char type[8], handlingId[16], gamename[32], vehclass[12];
+	char type[8], handlingId[16], gamename[32], animFile[16], vehclass[12];
 	uint32 frequency, comprules;
 	int32 level, misc;
 	float wheelScale;
 	CVehicleModelInfo *mi;
 	char *p;
 
-	sscanf(line, "%d %s %s %s %s %s %s %d %d %x %d %f",
+	sscanf(line, "%d %s %s %s %s %s %s %s %d %d %x %d %f",
 		&id, model, txd,
-		type, handlingId, gamename, vehclass,
+		type, handlingId, gamename, animFile, vehclass,
 		&frequency, &level, &comprules, &misc, &wheelScale);
 
 	mi = CModelInfo::AddVehicleModel(id);
 	mi->SetName(model);
 	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
 	for(p = gamename; *p; p++)
 		if(*p == '_') *p = ' ';
 	strcpy(mi->m_gameName, gamename);
@@ -810,36 +847,34 @@ CFileLoader::LoadVehicleObject(const char *line)
 
 	mi->m_handlingId = mod_HandlingManager.GetHandlingId(handlingId);
 
-	// Well this is kinda dumb....
-	if(strncmp(vehclass, "poorfamily", 11) == 0){
+	if(strncmp(vehclass, "normal", 7) == 0)
+		mi->m_vehicleClass = CCarCtrl::NORMAL;
+	else if(strncmp(vehclass, "poorfamily", 11) == 0)
 		mi->m_vehicleClass = CCarCtrl::POOR;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::POOR);
-	}else if(strncmp(vehclass, "richfamily", 11) == 0){
+	else if(strncmp(vehclass, "richfamily", 11) == 0)
 		mi->m_vehicleClass = CCarCtrl::RICH;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::RICH);
-	}else if(strncmp(vehclass, "executive", 10) == 0){
+	else if(strncmp(vehclass, "executive", 10) == 0)
 		mi->m_vehicleClass = CCarCtrl::EXEC;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::EXEC);
-	}else if(strncmp(vehclass, "worker", 7) == 0){
+	else if(strncmp(vehclass, "worker", 7) == 0)
 		mi->m_vehicleClass = CCarCtrl::WORKER;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::WORKER);
-	}else if(strncmp(vehclass, "special", 8) == 0){
-		mi->m_vehicleClass = CCarCtrl::SPECIAL;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::SPECIAL);
-	}else if(strncmp(vehclass, "big", 4) == 0){
+	else if(strncmp(vehclass, "big", 4) == 0)
 		mi->m_vehicleClass = CCarCtrl::BIG;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::BIG);
-	}else if(strncmp(vehclass, "taxi", 5) == 0){
+	else if(strncmp(vehclass, "taxi", 5) == 0)
 		mi->m_vehicleClass = CCarCtrl::TAXI;
-		while(frequency-- > 0)
-			CCarCtrl::AddToCarArray(id, CCarCtrl::TAXI);
+	else if(strncmp(vehclass, "moped", 6) == 0)
+		mi->m_vehicleClass = CCarCtrl::MOPED;
+	else if(strncmp(vehclass, "motorbike", 10) == 0)
+		mi->m_vehicleClass = CCarCtrl::MOTORBIKE;
+	else if(strncmp(vehclass, "leisureboat", 12) == 0)
+		mi->m_vehicleClass = CCarCtrl::LEISUREBOAT;
+	else if(strncmp(vehclass, "workerboat", 11) == 0)
+		mi->m_vehicleClass = CCarCtrl::WORKERBOAT;
+	else if(strncmp(vehclass, "ignore", 11) == 0){
+		mi->m_vehicleClass = -1;
+		return;
 	}
+	CCarCtrl::AddToCarArray(id, mi->m_vehicleClass);
+	mi->m_frequency = frequency;
 }
 
 void
@@ -847,67 +882,87 @@ CFileLoader::LoadPedObject(const char *line)
 {
 	int id;
 	char model[24], txd[24];
-	char pedType[24], pedStats[24], animGroup[24];
+	char pedType[24], pedStats[24], animGroup[24], animFile[16];
 	int carsCanDrive;
 	CPedModelInfo *mi;
 	int animGroupId;
+	int radio1, radio2;
 
-	if(sscanf(line, "%d %s %s %s %s %s %x",
+	sscanf(line, "%d %s %s %s %s %s %x %s %d %d",
 	          &id, model, txd,
-	          pedType, pedStats, animGroup, &carsCanDrive) != 7)
-		return;
+	          pedType, pedStats, animGroup, &carsCanDrive,
+		  animFile, &radio1, &radio2);
 
 	mi = CModelInfo::AddPedModel(id);
 	mi->SetName(model);
 	mi->SetTexDictionary(txd);
+	mi->SetAnimFile(animFile);
 	mi->SetColModel(&CTempColModels::ms_colModelPed1);
 	mi->m_pedType = CPedType::FindPedType(pedType);
 	mi->m_pedStatType = CPedStats::GetPedStatType(pedStats);
 	for(animGroupId = 0; animGroupId < NUM_ANIM_ASSOC_GROUPS; animGroupId++)
 		if(strcmp(animGroup, CAnimManager::GetAnimGroupName((AssocGroupId)animGroupId)) == 0)
 			break;
+	assert(animGroupId < NUM_ANIM_ASSOC_GROUPS);
 	mi->m_animGroup = animGroupId;
 	mi->m_carsCanDrive = carsCanDrive;
-
-	// ???
-	CModelInfo::GetModelInfo(MI_LOPOLYGUY)->SetColModel(&CTempColModels::ms_colModelPed1);
+	mi->radio1 = radio1;
+	mi->radio2 = radio2;
 }
 
 int
-CFileLoader::LoadPathHeader(const char *line, char *type)
+CFileLoader::LoadPathHeader(const char *line, int &type)
 {
 	int id;
 	char modelname[32];
 
-	sscanf(line, "%s %d %s", type, &id, modelname);
+	sscanf(line, "%d %d %s", &type, &id, modelname);
 	return id;
 }
 
 void
 CFileLoader::LoadPedPathNode(const char *line, int id, int node)
 {
-	int type, next, cross;
-	float x, y, z, width;
-
-	sscanf(line, "%d %d %d %f %f %f %f", &type, &next, &cross, &x, &y, &z, &width);
-	ThePaths.StoreNodeInfoPed(id, node, type, next, x, y, z, 0, !!cross);
+	int type, next, cross, numLeft, numRight, speed, flags;
+	float x, y, z, width, spawnRate;
+
+	if(sscanf(line, "%d %d %d %f %f %f %f %d %d %d %d %f",
+			&type, &next, &cross, &x, &y, &z, &width, &numLeft, &numRight,
+			&speed, &flags, &spawnRate) != 12)
+		spawnRate = 1.0f;
+
+	if(id == -1)
+		ThePaths.StoreDetachedNodeInfoPed(node, type, next, x, y, z,
+			width, !!cross, !!(flags&1), !!(flags&4), spawnRate*15.0f);
+	else
+		ThePaths.StoreNodeInfoPed(id, node, type, next, x, y, z,
+			width, !!cross, spawnRate*15.0f);
 }
 
 void
-CFileLoader::LoadCarPathNode(const char *line, int id, int node)
+CFileLoader::LoadCarPathNode(const char *line, int id, int node, bool waterPath)
 {
-	int type, next, cross, numLeft, numRight;
-	float x, y, z, width;
-
-	sscanf(line, "%d %d %d %f %f %f %f %d %d", &type, &next, &cross, &x, &y, &z, &width, &numLeft, &numRight);
-	ThePaths.StoreNodeInfoCar(id, node, type, next, x, y, z, 0, numLeft, numRight);
+	int type, next, cross, numLeft, numRight, speed, flags;
+	float x, y, z, width, spawnRate;
+
+	if(sscanf(line, "%d %d %d %f %f %f %f %d %d %d %d %f",
+			&type, &next, &cross, &x, &y, &z, &width, &numLeft, &numRight,
+			&speed, &flags, &spawnRate) != 12)
+		spawnRate = 1.0f;
+
+	if(id == -1)
+		ThePaths.StoreDetachedNodeInfoCar(node, type, next, x, y, z, width, numLeft, numRight,
+			!!(flags&1), !!(flags&4), speed, !!(flags&2), waterPath, spawnRate * 15, false);
+	else
+		ThePaths.StoreNodeInfoCar(id, node, type, next, x, y, z, 0, numLeft, numRight,
+			!!(flags&1), !!(flags&4), speed, !!(flags&2), waterPath, spawnRate * 15);
 }
 
 
 void
 CFileLoader::Load2dEffect(const char *line)
 {
-	int id, r, g, b, a, type;
+	int id, r, g, b, a, type, ptype;
 	float x, y, z;
 	char corona[32], shadow[32];
 	int shadowIntens, lightType, roadReflection, flare, flags, probability;
@@ -980,6 +1035,18 @@ CFileLoader::Load2dEffect(const char *line)
 		effect->attractor.flags = flags;
 		effect->attractor.probability = probability;
 		break;
+	case EFFECT_PED_ATTRACTOR:
+		sscanf(line, "%d %f %f %f %d %d %d %d %d %d %f %f %f %f %f %f",
+			&id, &x, &y, &z, &r, &g, &b, &a, &type,
+			&ptype,
+			&effect->pedattr.queueDir.x,
+			&effect->pedattr.queueDir.y,
+			&effect->pedattr.queueDir.z,
+			&effect->pedattr.useDir.x,
+			&effect->pedattr.useDir.y,
+			&effect->pedattr.useDir.z);
+		effect->pedattr.type = ptype;
+		break;
 	}
 
 	CTxdStore::PopCurrentTxd();
@@ -993,20 +1060,21 @@ CFileLoader::LoadScene(const char *filename)
 		INST,
 		ZONE,
 		CULL,
+		OCCL,
 		PICK,
 		PATH,
 	};
 	char *line;
 	int fd;
 	int section;
-	int pathIndex;
-	char pathTypeStr[20];
+	int pathType, pathIndex;
 
 	section = NONE;
 	pathIndex = -1;
 	debug("Creating objects from %s...\n", filename);
 
 	fd = CFileMgr::OpenFile(filename, "rb");
+	assert(fd > 0);
 	for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
 		if(*line == '\0' || *line == '#')
 			continue;
@@ -1017,6 +1085,7 @@ CFileLoader::LoadScene(const char *filename)
 			else if(strncmp(line, "cull", 4) == 0) section = CULL;
 			else if(strncmp(line, "pick", 4) == 0) section = PICK;
 			else if(strncmp(line, "path", 4) == 0) section = PATH;
+			else if(strncmp(line, "occl", 4) == 0) section = OCCL;
 		}else if(strncmp(line, "end", 3) == 0){
 			section = NONE;
 		}else switch(section){
@@ -1029,18 +1098,24 @@ CFileLoader::LoadScene(const char *filename)
 		case CULL:
 			LoadCullZone(line);
 			break;
+		case OCCL:
+			LoadOcclusionVolume(line);
+			break;
 		case PICK:
 			// unused
 			LoadPickup(line);
 			break;
 		case PATH:
-			// unfinished in the game
 			if(pathIndex == -1){
-				LoadPathHeader(line, pathTypeStr);
-				// type not set
+				LoadPathHeader(line, pathType);
 				pathIndex = 0;
 			}else{
-				// nodes not loaded
+				if(pathType == 0)
+					LoadPedPathNode(line, -1, pathIndex);
+				else if (pathType == 1)
+					LoadCarPathNode(line, -1, pathIndex, false);
+				else if (pathType == 2)
+					LoadCarPathNode(line, -1, pathIndex, true);
 				pathIndex++;
 				if(pathIndex == 12)
 					pathIndex = -1;
@@ -1063,18 +1138,30 @@ CFileLoader::LoadObjectInstance(const char *line)
 	CSimpleModelInfo *mi;
 	RwMatrix *xform;
 	CEntity *entity;
-	if(sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f",
-	          &id, name,
+	float area;
+
+	if(sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f %f",
+	          &id, name, &area,
 	          &trans.x, &trans.y, &trans.z,
 	          &scale.x, &scale.y, &scale.z,
-	          &axis.x, &axis.y, &axis.z, &angle) != 12)
-		return;
+	          &axis.x, &axis.y, &axis.z, &angle) != 13){
+		if(sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f",
+		          &id, name,
+		          &trans.x, &trans.y, &trans.z,
+		          &scale.x, &scale.y, &scale.z,
+		          &axis.x, &axis.y, &axis.z, &angle) != 12)
+			return;
+		area = 0;
+	}
 
 	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
 	if(mi == nil)
 		return;
 	assert(mi->IsSimple());
 
+	if(!CStreaming::IsObjectInCdImage(id))
+		debug("Not in cdimage %s\n", mi->GetName());
+
 	angle = -RADTODEG(2.0f * acosf(angle));
 	xform = RwMatrixCreate();
 	RwMatrixRotate(xform, &axis, angle, rwCOMBINEREPLACE);
@@ -1089,7 +1176,8 @@ CFileLoader::LoadObjectInstance(const char *line)
 		entity->SetModelIndexNoCreate(id);
 		entity->GetMatrix() = CMatrix(xform);
 		entity->m_level = CTheZones::GetLevelFromPosition(&entity->GetPosition());
-		if(mi->IsSimple()){
+		entity->m_area = area;
+		if(mi->IsBuilding()){
 			if(mi->m_isBigBuilding)
 				entity->SetupBigBuilding();
 			if(mi->m_isSubway)
@@ -1098,14 +1186,25 @@ CFileLoader::LoadObjectInstance(const char *line)
 		if(mi->GetLargestLodDistance() < 2.0f)
 			entity->bIsVisible = false;
 		CWorld::Add(entity);
+
+		CColModel *col = entity->GetColModel();
+		if(col->numSpheres || col->numBoxes || col->numTriangles){
+			if(col->level != 0)
+				CColStore::GetBoundingBox(col->level).ContainRect(entity->GetBoundRect());
+		}else
+			entity->bUsesCollision = false;
+
+		if(entity->GetPosition().z + col->boundingBox.min.z < 6.0f)
+			entity->bUnderwater = true;
 	}else{
 		entity = new CDummyObject;
 		entity->SetModelIndexNoCreate(id);
 		entity->GetMatrix() = CMatrix(xform);
 		CWorld::Add(entity);
-		if(IsGlass(entity->GetModelIndex()))
+		if(IsGlass(entity->GetModelIndex()) && !mi->m_isArtistGlass)
 			entity->bIsVisible = false;
 		entity->m_level = CTheZones::GetLevelFromPosition(&entity->GetPosition());
+		entity->m_area = area;
 	}
 
 	RwMatrixDestroy(xform);
@@ -1151,53 +1250,21 @@ CFileLoader::LoadPickup(const char *line)
 }
 
 void
-CFileLoader::LoadMapZones(const char *filename)
+CFileLoader::LoadOcclusionVolume(const char *line)
 {
-	enum {
-		NONE,
-		INST,
-		ZONE,
-		CULL,
-		PICK,
-		PATH,
-	};
-	char *line;
-	int fd;
-	int section;
-
-	section = NONE;
-	debug("Creating zones from %s...\n", filename);
-
-	fd = CFileMgr::OpenFile(filename, "rb");
-	for(line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)){
-		if(*line == '\0' || *line == '#')
-			continue;
-
-		if(section == NONE){
-			if(strncmp(line, "zone", 4) == 0) section = ZONE;
-		}else if(strncmp(line, "end", 3) == 0){
-			section = NONE;
-		}else switch(section){
-		case ZONE: {
-			char name[24];
-			int type, level;
-			float minx, miny, minz;
-			float maxx, maxy, maxz;
-			if(sscanf(line, "%s %d %f %f %f %f %f %f %d",
-			          name, &type,
-			          &minx, &miny, &minz,
-			          &maxx, &maxy, &maxz,
-			          &level) == 9)
-				CTheZones::CreateMapZone(name, (eZoneType)type, minx, miny, minz, maxx, maxy, maxz, (eLevelName)level);
-			}
-			break;
-		}
-	}
-	CFileMgr::CloseFile(fd);
+	float x, y, z;
+	float width, length, height;
+	float angle;
 
-	debug("Finished loading IPL\n");
+	sscanf(line, "%f %f %f %f %f %f %f",
+		&x, &y, &z,
+		&width, &length, &height,
+		&angle);
+	COcclusion::AddOne(x, y, z, width, length, z + height/2.0f, angle);
 }
 
+
+//--MIAMI: unused
 void
 CFileLoader::ReloadPaths(const char *filename)
 {
@@ -1208,10 +1275,10 @@ CFileLoader::ReloadPaths(const char *filename)
 	char *line;
 	int section = NONE;
 	int id, pathType, pathIndex = -1;
-	char pathTypeStr[20];
 	debug("Reloading paths from %s...\n", filename);
 
 	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
 	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
 		if (*line == '\0' || *line == '#')
 			continue;
@@ -1227,17 +1294,15 @@ CFileLoader::ReloadPaths(const char *filename)
 			switch (section) {
 				case PATH:
 					if (pathIndex == -1) {
-						id = LoadPathHeader(line, pathTypeStr);
-						if (strncmp(pathTypeStr, "ped", 4) == 0)
-							pathType = 1;
-						else if (strncmp(pathTypeStr, "car", 4) == 0)
-							pathType = 0;
+						id = LoadPathHeader(line, pathType);
 						pathIndex = 0;
 					} else {
-						if (pathType == 1)
+						if(pathType == 0)
 							LoadPedPathNode(line, id, pathIndex);
-						else if (pathType == 0)
-							LoadCarPathNode(line, id, pathIndex);
+						else if (pathType == 1)
+							LoadCarPathNode(line, id, pathIndex, false);
+						else if (pathType == 2)
+							LoadCarPathNode(line, id, pathIndex, true);
 						pathIndex++;
 						if (pathIndex == 12)
 							pathIndex = -1;
@@ -1267,6 +1332,7 @@ CFileLoader::ReloadObjectTypes(const char *filename)
 
 	CFileMgr::ChangeDir("\\DATA\\MAPS\\");
 	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
 	CFileMgr::ChangeDir("\\");
 	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
 		if (*line == '\0' || *line == '#')
@@ -1342,6 +1408,7 @@ CFileLoader::ReLoadScene(const char *filename)
 	char *line;
 	CFileMgr::ChangeDir("\\DATA\\");
 	int fd = CFileMgr::OpenFile(filename, "r");
+	assert(fd > 0);
 	CFileMgr::ChangeDir("\\");
 
 	for (line = CFileLoader::LoadLine(fd); line; line = CFileLoader::LoadLine(fd)) {
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
index 87b8fe61..077e7bdd 100644
--- a/src/core/FileLoader.h
+++ b/src/core/FileLoader.h
@@ -5,10 +5,11 @@ class CFileLoader
 	static char ms_line[256];
 public:
 	static void LoadLevel(const char *filename);
-	static void LoadCollisionFromDatFile(int currlevel);
 	static char *LoadLine(int fd);
 	static RwTexDictionary *LoadTexDictionary(const char *filename);
-	static void LoadCollisionFile(const char *filename);
+	static void LoadCollisionFile(const char *filename, uint8 colSlot);
+	static bool LoadCollisionFileFirstTime(uint8 *buffer, uint32 size, uint8 colSlot);
+	static bool LoadCollisionFile(uint8 *buffer, uint32 size, uint8 colSlot);
 	static void LoadCollisionModel(uint8 *buf, struct CColModel &model, char *name);
 	static void LoadModelFile(const char *filename);
 	static RpAtomic *FindRelatedModelInfoCB(RpAtomic *atomic, void *data);
@@ -22,16 +23,15 @@ public:
 	static void AddTexDictionaries(RwTexDictionary *dst, RwTexDictionary *src);
 
 	static void LoadObjectTypes(const char *filename);
-	static void LoadObject(const char *line);
-	static int LoadMLO(const char *line);
-	static void LoadMLOInstance(int id, const char *line);
-	static void LoadTimeObject(const char *line);
+	static int LoadObject(const char *line);
+	static int LoadTimeObject(const char *line);
+	static int LoadWeaponObject(const char *line);
 	static void LoadClumpObject(const char *line);
 	static void LoadVehicleObject(const char *line);
 	static void LoadPedObject(const char *line);
-	static int LoadPathHeader(const char *line, char *type);
+	static int LoadPathHeader(const char *line, int &type);
 	static void LoadPedPathNode(const char *line, int id, int node);
-	static void LoadCarPathNode(const char *line, int id, int node);
+	static void LoadCarPathNode(const char *line, int id, int node, bool waterPath);
 	static void Load2dEffect(const char *line);
 
 	static void LoadScene(const char *filename);
@@ -39,8 +39,7 @@ public:
 	static void LoadZone(const char *line);
 	static void LoadCullZone(const char *line);
 	static void LoadPickup(const char *line);
-
-	static void LoadMapZones(const char *filename);
+	static void LoadOcclusionVolume(const char *line);
 
 	static void ReloadPaths(const char *filename);
 	static void ReloadObjectTypes(const char *filename);
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 933c73da..3752f1ba 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -15,6 +15,7 @@
 #include "DamageManager.h"
 #include "Ped.h"
 #include "Fire.h"
+#include "GameLogic.h"
 
 CFireManager gFireManager;
 
@@ -59,6 +60,12 @@ CFire::ProcessFire(void)
 				Extinguish();
 				return;
 			}
+#if defined GTAVC_JP_PATCH && !defined FIX_BUGS
+			if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) {
+				Extinguish();
+				return;
+			}
+#endif
 			if (ped->m_nMoveState != PEDMOVE_RUN)
 				m_vecPos.z -= 1.0f;
 			if (ped->bInVehicle && ped->m_pMyVehicle) {
@@ -84,6 +91,12 @@ CFire::ProcessFire(void)
 				Extinguish();
 				return;
 			}
+#ifdef FIX_BUGS
+			if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) {
+				Extinguish();
+				return;
+			}
+#endif
 			if (!m_bIsScriptFire) {
 				fDamageVehicle = 1.2f * CTimer::GetTimeStep();
 				veh->InflictDamage((CVehicle *)m_pSource, WEAPONTYPE_FLAMETHROWER, fDamageVehicle);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 9d231648..c4af9ce6 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -23,6 +23,7 @@
 #include "GenericGameStorage.h"
 #include "Script.h"
 #include "Camera.h"
+#include "MenuScreens.h"
 #include "ControllerConfig.h"
 #include "Vehicle.h"
 #include "MBlur.h"
@@ -35,7 +36,22 @@
 #include "Stats.h"
 #include "Messages.h"
 #include "FileLoader.h"
-#include "frontendoption.h"
+
+// TODO(Miami): This is -3 on VC but still -1 on AudioManager?!? What the hell?
+#define INVALID_AUDIO_PROVIDER -1
+
+// Similar story to Hud.cpp:
+// Game has colors inlined in code.
+// For easier modification we collect them here:
+CRGBA LABEL_COLOR(255, 150, 225, 255);
+CRGBA SELECTIONBORDER_COLOR(25, 130, 70, 255);
+CRGBA MENUOPTION_COLOR(255, 150, 225, 255);
+CRGBA SELECTEDMENUOPTION_COLOR(255, 150, 225, 255);
+CRGBA HEADER_COLOR(255, 150, 255, 255);
+CRGBA DARKMENUOPTION_COLOR(195, 90, 165, 255);
+CRGBA SLIDERON_COLOR(97, 194, 247, 255);
+CRGBA SLIDEROFF_COLOR(27, 89, 130, 255);
+CRGBA MAPINFOBOX_COLOR(255, 150, 225, 150);
 
 #define TIDY_UP_PBP // ProcessButtonPresses
 #define MAX_VISIBLE_LIST_ROW 30
@@ -66,14 +82,6 @@
 #define GetBackJustDown GetSquareJustDown
 #endif
 
-#ifdef MENU_MAP
-bool CMenuManager::bMenuMapActive = false;
-bool CMenuManager::bMapMouseShownOnce = false;
-bool CMenuManager::bMapLoaded = false;
-float CMenuManager::fMapSize;
-float CMenuManager::fMapCenterY;
-float CMenuManager::fMapCenterX;
-#endif
 
 #ifdef PS2_LIKE_MENU
 BottomBarOption bbNames[8];
@@ -86,35 +94,8 @@ int curBottomBarOption = -1;
 int hoveredBottomBarOption = -1;
 #endif
 
-int32 CMenuManager::OS_Language = LANG_ENGLISH;
-int8 CMenuManager::m_PrefsUseVibration;
-int8 CMenuManager::m_DisplayControllerOnFoot;
-int8 CMenuManager::m_PrefsVsync = 1;
-int8 CMenuManager::m_PrefsVsyncDisp = 1;
-int8 CMenuManager::m_PrefsFrameLimiter = 1;
-int8 CMenuManager::m_PrefsShowSubtitles = 1;
-int8 CMenuManager::m_PrefsSpeakers;
-int32 CMenuManager::m_ControlMethod;
-int8 CMenuManager::m_PrefsDMA = 1;
-int32 CMenuManager::m_PrefsLanguage;
 uint8 CMenuManager::m_PrefsStereoMono; // unused except restore settings
 
-bool CMenuManager::m_PrefsAllowNastyGame = true;
-bool CMenuManager::m_bStartUpFrontEndRequested;
-bool CMenuManager::m_bShutDownFrontEndRequested;
-
-int8 CMenuManager::m_PrefsUseWideScreen;
-int8 CMenuManager::m_PrefsRadioStation;
-int32 CMenuManager::m_PrefsBrightness = 256;
-float CMenuManager::m_PrefsLOD = CRenderer::ms_lodDistScale;
-int8 CMenuManager::m_bFrontEnd_ReloadObrTxtGxt;
-int32 CMenuManager::m_PrefsMusicVolume = 102;
-int32 CMenuManager::m_PrefsSfxVolume = 102;
-
-char CMenuManager::m_PrefsSkinFile[256] = DEFAULT_SKIN_NAME;
-
-int32 CMenuManager::m_KeyPressedCode = -1;
-
 // Originally that was PS2 option color, they forget it here and used in PrintBriefs once(but didn't use the output anyway)
 #ifdef PS2_LIKE_MENU
 const CRGBA TEXT_COLOR = CRGBA(150, 110, 30, 255);
@@ -125,99 +106,53 @@ const CRGBA TEXT_COLOR = CRGBA(235, 170, 50, 255); // PC briefs text color
 float MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE;
 float MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE;
 
-bool holdingScrollBar; // *(bool*)0x628D59; // not original name
-int32 CMenuManager::m_SelectedMap;
-int32 CMenuManager::m_SelectedGameType;
-
-// Used in a hidden menu
-uint8 CMenuManager::m_PrefsPlayerRed = 255;
-uint8 CMenuManager::m_PrefsPlayerGreen = 128;
-uint8 CMenuManager::m_PrefsPlayerBlue; // why??
+bool holdingScrollBar; // *(bool*)0x7039B9; // not original name
 
 CMenuManager FrontEndMenuManager;
+MenuTrapezoid menuBg(CGeneral::GetRandomNumber() % 40 + 65, CGeneral::GetRandomNumber() % 40 + 21,
+	CGeneral::GetRandomNumber() % 40 + 568, CGeneral::GetRandomNumber() % 40 + 44,
+	CGeneral::GetRandomNumber() % 40 + 36, CGeneral::GetRandomNumber() % 40 + 352,
+	CGeneral::GetRandomNumber() % 40 + 593, CGeneral::GetRandomNumber() % 40 + 312);
 
-uint32 TimeToStopPadShaking;
-char *pEditString;
-int32 *pControlEdit;
-bool DisplayComboButtonErrMsg;
-int32 MouseButtonJustClicked;
-int32 JoyButtonJustClicked;
-//int32 *pControlTemp = 0;
+MenuTrapezoid menuOptionHighlight(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+
+// TODO(Miami): TEMPORARY
+bool bMapLoaded = false;
+bool bMapMouseShownOnce = false;
 
 #ifndef MASTER
 bool CMenuManager::m_PrefsMarketing = false;
 bool CMenuManager::m_PrefsDisableTutorials = false;
 #endif // !MASTER
 
-// 0x5F311C
+// 0x68C144
 const char* FrontendFilenames[][2] = {
-	{"fe2_mainpanel_ul", "" },
-	{"fe2_mainpanel_ur", "" },
-	{"fe2_mainpanel_dl", "" },
-	{"fe2_mainpanel_dr", "" },
-	{"fe2_mainpanel_dr2", "" },
-	{"fe2_tabactive", "" },
-	{"fe_iconbrief", "" },
-	{"fe_iconstats", "" },
-	{"fe_iconcontrols", "" },
-	{"fe_iconsave", "" },
-	{"fe_iconaudio", "" },
-	{"fe_icondisplay", "" },
-	{"fe_iconlanguage", "" },
-	{"fe_controller", "" },
-	{"fe_controllersh", "" },
-	{"fe_arrows1", "" },
-	{"fe_arrows2", "" },
-	{"fe_arrows3", "" },
-	{"fe_arrows4", "" },
-	{"fe_radio1", "" },
-	{"fe_radio2", "" },
-	{"fe_radio3", "" },
-	{"fe_radio4", "" },
-	{"fe_radio5", "" },
-	{"fe_radio6", "" },
-	{"fe_radio7", "" },
-	{"fe_radio8", "" },
-	{"fe_radio9", "" },
-};
-
-#ifdef MENU_MAP
-const char* MapFilenames[][2] = {
+	{"background", ""},
+	{"vc_logo", "vc_logom"},
+	{"mouse", "mousea"},
+	{"mapTop01", "mapTop01A"},
+	{"mapTop02", "mapTop02A"},
+	{"mapTop03", "mapTop03A"},
 	{"mapMid01", "mapMid01A"},
 	{"mapMid02", "mapMid02A"},
 	{"mapMid03", "mapMid03A"},
 	{"mapBot01", "mapBot01A"},
 	{"mapBot02", "mapBot02A"},
 	{"mapBot03", "mapBot03A"},
-	{"mapTop01", "mapTop01A"},
-	{"mapTop02", "mapTop02A"},
-	{"mapTop03", "mapTop03A"},
-};
-CSprite2d CMenuManager::m_aMapSprites[NUM_MAP_SPRITES];
-#endif
-
-// 0x5F3344
-const char* MenuFilenames[][2] = {
-	{"connection24", ""},
-	{"findgame24", ""},
-	{"hostgame24", ""},
-	{"mainmenu24", ""},
-	{"Playersetup24", ""},
-	{"singleplayer24", ""},
-	{"multiplayer24", ""},
-	{"dmalogo128", "dmalogo128m"},
-	{"gtaLogo128", "gtaLogo128"},
-	{"rockstarLogo128", "rockstarlogo128m"},
-	{"gamespy256", "gamespy256a"},
-	{"mouse", "mousetimera"},
-	{"mousetimer", "mousetimera"},
-	{"mp3logo", "mp3logoA"},
-	{"downOFF", "buttonA"},
-	{"downON", "buttonA"},
+	{"wildstyle", "wildstyleA"},
+	{"flash", "flashA"},
+	{"kchat", "kchatA"},
+	{"fever", "feverA"},
+	{"vrock", "vrockA"},
+	{"vcpr", "vcprA"},
+	{"espantoso", "espantosoA"},
+	{"emotion", "emotionA"},
+	{"wave103", "wave103A"},
+	{"mp3", "mp3A"},
+	{"downOff", "buttonA"},
+	{"downOn", "buttonA"},
 	{"upOff", "buttonA"},
-	{"upON", "buttonA"},
-	{"gta3logo256", "gta3logo256m"},
-	{ nil, nil }
+	{"upOn", "buttonA"}
 };
 
 #ifdef ASPECT_RATIO_SCALE
@@ -246,77 +181,109 @@ ScaleAndCenterX(float x)
 #define MENU_Y(y) StretchY(y)
 #endif
 
-#ifdef PS2_LIKE_MENU
-#define ChangeScreen(screen, option, updateDelay, withReverseAlpha) \
-	do { \
-		if (reverseAlpha) { \
-			m_nPrevScreen = m_nCurrScreen; \
-			m_nCurrScreen = pendingScreen; \
-			m_nCurrOption = pendingOption; \
-			reverseAlpha = false; \
-			if (updateDelay) \
-				m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
-		} \
-		if (withReverseAlpha) { \
-			pendingOption = option; \
-			pendingScreen = screen; \
-			reverseAlpha = true; \
-		} else { \
-			m_nPrevScreen = m_nCurrScreen; \
-			m_nCurrScreen = screen; \
-			m_nCurrOption = option; \
-			if (updateDelay) \
-				m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
-		} \
-		m_nMenuFadeAlpha = 255; \
-	} while(0)
-#else
-#define ChangeScreen(screen, option, updateDelay, clearAlpha) \
-	do { \
-		m_nPrevScreen = m_nCurrScreen; \
-		int newOpt = option; \
-		m_nCurrScreen = screen; \
-		m_nCurrOption = newOpt; \
-		if(updateDelay) \
-			m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
-		if(clearAlpha) \
-			m_nMenuFadeAlpha = 0; \
-	} while(0)
-#endif
-
 #define PREPARE_MENU_HEADER \
-	CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255))); \
 	CFont::SetRightJustifyOn(); \
+	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING)); \
 	CFont::SetScale(MENU_X(MENUHEADER_WIDTH), MENU_Y(MENUHEADER_HEIGHT)); \
-	CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+	CFont::SetDropShadowPosition(0);
 
-#define ProcessSlider(value, increaseAction, decreaseAction, hoverStartX, hoverEndX) \
+#define ProcessSlider(value, y, increaseAction, decreaseAction, hoverStartX, hoverEndX) \
 	do { \
-		lastActiveBarX = DisplaySlider(MENU_X_RIGHT_ALIGNED(MENUSLIDER_X + columnWidth), MENU_Y(bitAboveNextItemY), MENU_Y(smallestSliderBar), MENU_Y(usableLineHeight), MENU_X(MENUSLIDER_UNK), value); \
+		lastActiveBarX = DisplaySlider(MENU_X_LEFT_ALIGNED(MENUSLIDER_X), MENU_Y(y), MENU_Y(MENUSLIDER_SMALLEST_BAR), MENU_Y(MENUSLIDER_BIGGEST_BAR), MENU_X(MENUSLIDER_UNK), value, MENU_X(3.0f)); \
 		if (i != m_nCurrOption || !itemsAreSelectable) \
 			break; \
 		 \
-		if (CheckHover(hoverStartX, lastActiveBarX - MENU_X(10.0f), MENU_Y(nextYToUse), MENU_Y(28.0f + nextYToUse))) \
+		if (CheckHover(hoverStartX, lastActiveBarX - MENU_X(3.0f), MENU_Y(y), MENU_Y(MENUSLIDER_BIGGEST_BAR + y))) \
 			m_nHoverOption = decreaseAction; \
 		 \
-		if (!CheckHover(MENU_X(10.0f) + lastActiveBarX, hoverEndX, MENU_Y(nextYToUse), MENU_Y(28.0f + nextYToUse))) \
+		if (!CheckHover(MENU_X(3.0f) + lastActiveBarX, hoverEndX, MENU_Y(y), MENU_Y(MENUSLIDER_BIGGEST_BAR + y))) \
 			break; \
 		 \
 		m_nHoverOption = increaseAction; \
-		if (m_nMousePosX < MENU_X_RIGHT_ALIGNED(MENUSLIDER_X + columnWidth)) \
+		if (m_nMousePosX < MENU_X_LEFT_ALIGNED(MENUSLIDER_X)) \
 			m_nHoverOption = HOVEROPTION_NOT_HOVERING; \
 	} while(0)
 
+// TODO: this is COMPLETELY different in VC
 #define ProcessRadioIcon(sprite, x, y, radioId, hoverOpt) \
 	do { \
-		sprite.Draw(x, y, MENU_X(MENURADIO_ICON_SCALE), MENU_Y(MENURADIO_ICON_SCALE), radioId == m_PrefsRadioStation ? CRGBA(255, 255, 255, 255) : CRGBA(225, 0, 0, 170)); \
+		sprite.Draw(x, y, MENU_X(MENURADIO_ICON_SCALE), MENU_Y(MENURADIO_ICON_SCALE), radioId == m_PrefsRadioStation ? CRGBA(255, 255, 255, 255) : CRGBA(255, 255, 255, 100)); \
 			if (CheckHover(x, x + MENU_X(MENURADIO_ICON_SCALE), y, y + MENU_Y(MENURADIO_ICON_SCALE))) \
 				m_nHoverOption = hoverOpt; \
 	} while (0)
 
 // --- Functions not in the game/inlined starts
 
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+
+#ifdef PS2_LIKE_MENU
+void
+CMenuManager::SwitchToNewScreen(int8 screen)
+{
+	if (reverseAlpha) {
+			m_nPrevScreen = m_nCurrScreen;
+			m_nCurrScreen = pendingScreen;
+			m_nCurrOption = pendingOption;
+			reverseAlpha = false;
+			if (updateDelay)
+				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	if (withReverseAlpha) {
+		pendingOption = option;
+		pendingScreen = screen;
+		reverseAlpha = true;
+	} else {
+		m_nPrevScreen = m_nCurrScreen;
+		m_nCurrScreen = screen;
+		m_nCurrOption = option;
+		if (updateDelay)
+			m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	m_nMenuFadeAlpha = 255;
+}
+#else
+
+// --MIAMI: Done except using VC's gMenuPages
 void
+CMenuManager::SwitchToNewScreen(int8 screen)
+{
+	bMenuChangeOngoing = true;
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DrawBackground(true);
+	DoRWStuffEndOfFrame();
+	m_nPrevScreen = m_nCurrScreen;
+	m_ShowEmptyBindingError = false;
+	ResetHelperText();
+
+	ThingsToDoBeforeLeavingPage();
+
+	if (screen == -2) {
+		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
+		int oldOption = (m_nCurrScreen == MENUPAGE_NEW_GAME ? 0 : (m_nCurrScreen == MENUPAGE_OPTIONS ? 1 : (m_nCurrScreen == MENUPAGE_EXIT ? 2 : aScreens[m_nCurrScreen].m_ParentEntry)));
+
+		m_nCurrOption = oldOption;
+		m_nCurrScreen = oldScreen;
+	} else if (screen == 0) {
+		m_nCurrScreen = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu;
+		m_nCurrOption = 0;
+	} else {
+		m_nCurrOption = 0;
+		m_nCurrScreen = screen;
+	}
+
+	if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT)
+		m_nCurrOption = 8;
+	m_nMenuFadeAlpha = 0;
+	m_nOptionHighlightTransitionBlend = 0;
+	m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
+}
+#endif
+
+inline void
 CMenuManager::ScrollUpListByOne() 
 {
 	if (m_nSelectedListRow == m_nFirstVisibleRowOnList) {
@@ -330,7 +297,7 @@ CMenuManager::ScrollUpListByOne()
 	}
 }
 
-void
+inline void
 CMenuManager::ScrollDownListByOne()
 {
 	if (m_nSelectedListRow == m_nFirstVisibleRowOnList + MAX_VISIBLE_LIST_ROW - 1) {
@@ -346,13 +313,13 @@ CMenuManager::ScrollDownListByOne()
 	}
 }
 
-void
+inline void
 CMenuManager::PageUpList(bool playSoundOnSuccess)
 {
 	if (m_nTotalListRow > MAX_VISIBLE_LIST_ROW) {
 		if (m_nFirstVisibleRowOnList > 0) {
 			if(playSoundOnSuccess)
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 			m_nFirstVisibleRowOnList = Max(0, m_nFirstVisibleRowOnList - MAX_VISIBLE_LIST_ROW);
 			m_nSelectedListRow = Min(m_nSelectedListRow, m_nFirstVisibleRowOnList + MAX_VISIBLE_LIST_ROW - 1);
@@ -364,13 +331,13 @@ CMenuManager::PageUpList(bool playSoundOnSuccess)
 	}
 }
 
-void
+inline void
 CMenuManager::PageDownList(bool playSoundOnSuccess)
 {
 	if (m_nTotalListRow > MAX_VISIBLE_LIST_ROW) {
 		if (m_nFirstVisibleRowOnList < m_nTotalListRow - MAX_VISIBLE_LIST_ROW) {
 			if(playSoundOnSuccess)
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 			m_nFirstVisibleRowOnList = Min(m_nFirstVisibleRowOnList + MAX_VISIBLE_LIST_ROW, m_nTotalListRow - MAX_VISIBLE_LIST_ROW);
 			m_nSelectedListRow = Max(m_nSelectedListRow, m_nFirstVisibleRowOnList);
@@ -382,13 +349,14 @@ CMenuManager::PageDownList(bool playSoundOnSuccess)
 	}
 }
 
-void
-CMenuManager::ThingsToDoBeforeGoingBack()
+// TODO(Miami)
+inline void
+CMenuManager::ThingsToDoBeforeLeavingPage()
 {
 	if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) && strcmp(m_aSkinName, m_PrefsSkinFile) != 0) {
 		CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
 	} else if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
-		if (m_nPrefsAudio3DProviderIndex != -1)
+		if (m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER)
 			m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
 #ifdef TIDY_UP_PBP
 		DMAudio.StopFrontEndTrack();
@@ -396,6 +364,9 @@ CMenuManager::ThingsToDoBeforeGoingBack()
 #endif
 	} else if (m_nCurrScreen == MENUPAGE_GRAPHICS_SETTINGS) {
 		m_nDisplayVideoMode = m_nPrefsVideoMode;
+#ifdef IMPROVED_VIDEOMODE
+		m_nSelectedScreenMode = m_nPrefsWindowed;
+#endif
 	}
 
 	if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
@@ -405,50 +376,126 @@ CMenuManager::ThingsToDoBeforeGoingBack()
 	if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) || (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS)) {
 		m_nTotalListRow = 0;
 	}
+}
 
-#ifdef CUSTOM_FRONTEND_OPTIONS
-	for (int i = 0; i < numCustomFrontendOptions; i++) {
-		FrontendOption &option = customFrontendOptions[i];
-		if (option.type != FEOPTION_REDIRECT && option.type != FEOPTION_GOBACK && m_nCurrScreen == option.screen) {
-			if (option.returnPrevPageFunc)
-				option.returnPrevPageFunc();
+// ------ Functions not in the game/inlined ends
 
-			if (m_nCurrOption == option.screenOptionOrder && option.type == FEOPTION_DYNAMIC)
-				option.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
+CMenuManager::CMenuManager()
+{
+	m_StatsScrollSpeed = 150.0f;
+	m_StatsScrollDirection = 1;
+	m_PrefsSfxVolume = 49;
+	m_PrefsMusicVolume = 49;
+	m_PrefsRadioStation = 0;
+	field_2C = 1;
+	m_PrefsBrightness = 256;
+	m_PrefsLOD = 1.2f;
+	m_KeyPressedCode = -1;
+	m_bFrontEnd_ReloadObrTxtGxt = false;
+	m_PrefsMP3BoostVolume = 0;
+	m_PrefsShowSubtitles = 0;
+	m_PrefsShowLegends = 1;
+	m_PrefsUseWideScreen = 0;
+	m_PrefsVsync = 0;
+	m_PrefsVsyncDisp = 1;
+	m_PrefsFrameLimiter = 1;
+	m_PrefsLanguage = 0;
+	field_54 = 0;
+	m_PrefsAllowNastyGame = 1;
+	m_PrefsSpeakers = 0;
+	field_8 = 0;
+	m_PrefsUseVibration = 0;
+	m_PrefsShowHud = 1;
+	m_PrefsRadarMode = 0;
+	field_10 = 0;
+	m_bShutDownFrontEndRequested = false;
+	m_bStartUpFrontEndRequested = false;
+	pEditString = nil;
+	pControlEdit = nil;
+	DisplayComboButtonErrMsg = false;
+	m_PrefsDMA = 1;
+	OS_Language = LANG_ENGLISH;
+	m_ControlMethod = CONTROL_STANDARD;
+	CCamera::m_bUseMouse3rdPerson = true;
+	m_lastWorking3DAudioProvider = 0;
+	m_nFirstVisibleRowOnList = 0;
+	m_nScrollbarTopMargin = 0.0f;
+	m_nSelectedListRow = 0;
+	m_nSkinsTotal = 0;
+	m_nPrefsAudio3DProviderIndex = -99;
+	m_bGameNotLoaded = true;
+	m_nMousePosX = m_nMouseTempPosX;
+	m_nMousePosY = m_nMouseTempPosY;
+	m_nMouseOldPosX = m_nMousePosX;
+	m_nMouseOldPosY = m_nMousePosY;
+	m_bShowMouse = true;
+	m_nHoverOption = HOVEROPTION_NOT_HOVERING;
 
-			if (option.onlyApplyOnEnter)
-				option.displayedValue = *option.value;
-		}
-	}
-#endif
+	// TODO(Miami)
+	// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	m_bMenuActive = false;
+	m_bActivateSaveMenu = false;
+	m_bWantToLoad = false;
+	m_nMenuFadeAlpha = 0;
+	m_OnlySaveMenu = false;
+	m_fMapSize = 162.0f;
+	m_fMapCenterX = 320.0f;
+	m_fMapCenterY = 225.0f;
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
 }
 
-int8
-CMenuManager::GetPreviousPageOption()
+void
+CMenuManager::SetFrontEndRenderStates(void)
 {
-#ifndef CUSTOM_FRONTEND_OPTIONS
-	return !m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_ParentEntry[1] : aScreens[m_nCurrScreen].m_ParentEntry[0];
-#else
-	int8 prevPage = !m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage[1] : aScreens[m_nCurrScreen].m_PreviousPage[0];
-
-	if (prevPage == -1) // Game also does same
-		return 0;
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+}
 
-	prevPage = prevPage == MENUPAGE_NONE ? (!m_bGameNotLoaded ? MENUPAGE_PAUSE_MENU : MENUPAGE_START_MENU) : prevPage;
+void
+CMenuManager::Initialise(void)
+{
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DoRWStuffEndOfFrame();
+	m_AllowNavigation = false;
+	m_menuTransitionProgress = -50;
+	m_nMenuFadeAlpha = 0;
+	m_nCurrOption = 0;
+	m_nOptionHighlightTransitionBlend = 0;
+	CentreMousePointer();
+	m_bShowMouse = true;
+	m_fMapSize = 162.0f;
+	m_fMapCenterX = 320.0f;
+	m_fMapCenterY = 225.0f;
+	CPad::StopPadsShaking();
+	if (!m_OnlySaveMenu)
+		m_nCurrScreen = MENUPAGE_NONE;
+	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.Service();
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+	m_PrefsRadioStation = DMAudio.GetRadioInCar();
 
-	for (int i = 0; i < NUM_MENUROWS; i++) {
-		if (aScreens[prevPage].m_aEntries[i].m_TargetMenu == m_nCurrScreen) {
-			return i;
-		}
-	}
+	// TODO(Miami)
+	// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > USERTRACK)
+			m_PrefsRadioStation = CGeneral::GetRandomNumber() % 10;
+	} else if (m_PrefsRadioStation < WILDSTYLE || m_PrefsRadioStation > WAVE)
+		m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9;
 
-	// Couldn't find current screen option on previous page, use default behaviour (maybe save-related screen?)
-	return !m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_ParentEntry[1] : aScreens[m_nCurrScreen].m_ParentEntry[0];
-#endif
+	CFileMgr::SetDir("");
+	//CFileMgr::SetDir("");
+	PcSaveHelper.PopulateSlotInfo();
+	CTimer::StartUserPause();
 }
 
-// ------ Functions not in the game/inlined ends
-
 void
 CMenuManager::BuildStatLine(Const char *text, void *stat, bool itsFloat, void *stat2)
 {
@@ -619,25 +666,15 @@ void
 CMenuManager::DisplayHelperText()
 {
 	// there was a unused static bool
-	static uint32 LastFlash = 0;
+	static PauseModeTime LastFlash = 0;
 	int32 alpha;
 
 	if (m_nHelperTextMsgId != 0 && m_nHelperTextMsgId != 1) {
-
-		// FIX: High fps bug
-#ifndef FIX_BUGS
 		if (CTimer::GetTimeInMillisecondsPauseMode() - LastFlash > 10) {
 			LastFlash = CTimer::GetTimeInMillisecondsPauseMode();
 			m_nHelperTextAlpha -= 2;
 		}
-#else
-		static float fadeAlpha = 0.0f; // To keep it precisely
-		if (m_nHelperTextAlpha >= 255 && fadeAlpha < 250) fadeAlpha = m_nHelperTextAlpha;
 
-		// -2 per every 33 ms (1000.f/30.f - original frame limiter fps)
-		fadeAlpha -= (frameTime / 33.0f) * 2.0f;
-		m_nHelperTextAlpha = fadeAlpha;
-#endif
 		if (m_nHelperTextAlpha < 1)
 			ResetHelperText();
 
@@ -681,23 +718,23 @@ CMenuManager::DisplayHelperText()
 	CFont::SetRightJustifyOff();
 }
 
+// --MIAMI: Done
 int
-CMenuManager::DisplaySlider(float x, float y, float mostLeftBarSize, float mostRightBarSize, float rectSize, float progress) 
+CMenuManager::DisplaySlider(float x, float y, float mostLeftBarSize, float mostRightBarSize, float rectSize, float progress, float spacing) 
 {
 	CRGBA color;
 	float maxBarHeight;
 
 	int lastActiveBarX = 0;
 	float curBarX = 0.0f;
-	float spacing = SCREEN_SCALE_X(10.0f);
 	for (int i = 0; i < 16; i++) {
 		curBarX = i * rectSize/16.0f + x;
 
 		if (i / 16.0f + 1 / 32.0f < progress) {
-			color = CRGBA(255, 217, 106, FadeIn(255));
+			color = CRGBA(SLIDERON_COLOR.r, SLIDERON_COLOR.g, SLIDERON_COLOR.b, FadeIn(255));
 			lastActiveBarX = curBarX;
 		} else
-			color = CRGBA(185, 120, 0, FadeIn(255));
+			color = CRGBA(SLIDEROFF_COLOR.r, SLIDEROFF_COLOR.g, SLIDEROFF_COLOR.b, FadeIn(255));
 
 		maxBarHeight = Max(mostLeftBarSize, mostRightBarSize);
 
@@ -713,6 +750,7 @@ CMenuManager::DisplaySlider(float x, float y, float mostLeftBarSize, float mostR
 	return lastActiveBarX;
 }
 
+// TODO(Miami)
 void
 CMenuManager::DoSettingsBeforeStartingAGame()
 {
@@ -720,76 +758,82 @@ CMenuManager::DoSettingsBeforeStartingAGame()
 	if (m_PrefsVsyncDisp != m_PrefsVsync)
 		m_PrefsVsync = m_PrefsVsyncDisp;
 
+	DMAudio.DestroyAllGameCreatedEntities();
 	DMAudio.Service();
+	m_bShutDownFrontEndRequested = true;
 	m_bWantToRestart = true;
-
-	ShutdownJustMenu();
-	UnloadTextures();
 	DMAudio.SetEffectsFadeVol(0);
 	DMAudio.SetMusicFadeVol(0);
+	SwitchMenuOnAndOff();
 	DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
 }
 
 void
-CMenuManager::Draw()
+CMenuManager::DrawStandardMenus(bool drawCurrScreen)
 {
+	float nextYToUse = 0.0f; // III leftover, set but unused in VC
+#ifdef PS2_LIKE_MENU
+	bool itemsAreSelectable = !bottomBarActive;
+#else
+	bool itemsAreSelectable = true;
+#endif
 	CFont::SetBackgroundOff();
 	CFont::SetPropOn();
 	CFont::SetCentreOff();
 	CFont::SetJustifyOn();
-	CFont::SetBackGroundOnlyTextOn();
-#ifdef GTA3_1_1_PATCH
-	CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
-	CFont::SetRightJustifyOn();
-	CFont::SetFontStyle(FONT_HEADING);
-	CFont::SetScale(MENU_X(0.7f), MENU_Y(0.5f));
-	CFont::SetWrapx(SCREEN_WIDTH);
-	CFont::SetRightJustifyWrap(0.0f);
-	strcpy(gString, "V1.1");
-	AsciiToUnicode(gString, gUString);
-	CFont::PrintString(SCREEN_WIDTH / 10, SCREEN_HEIGHT / 45, gUString);
-#endif
-	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
-	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH));
+	CFont::SetBackGroundOnlyTextOff();
+
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_UNK_X_MARGIN));
+	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENU_UNK_WIDTH));
+	CFont::SetCentreSize(SCREEN_WIDTH);
 
 	switch (m_nCurrScreen) {
+		case MENUPAGE_CHOOSE_LOAD_SLOT:
+		case MENUPAGE_CHOOSE_DELETE_SLOT:
+		case MENUPAGE_CHOOSE_SAVE_SLOT:
+			CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(38.0f), MENU_Y(85.0f),
+				MENU_X_LEFT_ALIGNED(615.0f), MENU_Y(75.0f),
+				MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(320.0f), 
+				MENU_X_LEFT_ALIGNED(605.0f), MENU_Y(330.0f), CRGBA(49, 101, 148, FadeIn(130)));
+			break;
+		/*
+		// TODO(Miami)
+		case MENUPAGE_SOUND_SETTINGS:
+			PrintSoundSettings();
+			break;
+		*/
 		case MENUPAGE_STATS:
 			PrintStats();
 			break;
 		case MENUPAGE_BRIEFS:
 			PrintBriefs();
 			break;
-#ifdef MENU_MAP
-		case MENUPAGE_MAP:
-			PrintMap();
-			break;
-#endif
 	}
 
-	// Header height isn't accounted, we will add that later.
-	float nextYToUse = 40.0f;
-
 	// Page name
-#ifdef PS2_SAVE_DIALOG
-	if(!m_bRenderGameInMenu)
-#endif
 	if (aScreens[m_nCurrScreen].m_ScreenName[0] != '\0') {
-		
+
 		PREPARE_MENU_HEADER
-		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+		CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X + 7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
 
-		// Weird place to put that.
-		nextYToUse += 24.0f + 10.0f;
+		CFont::SetColor(CRGBA(HEADER_COLOR.r, HEADER_COLOR.g, HEADER_COLOR.b, FadeIn(255)));
+		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
 	}
 
-	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-	CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_X), MENU_Y(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_Y));
-	CFont::SetRightJustifyOff();
-	CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
-
 	// Label
 	wchar *str;
 	if (aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL) {
+		CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENULABEL_X_MARGIN));
+		CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENULABEL_WIDTH));
+		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+		CFont::SetScale(MENU_X(BIGTEXT2_X_SCALE), MENU_Y(BIGTEXT2_Y_SCALE));
+		CFont::SetRightJustifyOff();
+
+		CFont::SetDropShadowPosition(2);
+		CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+		CFont::SetColor(CRGBA(LABEL_COLOR.r, LABEL_COLOR.g, LABEL_COLOR.b, FadeIn(255)));
+
 		switch (m_nCurrScreen) {
 		case MENUPAGE_LOAD_SLOT_CONFIRM:
 			if (m_bGameNotLoaded)
@@ -797,8 +841,13 @@ CMenuManager::Draw()
 			else
 				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
 			break;
+		case MENUPAGE_DELETE_SLOT_CONFIRM:
+			str = TheText.Get(aScreens[MENUPAGE_DELETE_SLOT_CONFIRM].m_aEntries[0].m_EntryName);
+			break;
 		case MENUPAGE_SAVE_OVERWRITE_CONFIRM:
-			if (Slots[m_nCurrSaveSlot + 1] == SLOT_EMPTY)
+			if (Slots[m_nCurrSaveSlot + 1] == SLOT_OK)
+				str = TheText.Get("FESZ_QO");
+			else if (Slots[m_nCurrSaveSlot + 1] == SLOT_CORRUPTED)
 				str = TheText.Get("FESZ_QZ");
 			else
 				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
@@ -814,129 +863,18 @@ CMenuManager::Draw()
 			break;
 		}
 
-#ifdef FIX_BUGS
-		// Label is wrapped from right by StretchX(40)px, but wrapped from left by 40px. And this is only place R* didn't use StretchX in here.
-		CFont::PrintString(MENU_X_LEFT_ALIGNED(MENU_X_MARGIN), MENU_Y(MENUACTION_POS_Y), str);
-#else
-		CFont::PrintString(MENU_X_MARGIN, MENUACTION_POS_Y, str);
-#endif
+		CFont::PrintString(MENU_X_LEFT_ALIGNED(100.0f), MENU_Y(97.0f), str);
+		CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_UNK_X_MARGIN));
+		CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENU_UNK_WIDTH));
 	}
 
-	CFont::SetCentreSize(SCREEN_WIDTH);
+	if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+		if (m_bWaitingForNewKeyBind)
+			itemsAreSelectable = false;
 
-#ifdef PS2_LIKE_MENU
-	bool itemsAreSelectable = !bottomBarActive;
-#else
-	bool itemsAreSelectable = true;
-#endif
-	int lineHeight;
-	int headerHeight;
-	int columnWidth;
-	switch (m_nCurrScreen) {
-		case MENUPAGE_STATS:
-		case MENUPAGE_BRIEFS:
-			columnWidth = 320;
-			headerHeight = 240;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			CFont::SetCentreOn();
-			break;
-		case MENUPAGE_SOUND_SETTINGS:
-		case MENUPAGE_GRAPHICS_SETTINGS:
-		case MENUPAGE_MULTIPLAYER_CREATE:
-		case MENUPAGE_SKIN_SELECT_OLD:
-		case MENUPAGE_CONTROLLER_PC_OLD1:
-		case MENUPAGE_CONTROLLER_PC_OLD2:
-		case MENUPAGE_CONTROLLER_PC_OLD3:
-		case MENUPAGE_CONTROLLER_PC_OLD4:
-		case MENUPAGE_CONTROLLER_DEBUG:
-		case MENUPAGE_MOUSE_CONTROLS:
-			columnWidth = 50;
-			headerHeight = 0;
-			lineHeight = 20;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = MEDIUMTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = MEDIUMTEXT_Y_SCALE));
-			CFont::SetRightJustifyOff();
-			break;
-		case MENUPAGE_CHOOSE_LOAD_SLOT:
-		case MENUPAGE_CHOOSE_DELETE_SLOT:
-		case MENUPAGE_CHOOSE_SAVE_SLOT:
-			columnWidth = 120;
-			headerHeight = 38;
-			lineHeight = 20;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE));
-			CFont::SetRightJustifyOff();
-			break;
-		case MENUPAGE_NEW_GAME_RELOAD:
-		case MENUPAGE_LOAD_SLOT_CONFIRM:
-		case MENUPAGE_DELETE_SLOT_CONFIRM:
-		case MENUPAGE_SAVE_OVERWRITE_CONFIRM:
-		case MENUPAGE_EXIT:
-			columnWidth = 320;
-			headerHeight = 60;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			CFont::SetCentreOn();
-			break;
-		case MENUPAGE_START_MENU:
-			columnWidth = 320;
-			headerHeight = 140;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			CFont::SetCentreOn();
-			break;
-		case MENUPAGE_PAUSE_MENU:
-			columnWidth = 320;
-			headerHeight = 117;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			CFont::SetCentreOn();
-			break;
-#ifdef PS2_SAVE_DIALOG
-		case MENUPAGE_SAVE:
-			columnWidth = 180;
-			headerHeight = 60;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			break;
-#endif
-		default:
-			columnWidth = 320;
-			headerHeight = 40;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			CFont::SetCentreOn();
-			break;
+		DrawControllerScreenExtraText(-8.0f, MENU_X_LEFT_ALIGNED(350), MENU_DEFAULT_LINE_HEIGHT);
 	}
 
-#ifdef PS2_LIKE_MENU
-	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-#endif
-
-	switch (m_nCurrScreen) {
-		case MENUPAGE_CONTROLLER_PC_OLD1:
-		case MENUPAGE_CONTROLLER_PC_OLD2:
-		case MENUPAGE_CONTROLLER_PC_OLD3:
-		case MENUPAGE_CONTROLLER_PC_OLD4:
-		case MENUPAGE_CONTROLLER_DEBUG:
-			if (m_bWaitingForNewKeyBind)
-				itemsAreSelectable = false;
-
-			DrawControllerScreenExtraText(nextYToUse - 8.0f, MENU_X_LEFT_ALIGNED(350), lineHeight);
-			break;
-		default:
-			break;
-	}
-
-	float usableLineHeight = lineHeight * 0.9f; // also height of biggest bar in slider
-	float smallestSliderBar = lineHeight * 0.1f;
 	bool foundTheHoveringItem = false;
 	wchar unicodeTemp[64];
 	char asciiTemp[32];
@@ -947,6 +885,9 @@ CMenuManager::Draw()
 		wchar *backTx = TheText.Get("FEDS_TB");
 		CFont::SetDropShadowPosition(1);
 		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
+		CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+		CFont::SetRightJustifyOff();
+		CFont::SetCentreOn();
 		CFont::PrintString(MENU_X(60.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f), backTx);
 		CFont::SetDropShadowPosition(0);
 		if (!CheckHover(MENU_X(30.0f), MENU_X(30.0f) + CFont::GetStringWidth(backTx), SCREEN_SCALE_FROM_BOTTOM(125.0f), SCREEN_SCALE_FROM_BOTTOM(105.0f))) {
@@ -960,473 +901,482 @@ CMenuManager::Draw()
 	}
 #endif
 
-#ifdef CUSTOM_FRONTEND_OPTIONS
-	static int lastOption = m_nCurrOption;
-#endif
+	bool weHaveLabel = aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL;
+	uint8 section = 0; // 0: highlight trapezoid  1: texts
 
-	for (int i = 0; i < NUM_MENUROWS; ++i) {
-#ifdef CUSTOM_FRONTEND_OPTIONS
-		bool isOptionDisabled = false;
-#endif
-		if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action != MENUACTION_LABEL && aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName[0] != '\0') {
-			wchar *rightText = nil;
-			wchar *leftText;
+	while (section < 2) {
 
+		for (int i = 0; i < NUM_MENUROWS; ++i) {
+			wchar* rightText = nil;
+			wchar* leftText;
 			if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+				CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
+				CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+				CFont::SetScale(MENU_X(MEDIUMTEXT_X_SCALE), MENU_Y(MEDIUMTEXT_Y_SCALE));
+				CFont::SetDropShadowPosition(0);
+			} else {
+				CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+				CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+				CFont::SetDropShadowPosition(2);
+				CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255)));
+				CFont::SetColor(CRGBA(MENUOPTION_COLOR.r, MENUOPTION_COLOR.g, MENUOPTION_COLOR.b, FadeIn(255)));
+			}
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Align == MENUALIGN_LEFT) {
+				CFont::SetCentreOff();
+				CFont::SetRightJustifyOff();
+			} else if (aScreens[m_nCurrScreen].m_aEntries[i].m_Align == MENUALIGN_RIGHT) {
+				CFont::SetCentreOff();
+				CFont::SetRightJustifyOn();
+			} else {
 				CFont::SetRightJustifyOff();
-				leftText = GetNameOfSavedGame(i - 1);
+				CFont::SetCentreOn();
+			}
+			if (!aScreens[m_nCurrScreen].m_aEntries[i].m_X && !aScreens[m_nCurrScreen].m_aEntries[i].m_Y) {
+				if (i == 0 || (i == 1 && weHaveLabel)) {
+					aScreens[m_nCurrScreen].m_aEntries[i].m_X = MENU_DEFAULT_CONTENT_X;
+					aScreens[m_nCurrScreen].m_aEntries[i].m_Y = MENU_DEFAULT_CONTENT_Y;
+					
+				} else {
+					aScreens[m_nCurrScreen].m_aEntries[i].m_X = aScreens[m_nCurrScreen].m_aEntries[i-1].m_X;
+					aScreens[m_nCurrScreen].m_aEntries[i].m_Y = aScreens[m_nCurrScreen].m_aEntries[i-1].m_Y + MENU_DEFAULT_LINE_HEIGHT;
+				}
+			}
+
+			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action != MENUACTION_LABEL && aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName[0] != '\0') {
 
-				if (Slots[i] != SLOT_EMPTY)
-					rightText = GetSavedGameDateAndTime(i - 1);
+				if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+					CFont::SetRightJustifyOff();
+
+					leftText = nil;
+					if (Slots[i] == SLOT_OK) {
+						leftText = GetNameOfSavedGame(i);
+						rightText = GetSavedGameDateAndTime(i);
+					}
 
-				if (leftText[0] == '\0') {
-					sprintf(gString, "FEM_SL%d", i);
-					leftText = TheText.Get(gString);
+					if (!leftText || leftText[0] == '\0') {
+						sprintf(gString, "FEM_SL%d", i + 1);
+						leftText = TheText.Get(gString);
+					}
+				} else {
+					leftText = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName);
 				}
-			} else {
-				leftText = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName);
-			}
 
-			switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
-			case MENUACTION_CHANGEMENU: {
-				switch (aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu) {
-					case MENUPAGE_MULTIPLAYER_MAP:
-						switch (m_SelectedMap) {
-							case 0:
-								rightText = TheText.Get("FEM_MA0");
-								break;
-							case 1:
-								rightText = TheText.Get("FEM_MA1");
-								break;
-							case 2:
-								rightText = TheText.Get("FEM_MA2");
-								break;
-							case 3:
-								rightText = TheText.Get("FEM_MA3");
-								break;
-							case 4:
-								rightText = TheText.Get("FEM_MA4");
-								break;
-							case 5:
-								rightText = TheText.Get("FEM_MA5");
-								break;
-							case 6:
-								rightText = TheText.Get("FEM_MA6");
-								break;
-							case 7:
-								rightText = TheText.Get("FEM_MA7");
-								break;
-							default:
-								break;
-						}
+				if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER) {
+					if (strncmp(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName, "FEO_AUD", 8) == 0) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+					}
+				}
+
+				switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
+#ifdef LEGACY_MENU_OPTIONS
+				case MENUACTION_CTRLVIBRATION:
+					if (m_PrefsUseVibration)
+						rightText = TheText.Get("FEM_ON");
+					else
+						rightText = TheText.Get("FEM_OFF");
+					break;
+				case MENUACTION_CTRLCONFIG:
+					switch (CPad::GetPad(0)->Mode) {
+					case 0:
+						rightText = TheText.Get("FEC_CF1");
 						break;
-					case MENUPAGE_MULTIPLAYER_MODE:
-						switch (m_SelectedGameType) {
-							case 0:
-								rightText = TheText.Get("FEN_TY0");
-								break;
-							case 1:
-								rightText = TheText.Get("FEN_TY1");
-								break;
-							case 2:
-								rightText = TheText.Get("FEN_TY2");
-								break;
-							case 3:
-								rightText = TheText.Get("FEN_TY3");
-								break;
-							case 4:
-								rightText = TheText.Get("FEN_TY4");
-								break;
-							case 5:
-								rightText = TheText.Get("FEN_TY5");
-								break;
-							case 6:
-								rightText = TheText.Get("FEN_TY6");
-								break;
-							case 7:
-								rightText = TheText.Get("FEN_TY7");
-								break;
-							default:
-								break;
-						}
+					case 1:
+						rightText = TheText.Get("FEC_CF2");
 						break;
-					default:
+					case 2:
+						rightText = TheText.Get("FEC_CF3");
 						break;
-				}
-				break;
-			}
-			case MENUACTION_CTRLVIBRATION:
-				if (m_PrefsUseVibration)
-					rightText = TheText.Get("FEM_ON");
-				else
-					rightText = TheText.Get("FEM_OFF");
-				break;
-			case MENUACTION_CTRLCONFIG:
-				switch (CPad::GetPad(0)->Mode) {
-				case 0:
-					rightText = TheText.Get("FEC_CF1");
+					case 3:
+						rightText = TheText.Get("FEC_CF4");
+						break;
+					}
 					break;
-				case 1:
-					rightText = TheText.Get("FEC_CF2");
+#endif
+				case MENUACTION_FRAMESYNC:
+					rightText = TheText.Get(m_PrefsVsyncDisp ? "FEM_ON" : "FEM_OFF");
 					break;
-				case 2:
-					rightText = TheText.Get("FEC_CF3");
+				case MENUACTION_FRAMELIMIT:
+					rightText = TheText.Get(m_PrefsFrameLimiter ? "FEM_ON" : "FEM_OFF");
 					break;
-				case 3:
-					rightText = TheText.Get("FEC_CF4");
+				case MENUACTION_TRAILS:
+					rightText = TheText.Get(CMBlur::BlurOn ? "FEM_ON" : "FEM_OFF");
 					break;
-				}
-				break;
-			case MENUACTION_CTRLDISPLAY:
-				if (m_DisplayControllerOnFoot)
-					rightText = TheText.Get("FEC_ONF");
-				else
-					rightText = TheText.Get("FEC_INC");
-				break;
-			case MENUACTION_FRAMESYNC:
-				rightText = TheText.Get(m_PrefsVsyncDisp ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_FRAMELIMIT:
-				rightText = TheText.Get(m_PrefsFrameLimiter ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_TRAILS:
-				rightText = TheText.Get(CMBlur::BlurOn ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_SUBTITLES:
-				rightText = TheText.Get(m_PrefsShowSubtitles ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_WIDESCREEN:
+				case MENUACTION_SUBTITLES:
+					rightText = TheText.Get(m_PrefsShowSubtitles ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_WIDESCREEN:
 #ifndef ASPECT_RATIO_SCALE
-				rightText = TheText.Get(m_PrefsUseWideScreen ? "FEM_ON" : "FEM_OFF");
+					rightText = TheText.Get(m_PrefsUseWideScreen ? "FEM_ON" : "FEM_OFF");
 #else
-				switch (m_PrefsUseWideScreen) {
-				case AR_AUTO:
-					sprintf(asciiTemp, "AUTO");
-					break;
-				case AR_4_3:
-					sprintf(asciiTemp, "4:3");
+					switch (m_PrefsUseWideScreen) {
+					case AR_AUTO:
+						sprintf(asciiTemp, "AUTO");
+						break;
+					case AR_4_3:
+						sprintf(asciiTemp, "4:3");
+						break;
+					case AR_16_9:
+						sprintf(asciiTemp, "16:9");
+						break;
+					}
+
+					AsciiToUnicode(asciiTemp, unicodeTemp);
+					rightText = unicodeTemp;
+#endif
 					break;
-				case AR_16_9:
-					sprintf(asciiTemp, "16:9");
+
+				case MENUACTION_MUSICVOLUME:
+				case MENUACTION_SFXVOLUME:
+					if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+
 					break;
-				}
+				case MENUACTION_RADIO:
+					if (m_PrefsRadioStation > USERTRACK)
+						break;
 
-				AsciiToUnicode(asciiTemp, unicodeTemp);
-				rightText = unicodeTemp;
+					sprintf(gString, "FEA_FM%d", m_PrefsRadioStation);
+					rightText = TheText.Get(gString);
+					break;
+				case MENUACTION_LEGENDS:
+					rightText = TheText.Get(m_PrefsShowLegends ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_RADARMODE:
+					switch (m_PrefsRadarMode) {
+						case 0:
+							rightText = TheText.Get("FED_RDM");
+							break;
+						case 1:
+							rightText = TheText.Get("FED_RDB");
+							break;
+						case 2:
+							rightText = TheText.Get("FEM_OFF");
+							break;
+					}
+					break;
+				case MENUACTION_HUD:
+					rightText = TheText.Get(m_PrefsShowHud ? "FEM_ON" : "FEM_OFF");
+#ifdef LEGACY_MENU_OPTIONS
+				case MENUACTION_SETDBGFLAG:
+					rightText = TheText.Get(CTheScripts::IsDebugOn() ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT:
+					rightText = TheText.Get(gbBigWhiteDebugLightSwitchedOn ? "FEM_ON" : "FEM_OFF");
+					break;
+				case MENUACTION_COLLISIONPOLYS:
+					rightText = TheText.Get(gbShowCollisionPolys ? "FEM_ON" : "FEM_OFF");
+					break;
 #endif
-				break;
-			case MENUACTION_RADIO:
-				if (m_PrefsRadioStation > USERTRACK)
+				case MENUACTION_SHOWHEADBOB:
+					rightText = TheText.Get(TheCamera.m_bHeadBob ? "FEM_ON" : "FEM_OFF");
 					break;
+				case MENUACTION_INVVERT:
+					rightText = TheText.Get(MousePointerStateHelper.bInvertVertically ? "FEM_OFF" : "FEM_ON");
+					break;
+				case MENUACTION_SCREENRES:
+					AsciiToUnicode(_psGetVideoModeList()[m_nDisplayVideoMode], unicodeTemp);
+					rightText = unicodeTemp;
 
-				sprintf(gString, "FEA_FM%d", m_PrefsRadioStation);
-				rightText = TheText.Get(gString);
-				break;
-			case MENUACTION_SETDBGFLAG:
-				rightText = TheText.Get(CTheScripts::IsDebugOn() ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_SWITCHBIGWHITEDEBUGLIGHT:
-				rightText = TheText.Get(gbBigWhiteDebugLightSwitchedOn ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_PEDROADGROUPS:
-				rightText = TheText.Get(gbShowPedRoadGroups ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_CARROADGROUPS:
-				rightText = TheText.Get(gbShowCarRoadGroups ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_COLLISIONPOLYS:
-				rightText = TheText.Get(gbShowCollisionPolys ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_SHOWCULL:
-				rightText = TheText.Get(gbShowCullZoneDebugStuff ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_SHOWHEADBOB:
-				rightText = TheText.Get(TheCamera.m_bHeadBob ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_INVVERT:
-				rightText = TheText.Get(MousePointerStateHelper.bInvertVertically ? "FEM_OFF" : "FEM_ON");
-				break;
-			case MENUACTION_SCREENRES:
-				AsciiToUnicode(_psGetVideoModeList()[m_nDisplayVideoMode], unicodeTemp);
-				rightText = unicodeTemp;
-				break;
-			case MENUACTION_AUDIOHW:
-				if (m_nPrefsAudio3DProviderIndex == -1)
-					rightText = TheText.Get("FEA_NAH");
-				else {
-					char *provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
-
-					if (!strcmp(strupr(provider), "DIRECTSOUND3D HARDWARE SUPPORT")) {
-						strcpy(provider, "DSOUND3D HARDWARE SUPPORT");
-					} else if (!strcmp(strupr(provider), "DIRECTSOUND3D SOFTWARE EMULATION")) {
-						strcpy(provider, "DSOUND3D SOFTWARE EMULATION");
+					if (!m_bGameNotLoaded) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
 					}
-					AsciiToUnicode(provider, unicodeTemp);
+					break;
+#ifdef IMPROVED_VIDEOMODE
+				case MENUACTION_SCREENMODE:
+					if (m_nSelectedScreenMode == 0)
+						sprintf(asciiTemp, "FULLSCREEN");
+					else
+						sprintf(asciiTemp, "WINDOWED");
+
+					AsciiToUnicode(asciiTemp, unicodeTemp);
 					rightText = unicodeTemp;
+					break;
+#endif
+				case MENUACTION_AUDIOHW:
+					if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+					else if (m_nPrefsAudio3DProviderIndex == -1)
+						rightText = TheText.Get("FEA_ADP");
+					else {
+						char* provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
+
+						if (!strcmp(strupr(provider), "DIRECTSOUND3D HARDWARE SUPPORT")) {
+							strcpy(provider, "DSOUND3D HARDWARE SUPPORT");
+						}
+						else if (!strcmp(strupr(provider), "DIRECTSOUND3D SOFTWARE EMULATION")) {
+							strcpy(provider, "DSOUND3D SOFTWARE EMULATION");
+						}
+						AsciiToUnicode(provider, unicodeTemp);
+						rightText = unicodeTemp;
+					}
+					break;
+				case MENUACTION_SPEAKERCONF: {
+					if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER)
+						rightText = TheText.Get("FEA_NAH");
+					else {
+						switch (m_PrefsSpeakers) {
+						case 0:
+							rightText = TheText.Get("FEA_2SP");
+							break;
+						case 1:
+							rightText = TheText.Get("FEA_EAR");
+							break;
+						case 2:
+							rightText = TheText.Get("FEA_4SP");
+							break;
+						}
+					}
+					break;
 				}
-				break;
-			case MENUACTION_SPEAKERCONF: {
-				if (m_nPrefsAudio3DProviderIndex == -1)
-					rightText = TheText.Get("FEA_NAH");
-				else {
-					switch (m_PrefsSpeakers) {
-					case 0:
-						rightText = TheText.Get("FEA_2SP");
+				case MENUACTION_CTRLMETHOD: {
+					switch (m_ControlMethod) {
+					case CONTROL_STANDARD:
+						leftText = TheText.Get("FET_STI");
 						break;
-					case 1:
-						rightText = TheText.Get("FEA_EAR");
-						break;
-					case 2:
-						rightText = TheText.Get("FEA_4SP");
+					case CONTROL_CLASSIC:
+						leftText = TheText.Get("FET_CTI");
 						break;
 					}
+					break;
 				}
-				break;
-			}
-			case MENUACTION_CTRLMETHOD: {
-				switch (m_ControlMethod) {
-				case 0:
-					leftText = TheText.Get("FET_SCN");
+				case MENUACTION_DYNAMICACOUSTIC:
+					rightText = TheText.Get(m_PrefsDMA ? "FEM_ON" : "FEM_OFF");
 					break;
-				case 1:
-					leftText = TheText.Get("FET_CCN");
+				case MENUACTION_MOUSESTEER:
+					rightText = TheText.Get(CVehicle::m_bDisableMouseSteering ? "FEM_OFF" : "FEM_ON");
+					if (m_ControlMethod == CONTROL_CLASSIC) {
+						CFont::SetColor(CRGBA(DARKMENUOPTION_COLOR.r, DARKMENUOPTION_COLOR.g, DARKMENUOPTION_COLOR.b, FadeIn(255)));
+					}
 					break;
-				}
-				break;
-			}
-			case MENUACTION_DYNAMICACOUSTIC:
-				rightText = TheText.Get(m_PrefsDMA ? "FEM_ON" : "FEM_OFF");
-				break;
-			case MENUACTION_MOUSESTEER:
-				rightText = TheText.Get(CVehicle::m_bDisableMouseSteering ? "FEM_OFF" : "FEM_ON");
-				break;
-#ifdef CUSTOM_FRONTEND_OPTIONS
-			case MENUACTION_TRIGGERFUNC:
-				FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
-				if (m_nCurrScreen == option.screen && i == option.screenOptionOrder) {
-					leftText = (wchar*)option.leftText;
-					if (option.type == FEOPTION_SELECT) {
-						if (option.displayedValue >= option.numRightTexts || option.displayedValue < 0)
-							option.displayedValue = 0;
-
-						rightText = (wchar*)option.rightTexts[option.displayedValue];
-
-					} else if (option.type == FEOPTION_DYNAMIC) {
-						if (option.drawFunc) {
-							rightText = option.drawFunc(&isOptionDisabled);
-						}
+				case MENUACTION_MP3VOLUMEBOOST:
+					if (!DMAudio.IsMP3RadioChannelAvailable()) {
+						rightText = TheText.Get("FEA_NM3");
 					}
-				} else
-					assert(0 && "Custom frontend options is borked");
-
-				break;
-#endif
-			}
+					break;
+				}
 
-			float nextItemY = headerHeight + nextYToUse;
-			float bitAboveNextItemY = nextItemY - 2.0f;
-			int nextYToCheck = bitAboveNextItemY;
-			
-			if (!foundTheHoveringItem) {
-				for (int rowToCheck = aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL; rowToCheck < NUM_MENUROWS; ++rowToCheck) {
-					if(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_NOTHING)
-						break;
+				// Highlight trapezoid
+				if (drawCurrScreen && i == m_nCurrOption && itemsAreSelectable && section == 0) {
 
-					int extraOffset = 0;
-					if (aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_RADIO)
-						extraOffset = MENURADIO_ICON_SCALE;
+					int leftXMax, rightXMin;
+					CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+					wchar *curOptionName = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName);
+					float curOptionWidth = CFont::GetStringWidth(curOptionName, true);
 
-					// There were many unused codes in here to calculate how much space will texts gonna take.
+					if (CFont::Details.centre) {
+						leftXMax = Max(0, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X - curOptionWidth / 2.f);
+						rightXMin = Min(SCREEN_WIDTH, curOptionWidth / 2.f + aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X);
+					} else if (!CFont::Details.rightJustify) {
+						leftXMax = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X;
+						rightXMin = Min(SCREEN_WIDTH, curOptionWidth + aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X);
+					} else {
+						leftXMax = Max(0, aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X - curOptionWidth);
+						rightXMin = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_X;
+					}
+					CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+
+					int action = aScreens[m_nCurrScreen].m_aEntries[i].m_Action;
+					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot;
+					if (rightText || action == MENUACTION_DRAWDIST || action == MENUACTION_BRIGHTNESS || action == MENUACTION_MUSICVOLUME ||
+						action == MENUACTION_SFXVOLUME || action == MENUACTION_MP3VOLUMEBOOST || action == MENUACTION_MOUSESENS ||
+						saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8) {
+						rightXMin = 600;
+						leftXMax = 40;
+					}
 
-					// FIX: nextYToCheck already starts with Y - 2, let's sync it with green bar bounds.
-#ifdef FIX_BUGS
-					if (m_nMousePosY > MENU_Y(nextYToCheck) &&
-#else
-					if (m_nMousePosY > MENU_Y(nextYToCheck - 2) &&
-#endif
-						m_nMousePosY < MENU_Y((nextYToCheck + 2) + usableLineHeight)) {
+					int y = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Y;
+					int topYMax = y;
+					uint32 bottomYMin = y + 22;
+					int transition = m_nOptionHighlightTransitionBlend;
 
-						static int oldOption = -99;
-						static int oldScreen = m_nCurrScreen;
+					// Actually bottomRight and bottomLeft should be exchanged here(although this is original code).
+					// So this shows us either R* didn't use same struct for menu BG and highlight, or they just kept fields as x1,y1 etc. Yikes.
 
-						m_nPrevOption = rowToCheck;
-						if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
-							m_nCurrOption = rowToCheck;
-							m_bShowMouse = true;
+					if (transition == 0) {
+						if (m_menuTransitionProgress == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
 						}
-						if (oldOption != m_nCurrOption) {
-							if (oldScreen == m_nCurrScreen && m_bShowMouse)
-								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
-
-							oldOption = m_nCurrOption;
-							oldScreen = m_nCurrScreen;
+						menuOptionHighlight.SaveCurrentCoors();
+						menuOptionHighlight.topLeft_x = leftXMax - 5 - CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.topLeft_y = topYMax - CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.topRight_x = rightXMin + 5 + CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.topRight_y = topYMax - CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.bottomLeft_x = rightXMin + 5 + CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.bottomLeft_y = bottomYMin + CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.bottomRight_x = leftXMax - 5 - CGeneral::GetRandomNumber() % 10;
+						menuOptionHighlight.bottomRight_y = bottomYMin + CGeneral::GetRandomNumber() % 7;
+						menuOptionHighlight.UpdateMultipliers();
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+					} else if (transition < 255) {
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+						if (m_menuTransitionProgress == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
+						}
+					} else {
+						m_nOptionHighlightTransitionBlend = 255;
+						menuOptionHighlight.Translate(m_nOptionHighlightTransitionBlend);
+						if (m_menuTransitionProgress == 255 && m_nMenuFadeAlpha == 255 && !bMenuChangeOngoing) {
+							CSprite2d::Draw2DPolygon(MENU_X_LEFT_ALIGNED(menuOptionHighlight.topLeft_x), MENU_Y(menuOptionHighlight.topLeft_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.topRight_x), MENU_Y(menuOptionHighlight.topRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomRight_x), MENU_Y(menuOptionHighlight.bottomRight_y),
+								MENU_X_LEFT_ALIGNED(menuOptionHighlight.bottomLeft_x), MENU_Y(menuOptionHighlight.bottomLeft_y), SELECTIONBORDER_COLOR);
 						}
-						if (oldScreen == m_nPrevScreen)
-							oldScreen = m_nCurrScreen;
-
-						m_nHoverOption = HOVEROPTION_RANDOM_ITEM;
-						foundTheHoveringItem = true;
-						break;
 					}
-					m_nHoverOption = HOVEROPTION_NOT_HOVERING;
-					nextYToCheck += extraOffset + lineHeight;
-				}
-			}
 
-			// Green bar behind selected option
-#ifdef PS2_SAVE_DIALOG
-			if (!m_bRenderGameInMenu)
+					static PauseModeTime lastBlendChange = 0;
+					if (m_nOptionHighlightTransitionBlend <= 255) {
+						static uint32 blendChangeCounter = 0;
+						if (CTimer::GetTimeInMillisecondsPauseMode() - lastBlendChange > 20
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND // Dirty dirty hack
+							|| blendChangeCounter > 20
 #endif
-			if (i == m_nCurrOption && itemsAreSelectable) {
-				// We keep stretching, because we also stretch background image and we want that bar to be aligned with borders of background
-				CSprite2d::DrawRect(CRect(StretchX(10.0f), MENU_Y(bitAboveNextItemY),
-											SCREEN_STRETCH_FROM_RIGHT(11.0f), MENU_Y(usableLineHeight + nextItemY)),
-											CRGBA(100, 200, 50, FadeIn(50)));
-			}
+							) {
+							m_nOptionHighlightTransitionBlend += 50;
+							lastBlendChange = CTimer::GetTimeInMillisecondsPauseMode();
+							blendChangeCounter = 0;
+						}
+						++blendChangeCounter;
+					}
+				}
 
-			CFont::SetColor(CRGBA(0, 0, 0, FadeIn(90)));
+				if (section != 0) {
 
-			// Button and it's shadow
-			for(int textLayer = 0; textLayer < 2; textLayer++) {
-				if (!CFont::Details.centre)
-					CFont::SetRightJustifyOff();
+					if (leftText) {
+						CFont::PrintString(MENU_X_LEFT_ALIGNED(aScreens[m_nCurrScreen].m_aEntries[i].m_X), MENU_Y(aScreens[m_nCurrScreen].m_aEntries[i].m_Y), leftText);
+					}
 
-				float itemY = MENU_Y(textLayer + nextItemY);
-				float itemX = MENU_X_LEFT_ALIGNED(textLayer + columnWidth);
-				CFont::PrintString(itemX, itemY, leftText);
-				if (rightText) {
-					if (!CFont::Details.centre)
+					if (rightText) {
+						CFont::SetCentreOff();
 						CFont::SetRightJustifyOn();
-					
-					if(textLayer == 1)
-						if(!strcmp(aScreens[m_nCurrScreen].m_aEntries[i].m_EntryName, "FED_RES") 
-							&& !m_bGameNotLoaded
-#ifdef CUSTOM_FRONTEND_OPTIONS
-							|| isOptionDisabled
-#endif
-							)
-							CFont::SetColor(CRGBA(155, 117, 6, FadeIn(255)));
+						if (aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot >= SAVESLOT_1 && aScreens[m_nCurrScreen].m_aEntries[i].m_SaveSlot <= SAVESLOT_8) {
+							CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
+							CFont::SetScale(MENU_X(MEDIUMTEXT_X_SCALE), MENU_Y(MEDIUMTEXT_Y_SCALE));
+						} else {
+							CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
+							CFont::SetScale(MENU_X(BIGTEXT_X_SCALE), MENU_Y(BIGTEXT_Y_SCALE));
+						}
+						CFont::PrintString(MENU_X_LEFT_ALIGNED(600.0f), MENU_Y(aScreens[m_nCurrScreen].m_aEntries[i].m_Y), rightText);
+					}
 
-					CFont::PrintString(MENU_X_RIGHT_ALIGNED(columnWidth - textLayer), itemY, rightText);
-				}
-				if (i == m_nCurrOption && itemsAreSelectable){
-					CFont::SetColor(CRGBA(255, 217, 106, FadeIn(255)));
-				} else {
-					CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
-				}
-			}
+					if (m_nPrefsAudio3DProviderIndex == DMAudio.GetCurrent3DProviderIndex()) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") && m_nHelperTextMsgId == 1)
+							ResetHelperText();
+					}
+					if (m_nDisplayVideoMode == m_nPrefsVideoMode) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") && m_nHelperTextMsgId == 1)
+							ResetHelperText();
+					}
+					if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH"))
+							SetHelperText(1);
+					}
+					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+						if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES"))
+							SetHelperText(1);
+					}
+					if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
+						if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") != 0
+							&& m_nCurrScreen == MENUPAGE_SOUND_SETTINGS && m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER) {
 
-			if (m_nPrefsAudio3DProviderIndex == DMAudio.GetCurrent3DProviderIndex()) {
-				if(!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") && m_nHelperTextMsgId == 1)
-					ResetHelperText();
-			}
-			if (m_nDisplayVideoMode == m_nPrefsVideoMode) {
-				if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") && m_nHelperTextMsgId == 1)
-					ResetHelperText();
-			}
-			if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
-				if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH"))
-					SetHelperText(1);
-			}
-			if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
-				if (!strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES"))
-					SetHelperText(1);
-			}
-			if (m_nPrefsAudio3DProviderIndex != DMAudio.GetCurrent3DProviderIndex()) {
-				if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEA_3DH") != 0
-					&& m_nCurrScreen == MENUPAGE_SOUND_SETTINGS && m_nPrefsAudio3DProviderIndex != -1) {
+							m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
+							SetHelperText(3);
+						}
+					}
+					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+						if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") != 0
+							&& m_nCurrScreen == MENUPAGE_GRAPHICS_SETTINGS) {
+							m_nDisplayVideoMode = m_nPrefsVideoMode;
+							SetHelperText(3);
+						}
+					}
+#ifdef IMPROVED_VIDEOMODE
+					if (m_nSelectedScreenMode != m_nPrefsWindowed) {
+						if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_POS") != 0
+							&& m_nCurrScreen == MENUPAGE_GRAPHICS_SETTINGS) {
+							m_nSelectedScreenMode = m_nPrefsWindowed;
+						}
+					}
+#endif
 
-					m_nPrefsAudio3DProviderIndex = DMAudio.GetCurrent3DProviderIndex();
-					SetHelperText(3);
-				}
-			}
-			if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
-				if (strcmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FED_RES") != 0
-					&& m_nCurrScreen == MENUPAGE_GRAPHICS_SETTINGS) {
-					m_nDisplayVideoMode = m_nPrefsVideoMode;
-					SetHelperText(3);
-				}
-			}
+					// TODO(Miami): check
+					// Sliders
+					int lastActiveBarX;
+					switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
+					case MENUACTION_BRIGHTNESS:
+						ProcessSlider(m_PrefsBrightness / 384.0f, 70.0f, HOVEROPTION_INCREASE_BRIGHTNESS, HOVEROPTION_DECREASE_BRIGHTNESS, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
+						break;
+					case MENUACTION_DRAWDIST:
+						ProcessSlider((m_PrefsLOD - 0.925f) / 0.875f, 99.0f, HOVEROPTION_INCREASE_DRAWDIST, HOVEROPTION_DECREASE_DRAWDIST, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
+						break;
+					case MENUACTION_MUSICVOLUME:
+						if(m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER)
+							ProcessSlider(m_PrefsMusicVolume / 64.0f, 70.0f, HOVEROPTION_INCREASE_MUSICVOLUME, HOVEROPTION_DECREASE_MUSICVOLUME, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
+						break;
+					case MENUACTION_SFXVOLUME:
+						if (m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER)
+							ProcessSlider(m_PrefsSfxVolume / 64.0f, 99.0f, HOVEROPTION_INCREASE_SFXVOLUME, HOVEROPTION_DECREASE_SFXVOLUME, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
+						break;
+					case MENUACTION_MOUSESENS:
+						ProcessSlider(TheCamera.m_fMouseAccelHorzntl * 200.0f, 170.0f, HOVEROPTION_INCREASE_MOUSESENS, HOVEROPTION_DECREASE_MOUSESENS, MENU_X_LEFT_ALIGNED(200.0f), SCREEN_WIDTH);
+						break;
+					}
 
-#ifdef CUSTOM_FRONTEND_OPTIONS
-			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_TRIGGERFUNC) {
-				FrontendOption &option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu];
-				if (option.onlyApplyOnEnter && m_nCurrOption != i)
-					option.displayedValue = *option.value;
+					nextYToUse = MENU_Y(150.f); // TODO(Miami): Temp
 
-				if (m_nCurrOption != lastOption && lastOption == i) {
-					FrontendOption &oldOption = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[lastOption].m_TargetMenu];
-					if (oldOption.type == FEOPTION_DYNAMIC)
-						oldOption.buttonPressFunc(FEOPTION_ACTION_FOCUSLOSS);
-				}
-			}
-#endif
+					nextYToUse += MENU_DEFAULT_LINE_HEIGHT * CFont::GetNumberLines(MENU_X_LEFT_ALIGNED(60.0f), MENU_Y(nextYToUse), leftText);
 
-			// Sliders
-			int lastActiveBarX;
-			switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
-				case MENUACTION_BRIGHTNESS:
-					ProcessSlider(m_PrefsBrightness / 512.0f, HOVEROPTION_INCREASE_BRIGHTNESS, HOVEROPTION_DECREASE_BRIGHTNESS, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
-					break;
-				case MENUACTION_DRAWDIST:
-					ProcessSlider((m_PrefsLOD - 0.8f) * 1.0f, HOVEROPTION_INCREASE_DRAWDIST, HOVEROPTION_DECREASE_DRAWDIST, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
-					break;
-				case MENUACTION_MUSICVOLUME:
-					ProcessSlider(m_PrefsMusicVolume / 128.0f, HOVEROPTION_INCREASE_MUSICVOLUME, HOVEROPTION_DECREASE_MUSICVOLUME, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
-					break;
-				case MENUACTION_SFXVOLUME:
-					ProcessSlider(m_PrefsSfxVolume / 128.0f, HOVEROPTION_INCREASE_SFXVOLUME, HOVEROPTION_DECREASE_SFXVOLUME, MENU_X_LEFT_ALIGNED(170.0f), SCREEN_WIDTH);
-					break;
-				case MENUACTION_MOUSESENS:
-					ProcessSlider(TheCamera.m_fMouseAccelHorzntl * 200.0f, HOVEROPTION_INCREASE_MOUSESENS, HOVEROPTION_DECREASE_MOUSESENS, MENU_X_LEFT_ALIGNED(200.0f), SCREEN_WIDTH);
-					break;
-			}
+					// TODO(Miami): Remove here after audio page is done
+					// Radio icons
+					if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_RADIO) {
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_WILDSTYLE], MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(nextYToUse), 0, HOVEROPTION_RADIO_0);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_FLASH], MENU_X_LEFT_ALIGNED(90.0f), MENU_Y(nextYToUse), 1, HOVEROPTION_RADIO_1);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_KCHAT], MENU_X_LEFT_ALIGNED(150.0f), MENU_Y(nextYToUse), 2, HOVEROPTION_RADIO_2);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_FEVER], MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(nextYToUse), 3, HOVEROPTION_RADIO_3);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_VROCK], MENU_X_LEFT_ALIGNED(270.0f), MENU_Y(nextYToUse), 4, HOVEROPTION_RADIO_4);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_VCPR], MENU_X_LEFT_ALIGNED(320.0f), MENU_Y(nextYToUse), 5, HOVEROPTION_RADIO_5);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_ESPANTOSO], MENU_X_LEFT_ALIGNED(360.0f), MENU_Y(nextYToUse), 6, HOVEROPTION_RADIO_6);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_EMOTION], MENU_X_LEFT_ALIGNED(420.0f), MENU_Y(nextYToUse), 7, HOVEROPTION_RADIO_7);
+						ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_WAVE], MENU_X_LEFT_ALIGNED(480.0f), MENU_Y(nextYToUse), 8, HOVEROPTION_RADIO_8);
 
-			// 60.0 is silly
-			nextYToUse += lineHeight * CFont::GetNumberLines(MENU_X_LEFT_ALIGNED(60.0f), MENU_Y(nextYToUse), leftText);
-
-			// Radio icons
-			if (aScreens[m_nCurrScreen].m_aEntries[i].m_Action == MENUACTION_RADIO) {
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO1], MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(nextYToUse), 0, HOVEROPTION_RADIO_0);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO2], MENU_X_LEFT_ALIGNED(90.0f), MENU_Y(nextYToUse), 1, HOVEROPTION_RADIO_1);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO5], MENU_X_LEFT_ALIGNED(150.0f), MENU_Y(nextYToUse), 2, HOVEROPTION_RADIO_2);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO7], MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(nextYToUse), 3, HOVEROPTION_RADIO_3);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO8], MENU_X_LEFT_ALIGNED(270.0f), MENU_Y(nextYToUse), 4, HOVEROPTION_RADIO_4);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO3], MENU_X_LEFT_ALIGNED(320.0f), MENU_Y(nextYToUse), 5, HOVEROPTION_RADIO_5);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO4], MENU_X_LEFT_ALIGNED(360.0f), MENU_Y(nextYToUse), 6, HOVEROPTION_RADIO_6);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO6], MENU_X_LEFT_ALIGNED(420.0f), MENU_Y(nextYToUse), 7, HOVEROPTION_RADIO_7);
-				ProcessRadioIcon(m_aFrontEndSprites[FE_RADIO9], MENU_X_LEFT_ALIGNED(480.0f), MENU_Y(nextYToUse), 8, HOVEROPTION_RADIO_8);
-
-				if (DMAudio.IsMP3RadioChannelAvailable())
-					ProcessRadioIcon(m_aMenuSprites[MENUSPRITE_MP3LOGO], MENU_X_LEFT_ALIGNED(540.0f), MENU_Y(nextYToUse), 9, HOVEROPTION_RADIO_9);
-
-				nextYToUse += 70.0f;
+						if (DMAudio.IsMP3RadioChannelAvailable())
+							ProcessRadioIcon(m_aFrontEndSprites[MENUSPRITE_MP3], MENU_X_LEFT_ALIGNED(540.0f), MENU_Y(nextYToUse), 9, HOVEROPTION_RADIO_9);
+
+						nextYToUse += 70.0f;
+					}
+				}
 			}
 		}
+		section++;
 	}
 
-#ifdef CUSTOM_FRONTEND_OPTIONS
-	lastOption = m_nCurrOption;
-#endif
-
+	// TODO(Miami)
+	/*
 	switch (m_nCurrScreen) {
-	case MENUPAGE_CONTROLLER_SETTINGS:
-	case MENUPAGE_SOUND_SETTINGS:
-	case MENUPAGE_GRAPHICS_SETTINGS:
-	case MENUPAGE_SKIN_SELECT:
-	case MENUPAGE_CONTROLLER_PC:
-	case MENUPAGE_MOUSE_CONTROLS:
-		DisplayHelperText();
-		break;
+		case MENUPAGE_STATS:
+		case MENUPAGE_CONTROLLER_PC:
+		case MENUPAGE_SOUND_SETTINGS:
+		case MENUPAGE_GRAPHICS_SETTINGS:
+		case MENUPAGE_MOUSE_CONTROLS:
+			DisplayHelperText(nil);
+			break;
+		case MENUPAGE_OPTIONS:
+			if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER && aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_LOADRADIO)
+				DisplayHelperText("FEA_NAH");
+			break;
 	}
+	*/
 
-	if (m_nCurrScreen == MENUPAGE_CONTROLLER_SETTINGS)
-		PrintController();
-	else if (m_nCurrScreen == MENUPAGE_SKIN_SELECT_OLD) {
-		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(180), MENU_Y(98), MENU_X_LEFT_ALIGNED(230), MENU_Y(123)), CRGBA(255, 255, 255, FadeIn(255)));
-		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(181), MENU_Y(99), MENU_X_LEFT_ALIGNED(229), MENU_Y(122)), CRGBA(m_PrefsPlayerRed, m_PrefsPlayerGreen, m_PrefsPlayerBlue, FadeIn(255)));
+	if (m_nCurrScreen == MENUPAGE_DELETING_IN_PROGRESS) {
+		SmallMessageScreen("FEDL_WR");
+	} else if (m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS) {
+		SmallMessageScreen("FESZ_WR");
 	}
-
 }
 
 int
@@ -1434,12 +1384,14 @@ CMenuManager::GetNumOptionsCntrlConfigScreens(void)
 {
 	int number = 0;
 	switch (m_nCurrScreen) {
+#ifdef LEGACY_MENU_OPTIONS
 		case MENUPAGE_CONTROLLER_PC_OLD3:
 			number = 2;
 			break;
 		case MENUPAGE_CONTROLLER_DEBUG:
 			number = 4;
 			break;
+#endif
 		case MENUPAGE_KEYBOARD_CONTROLS:
 			switch (m_ControlMethod) {
 				case CONTROL_STANDARD:
@@ -1747,7 +1699,7 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
 						CFont::PrintString(nextX, nextY, seperator);
 						nextX += CFont::GetStringWidth(seperator, true) + bindingMargin;
 					}
-					static uint32 lastWaitingTextFlash = 0;
+					static PauseModeTime lastWaitingTextFlash = 0;
 					if (CTimer::GetTimeInMillisecondsPauseMode() - lastWaitingTextFlash > 150) {
 						showWaitingText = !showWaitingText;
 						lastWaitingTextFlash = CTimer::GetTimeInMillisecondsPauseMode();
@@ -1832,7 +1784,7 @@ CMenuManager::DrawControllerScreenExtraText(int yStart, int xStart, int lineHeig
 				CFont::PrintString(nextX, MENU_Y(yStart), TheText.Get("FEC_IBT"));
 				nextX = CFont::GetStringWidth(TheText.Get("FEC_IBT"), true) + spacing + nextX;
 			}
-			static uint32 lastStateChange = 0;
+			static PauseModeTime lastStateChange = 0;
 			if (CTimer::GetTimeInMillisecondsPauseMode() - lastStateChange > 150) {
 				waitingTextVisible = !waitingTextVisible;
 				lastStateChange = CTimer::GetTimeInMillisecondsPauseMode();
@@ -1876,18 +1828,28 @@ CMenuManager::DrawControllerSetupScreen()
 	CFont::SetJustifyOn();
 	CFont::SetRightJustifyOff();
 	CFont::SetBackGroundOnlyTextOn();
-	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
-	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH));
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_UNK_X_MARGIN));
+	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENU_UNK_WIDTH));
 
 	PREPARE_MENU_HEADER
 
 	switch (m_ControlMethod) {
 		case CONTROL_STANDARD:
-			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y),
+			CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X + 7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f),
+				TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+
+			PREPARE_MENU_HEADER
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y),
 				TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
 			break;
 		case CONTROL_CLASSIC:
-			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y),
+			CFont::SetColor(CRGBA(30, 30, 30, FadeIn(255)));
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X + 7.f), SCREEN_SCALE_Y(MENUHEADER_POS_Y + 7.f),
+				TheText.Get("FET_CTI"));
+
+			PREPARE_MENU_HEADER
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_Y(MENUHEADER_POS_Y),
 				TheText.Get("FET_CTI"));
 			break;
 		default:
@@ -1974,7 +1936,7 @@ CMenuManager::DrawControllerSetupScreen()
 			float curOptY = i * rowHeight + yStart;
 			if (m_nMousePosY > MENU_Y(curOptY) && m_nMousePosY < MENU_Y(rowHeight + curOptY)) {
 					if (m_nPrevOption != i && m_nCurrExLayer == HOVEROPTION_LIST)
-						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 					m_nPrevOption = i;
 					if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
@@ -1988,7 +1950,7 @@ CMenuManager::DrawControllerSetupScreen()
 						if (m_nMousePosX > MENU_X_LEFT_ALIGNED(0.0f) && m_nMousePosX < MENU_X_LEFT_ALIGNED(370.0f)) {
 #endif
 							if (m_nSelectedContSetupColumn != CONTSETUP_PED_COLUMN && m_nCurrExLayer == HOVEROPTION_LIST)
-								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 							m_nSelectedContSetupColumn = CONTSETUP_PED_COLUMN;
 #ifdef FIX_BUGS
@@ -1997,7 +1959,7 @@ CMenuManager::DrawControllerSetupScreen()
 						} else if (m_nMousePosX > MENU_X_LEFT_ALIGNED(370.0f) && m_nMousePosX < SCREEN_WIDTH) {
 #endif
 							if (m_nSelectedContSetupColumn != CONTSETUP_VEHICLE_COLUMN && m_nCurrExLayer == HOVEROPTION_LIST)
-								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+								DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 							m_nSelectedContSetupColumn = CONTSETUP_VEHICLE_COLUMN;
 						}
@@ -2064,6 +2026,10 @@ void
 CMenuManager::DrawFrontEnd()
 {
 	CFont::SetAlphaFade(255.0f);
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	SetFrontEndRenderStates();
+	m_NoEmptyBinding = true;
 
 #ifdef PS2_LIKE_MENU
 	if (m_nCurrScreen == MENUPAGE_NONE) {
@@ -2107,63 +2073,15 @@ CMenuManager::DrawFrontEnd()
 	if (m_nCurrOption == 0 && aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)
 		m_nCurrOption = 1;
 
-#ifdef PS2_SAVE_DIALOG
-	if(m_bRenderGameInMenu)
-		DrawFrontEndSaveZone();
-	else
-#endif
-		DrawFrontEndNormal();
-
-	PrintErrorMessage();
-}
-
-#ifdef PS2_SAVE_DIALOG
-void
-CMenuManager::DrawFrontEndSaveZone()
-{
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-
-	// Not original dimensions, have been changed to fit PC screen & PC menu layout.
-	CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(50.0f), MENU_X_RIGHT_ALIGNED(30.0f), SCREEN_SCALE_FROM_BOTTOM(50.0f)), CRGBA(0, 0, 0, 175));
-
-	m_nMenuFadeAlpha = 255;
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-	Draw();
-
-	CFont::DrawFonts();
-
-	// Draw mouse
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	if (m_bShowMouse) {
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-
-		CRect mouse(0.0f, 0.0f, MENU_X(75.0f), MENU_Y(75.0f));
-		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(85.0f), MENU_Y(78.0f));
+	if (m_menuTransitionProgress == 255 && m_nMenuFadeAlpha == 255)
+		bMenuChangeOngoing = false;
 
-		mouse.Translate(m_nMousePosX, m_nMousePosY);
-		shad.Translate(m_nMousePosX, m_nMousePosY);
-		if(field_518 == 4){
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}else{
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}
-	}
+	DrawBackground(false);
 }
-#endif
 
 #ifdef PS2_LIKE_MENU
 void
-CMenuManager::DrawFrontEndNormal()
+CMenuManager::DrawBackground()
 {
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
@@ -2280,7 +2198,7 @@ CMenuManager::DrawFrontEndNormal()
 			DrawControllerSetupScreen();
 			break;
 		default:
-			Draw();
+			DrawStandardMenus();
 			break;
 	}
 
@@ -2343,168 +2261,191 @@ CMenuManager::DrawFrontEndNormal()
 		mouse.Translate(m_nMousePosX, m_nMousePosY);
 		shad.Translate(m_nMousePosX, m_nMousePosY);
 		if(field_518 == 4){
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(shad, CRGBA(100, 100, 100, 50));
+			m_aFrontEndSprites[MENUSPRITE_MOUSET].Draw(shad, CRGBA(100, 100, 100, 50));
 			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(mouse, CRGBA(255, 255, 255, 255));
+			m_aFrontEndSprites[MENUSPRITE_MOUSET].Draw(mouse, CRGBA(255, 255, 255, 255));
 		}else{
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
+			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
 			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
+			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
 		}
 	}
 }
 #else
+
+// --MIAMI: Done except commented things
 void
-CMenuManager::DrawFrontEndNormal()
+CMenuManager::DrawBackground(bool transitionCall)
 {
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	if (!m_bSpritesLoaded)
+		return;
 
-	LoadSplash(nil);
-	
-	eMenuSprites previousSprite;
-	if (m_nMenuFadeAlpha < 255) {
-		switch (m_nPrevScreen) {
+	SetFrontEndRenderStates();
+
+	if (m_menuTransitionProgress < 255) {
+		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255));
+	}
+
+	if (m_nMenuFadeAlpha != 0) {
+
+		if (m_nMenuFadeAlpha < 255) {
+
+			menuBg.Translate(m_nMenuFadeAlpha);
+			SetFrontEndRenderStates();
+			m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, FadeIn(255)));
+			if (m_nCurrScreen == MENUPAGE_MAP)
+				PrintMap();
+
+			// Left border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), 0.0f, SCREEN_HEIGHT,
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Top border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), 
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), SCREEN_WIDTH, 0.0f, 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Bottom border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), CRGBA(0, 0, 0, 255));
+
+			// Right border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_WIDTH, 0.0f, SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), CRGBA(0, 0, 0, 255));
+		} else {
+			m_nMenuFadeAlpha = 255;
+			m_menuTransitionProgress = 255;
+			m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, FadeIn(255)));
+			if (m_nCurrScreen == MENUPAGE_MAP)
+				PrintMap();
+
+			// Left border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), 0.0f, SCREEN_HEIGHT,
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Top border
+			CSprite2d::Draw2DPolygon(SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y),
+				SCREEN_STRETCH_X(menuBg.topLeft_x), SCREEN_STRETCH_Y(menuBg.topLeft_y), SCREEN_WIDTH, 0.0f, 0.0f, 0.0f, CRGBA(0, 0, 0, 255));
+
+			// Bottom border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, 0.0f, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_STRETCH_X(menuBg.bottomLeft_x), SCREEN_STRETCH_Y(menuBg.bottomLeft_y), CRGBA(0, 0, 0, 255));
+
+			// Right border
+			CSprite2d::Draw2DPolygon(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_STRETCH_X(menuBg.bottomRight_x), SCREEN_STRETCH_Y(menuBg.bottomRight_y),
+				SCREEN_WIDTH, 0.0f, SCREEN_STRETCH_X(menuBg.topRight_x), SCREEN_STRETCH_Y(menuBg.topRight_y), CRGBA(0, 0, 0, 255));
+		}
+	} else {
+		menuBg.SaveCurrentCoors();
+		switch (m_nCurrScreen) {
 			case MENUPAGE_STATS:
-			case MENUPAGE_START_MENU:
-			case MENUPAGE_PAUSE_MENU:
-				previousSprite = MENUSPRITE_MAINMENU;
-				break;
-			case MENUPAGE_NEW_GAME:
-			case MENUPAGE_CHOOSE_LOAD_SLOT:
-			case MENUPAGE_CHOOSE_DELETE_SLOT:
-			case MENUPAGE_NEW_GAME_RELOAD:
-			case MENUPAGE_LOAD_SLOT_CONFIRM:
-			case MENUPAGE_DELETE_SLOT_CONFIRM:
-			case MENUPAGE_EXIT:
-				previousSprite = MENUSPRITE_SINGLEPLAYER;
+				menuBg.topLeft_x = 70.0f;
+				menuBg.topLeft_y = 75.0f;
+				menuBg.topRight_x = 550.0f;
+				menuBg.topRight_y = 16.0f;
+				menuBg.bottomLeft_x = 74.0f;
+				menuBg.bottomLeft_y = 354.0f;
+				menuBg.bottomRight_x = 581.0f;
+				menuBg.bottomRight_y = 340.0f;
 				break;
-			case MENUPAGE_MULTIPLAYER_MAIN:
-				previousSprite = MENUSPRITE_MULTIPLAYER;
+			case MENUPAGE_SOUND_SETTINGS:
+				menuBg.topLeft_x = 26.0f;
+				menuBg.topLeft_y = 59.0f;
+				menuBg.topRight_x = 629.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 438.0f;
+				menuBg.bottomRight_x = 610.0f;
+				menuBg.bottomRight_y = 410.0f;
 				break;
-			case MENUPAGE_MULTIPLAYER_MAP:
-			case MENUPAGE_MULTIPLAYER_FIND_GAME:
 			case MENUPAGE_SKIN_SELECT:
 			case MENUPAGE_KEYBOARD_CONTROLS:
-			case MENUPAGE_MOUSE_CONTROLS:
-				previousSprite = MENUSPRITE_FINDGAME;
-				break;
-			case MENUPAGE_MULTIPLAYER_CONNECTION:
-			case MENUPAGE_MULTIPLAYER_MODE:
-				previousSprite = MENUSPRITE_CONNECTION;
-				break;
-			case MENUPAGE_MULTIPLAYER_CREATE:
-				previousSprite = MENUSPRITE_HOSTGAME;
+				menuBg.topLeft_x = 14.0f;
+				menuBg.topLeft_y = 39.0f;
+				menuBg.topRight_x = 636.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 426.0f;
+				menuBg.bottomRight_x = 630.0f;
+				menuBg.bottomRight_y = 398.0f;
 				break;
-			case MENUPAGE_SKIN_SELECT_OLD:
-			case MENUPAGE_OPTIONS:
-				previousSprite = MENUSPRITE_PLAYERSET;
+			case MENUPAGE_BRIEFS:
+			case MENUPAGE_GRAPHICS_SETTINGS:
+			case MENUPAGE_MAP:
+			case MENUPAGE_CHOOSE_LOAD_SLOT:
+			case MENUPAGE_CHOOSE_DELETE_SLOT:
+			case MENUPAGE_CHOOSE_SAVE_SLOT:
+			case MENUPAGE_MOUSE_CONTROLS:
+				menuBg.topLeft_x = 26.0f;
+				menuBg.topLeft_y = 59.0f;
+				menuBg.topRight_x = 629.0f;
+				menuBg.topRight_y = 29.0f;
+				menuBg.bottomLeft_x = 15.0f;
+				menuBg.bottomLeft_y = 426.0f;
+				menuBg.bottomRight_x = 610.0f;
+				menuBg.bottomRight_y = 398.0f;
 				break;
 			default:
-				previousSprite = MENUSPRITE_MAINMENU;
+				menuBg.topLeft_x = CGeneral::GetRandomNumber() % 40 + 65;
+				menuBg.topLeft_y = CGeneral::GetRandomNumber() % 40 + 21;
+				menuBg.topRight_x = CGeneral::GetRandomNumber() % 40 + 568;
+				menuBg.topRight_y = CGeneral::GetRandomNumber() % 40 + 44;
+				menuBg.bottomLeft_x = CGeneral::GetRandomNumber() % 40 + 36;
+				menuBg.bottomLeft_y = CGeneral::GetRandomNumber() % 40 + 382;
+				menuBg.bottomRight_x = CGeneral::GetRandomNumber() % 40 + 593;
+				menuBg.bottomRight_y = CGeneral::GetRandomNumber() % 40 + 342;
 				break;
 		}
-		
-		if (m_nPrevScreen == m_nCurrScreen)
-			CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255 - m_nMenuFadeAlpha));
-		else
-			m_aMenuSprites[previousSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255 - m_nMenuFadeAlpha));
-	}
-
-	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
 
-	eMenuSprites currentSprite = MENUSPRITE_MAINMENU; // actually uninitialized
-	switch (m_nCurrScreen) {
-		case MENUPAGE_STATS:
-		case MENUPAGE_START_MENU:
-		case MENUPAGE_PAUSE_MENU:
-			currentSprite = MENUSPRITE_MAINMENU;
-			break;
-		case MENUPAGE_NEW_GAME:
-		case MENUPAGE_CHOOSE_LOAD_SLOT:
-		case MENUPAGE_CHOOSE_DELETE_SLOT:
-		case MENUPAGE_NEW_GAME_RELOAD:
-		case MENUPAGE_LOAD_SLOT_CONFIRM:
-		case MENUPAGE_DELETE_SLOT_CONFIRM:
-		case MENUPAGE_EXIT:
-			currentSprite = MENUSPRITE_SINGLEPLAYER;
-			break;
-		case MENUPAGE_MULTIPLAYER_MAIN:
-			currentSprite = MENUSPRITE_MULTIPLAYER;
-			break;
-		case MENUPAGE_MULTIPLAYER_MAP:
-		case MENUPAGE_MULTIPLAYER_FIND_GAME:
-		case MENUPAGE_SKIN_SELECT:
-		case MENUPAGE_KEYBOARD_CONTROLS:
-		case MENUPAGE_MOUSE_CONTROLS:
-			currentSprite = MENUSPRITE_FINDGAME;
-			break;
-		case MENUPAGE_MULTIPLAYER_CONNECTION:
-		case MENUPAGE_MULTIPLAYER_MODE:
-			currentSprite = MENUSPRITE_CONNECTION;
-			break;
-		case MENUPAGE_MULTIPLAYER_CREATE:
-			currentSprite = MENUSPRITE_HOSTGAME;
-			break;
-		case MENUPAGE_SKIN_SELECT_OLD:
-		case MENUPAGE_OPTIONS:
-			currentSprite = MENUSPRITE_PLAYERSET;
-			break;
+		menuBg.UpdateMultipliers();
+		if (m_menuTransitionProgress == 255)
+			m_nOptionHighlightTransitionBlend = 0;
 	}
 
-	if (m_nMenuFadeAlpha < 255) {
-
-		// Famous transparent menu bug
-#ifdef FIX_BUGS
-		static float fadeAlpha = 0.0f;
-		if (m_nMenuFadeAlpha == 0 && fadeAlpha > 1.0f) fadeAlpha = 0.0f;
-
-		// +20 per every 33 ms (1000.f/30.f - original frame limiter fps)
-		fadeAlpha += (frameTime) * 20.f / 33.f;
-		m_nMenuFadeAlpha = fadeAlpha;
-#else
-		static uint32 LastFade = 0;
+	static PauseModeTime LastFade = 0;
+	static uint8 forceFadeInCounter = 0;
 
-		if(CTimer::GetTimeInMillisecondsPauseMode() - LastFade > 10){
+	if (m_nMenuFadeAlpha >= 255) {
+		if (m_nMenuFadeAlpha > 255)
+			m_nMenuFadeAlpha = 255;
+	} else {
+		if (CTimer::GetTimeInMillisecondsPauseMode() - LastFade > 30
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND // Dirty dirty hack
+			|| forceFadeInCounter > 30
+#endif
+			) {
 			m_nMenuFadeAlpha += 20;
+			m_menuTransitionProgress = Min(m_menuTransitionProgress + 20, 255);
 			LastFade = CTimer::GetTimeInMillisecondsPauseMode();
 		}
-#endif
-		
-		if (m_nMenuFadeAlpha > 255){
-			m_aMenuSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-		} else {
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-			m_aMenuSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, m_nMenuFadeAlpha));
-		}
-	} else {
-		m_aMenuSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-		// TODO: what is this? waiting mouse?
-		if(field_518 == 4){
-			if(m_nHoverOption == HOVEROPTION_3 || m_nHoverOption == HOVEROPTION_4 ||
-				m_nHoverOption == HOVEROPTION_5 || m_nHoverOption == HOVEROPTION_6 || m_nHoverOption == HOVEROPTION_7)
-
-				field_518 = 2;
-			else
-				field_518 = 1;
-		}
+		forceFadeInCounter++;
 	}
 
-	// GTA LOGO
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_PAUSE_MENU) {
-		if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
-			m_aMenuSprites[MENUSPRITE_GTA3LOGO].Draw(CRect(MENU_X_LEFT_ALIGNED(205.0f), MENU_Y(70.0f), MENU_X_LEFT_ALIGNED(435.0f), MENU_Y(180.0f)), CRGBA(255, 255, 255, FadeIn(255)));
-		else
-			m_aMenuSprites[MENUSPRITE_GTALOGO].Draw(CRect(MENU_X_LEFT_ALIGNED(225.0f), MENU_Y(40.0f), MENU_X_LEFT_ALIGNED(415.0f), MENU_Y(210.0f)), CRGBA(255, 255, 255, FadeIn(255)));
+	if (!transitionCall && m_menuTransitionProgress == 255) {
+		int actualAlpha = m_nMenuFadeAlpha;
+		if (actualAlpha < 255) {
+			int actualScreen = m_nCurrScreen;
+			SetFrontEndRenderStates();
+			m_nCurrScreen = m_nPrevScreen;
+			m_nMenuFadeAlpha = 255 - m_nMenuFadeAlpha;
+			switch (m_nCurrScreen) {
+				case MENUPAGE_SKIN_SELECT:
+					CMenuManager::DrawPlayerSetupScreen();
+					break;
+				case MENUPAGE_KEYBOARD_CONTROLS:
+					CMenuManager::DrawControllerSetupScreen();
+					break;
+				case MENUPAGE_OUTRO:
+					CMenuManager::DrawQuitGameScreen();
+					break;
+				default:
+					CMenuManager::DrawStandardMenus(false);
+					break;
+			}
+			m_nCurrScreen = actualScreen;
+			m_nMenuFadeAlpha = actualAlpha;
+		}
 	}
 
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
 	switch (m_nCurrScreen) {
 		case MENUPAGE_SKIN_SELECT:
 			DrawPlayerSetupScreen();
@@ -2512,35 +2453,47 @@ CMenuManager::DrawFrontEndNormal()
 		case MENUPAGE_KEYBOARD_CONTROLS:
 			DrawControllerSetupScreen();
 			break;
+		case MENUPAGE_OUTRO:
+			CMenuManager::DrawQuitGameScreen();
+			break;
 		default:
-			Draw();
+			DrawStandardMenus(true);
 			break;
 	}
 
 	CFont::DrawFonts();
+	SetFrontEndRenderStates();
 
-	// Draw mouse
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	if (m_bShowMouse) {
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	if (m_nCurrScreen != MENUPAGE_OUTRO)
+		if (m_menuTransitionProgress == 255) {
+			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255));
+		} else {
+			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, FadeIn(255)));
+		}
 
-		CRect mouse(0.0f, 0.0f, MENU_X(75.0f), MENU_Y(75.0f));
-		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(85.0f), MENU_Y(78.0f));
+	if (m_ShowEmptyBindingError) {
+		static PauseModeTime lastBindingError = CTimer::GetTimeInMillisecondsPauseMode();
+		static bool bindingErrorShown = false;
+		if (bindingErrorShown) {
+			lastBindingError = CTimer::GetTimeInMillisecondsPauseMode();
+			bindingErrorShown = false;
+		}
+		SmallMessageScreen("FEC_ERI");
+		CFont::DrawFonts();
+		if (CTimer::GetTimeInMillisecondsPauseMode() - lastBindingError > 4000) {
+			m_ShowEmptyBindingError = false;
+			bindingErrorShown = true;
+		}
+	}
+
+	if (m_bShowMouse) {
+		CRect mouse(0.0f, 0.0f, MENU_X(40.0f), MENU_Y(40.0f));
+		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(55.0f), MENU_Y(43.0f));
 
 		mouse.Translate(m_nMousePosX, m_nMousePosY);
 		shad.Translate(m_nMousePosX, m_nMousePosY);
-		if(field_518 == 4){
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSET].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}else{
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aMenuSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
 	}
 }
 #endif
@@ -2555,8 +2508,8 @@ CMenuManager::DrawPlayerSetupScreen()
 	CFont::SetJustifyOn();
 	CFont::SetRightJustifyOff();
 	CFont::SetBackGroundOnlyTextOn();
-	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
-	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH));
+	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_UNK_X_MARGIN));
+	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENU_UNK_WIDTH));
 
 	PREPARE_MENU_HEADER
 
@@ -2701,7 +2654,7 @@ CMenuManager::DrawPlayerSetupScreen()
 								SaveSettings();
 							}
 						} else {
-							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 							m_nCurrExLayer = HOVEROPTION_LIST;
 							m_nSelectedListRow = rowIdx;
 							m_nHoverOption = HOVEROPTION_NOT_HOVERING;
@@ -2781,21 +2734,21 @@ CMenuManager::DrawPlayerSetupScreen()
 		//		2 - leaves gap between button and scrollbar
 		if (m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_UP) {
 #ifdef FIX_BUGS
-			m_aMenuSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
+			m_aFrontEndSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
 				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), MENU_Y(PLAYERSETUP_LIST_TOP + PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #else
-			m_aMenuSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
+			m_aFrontEndSprites[MENUSPRITE_UPON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), MENU_Y(PLAYERSETUP_LIST_TOP),
 				MENU_X_RIGHT_ALIGNED(-20.0f), MENU_Y(PLAYERSETUP_LIST_TOP + 58)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #endif
 		} else {
 #ifdef FIX_BUGS
-			m_aMenuSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
+			m_aFrontEndSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
 				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), MENU_Y(PLAYERSETUP_LIST_TOP + PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #else
-			m_aMenuSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
+			m_aFrontEndSprites[MENUSPRITE_UPOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), MENU_Y(PLAYERSETUP_LIST_TOP),
 				MENU_X_RIGHT_ALIGNED(-21.0f), MENU_Y(PLAYERSETUP_LIST_TOP + 58)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #endif
@@ -2803,21 +2756,21 @@ CMenuManager::DrawPlayerSetupScreen()
 
 		if (m_nHoverOption == HOVEROPTION_CLICKED_SCROLL_DOWN) {
 #ifdef FIX_BUGS
-			m_aMenuSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
+			m_aFrontEndSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
 				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #else
-			m_aMenuSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(141.0f),
+			m_aFrontEndSprites[MENUSPRITE_DOWNON].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 2), SCREEN_SCALE_FROM_BOTTOM(141.0f),
 					MENU_X_RIGHT_ALIGNED(-20.0f), SCREEN_SCALE_FROM_BOTTOM(83.0f)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #endif
 		} else {
 #ifdef FIX_BUGS
-			m_aMenuSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
+			m_aFrontEndSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1),
 				MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION), SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM + PLAYERSETUP_SCROLLBUTTON_HEIGHT + 1 - PLAYERSETUP_SCROLLBUTTON_TXD_DIMENSION)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #else
-			m_aMenuSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(141.0f),
+			m_aFrontEndSprites[MENUSPRITE_DOWNOFF].Draw(CRect(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_LIST_RIGHT - 3), SCREEN_SCALE_FROM_BOTTOM(141.0f),
 				MENU_X_RIGHT_ALIGNED(-21.0f), SCREEN_SCALE_FROM_BOTTOM(83.0f)),
 				CRGBA(255, 255, 255, FadeIn(255)));
 #endif
@@ -2857,7 +2810,7 @@ CMenuManager::DrawPlayerSetupScreen()
 			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 26))
 			|| m_nCurrExLayer == HOVEROPTION_BACK) {
 			if (m_nHoverOption != HOVEROPTION_BACK)
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 			m_nHoverOption = HOVEROPTION_BACK;
 
@@ -2868,7 +2821,7 @@ CMenuManager::DrawPlayerSetupScreen()
 			&& m_nMousePosY < SCREEN_SCALE_FROM_BOTTOM(PLAYERSETUP_LIST_BOTTOM - 26))
 			|| m_nCurrExLayer == HOVEROPTION_USESKIN) {
 			if (m_nHoverOption != HOVEROPTION_USESKIN)
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 
 			m_nHoverOption = HOVEROPTION_USESKIN;
 
@@ -2959,11 +2912,6 @@ CMenuManager::DrawPlayerSetupScreen()
 int
 CMenuManager::FadeIn(int alpha)
 {
-	if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS ||
-		m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS ||
-		m_nCurrScreen == MENUPAGE_DELETING)
-		return alpha;
-
 	return Min(m_nMenuFadeAlpha, alpha);
 }
 
@@ -3000,12 +2948,14 @@ CMenuManager::GetStartOptionsCntrlConfigScreens()
 {
 	int number = 0;
 	switch (m_nCurrScreen) {
+#ifdef LEGACY_MENU_OPTIONS
 		case MENUPAGE_CONTROLLER_PC_OLD3:
 			number = 34;
 			break;
 		case MENUPAGE_CONTROLLER_DEBUG:
 			number = 35;
 			break;
+#endif
 		case MENUPAGE_KEYBOARD_CONTROLS:
 			number = 0;
 			break;
@@ -3063,11 +3013,6 @@ CMenuManager::InitialiseChangedLanguageSettings()
 		default:
 			break;
 		}
-
-#ifdef CUSTOM_FRONTEND_OPTIONS
-		RemoveCustomFrontendOptions();
-		CustomFrontendOptionsPopulate();
-#endif
 	}
 }
 
@@ -3077,70 +3022,57 @@ CMenuManager::LoadAllTextures()
 	if (m_bSpritesLoaded)
 		return;
 
-	CentreMousePointer();
-	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
-	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
-	m_nCurrOption = 0;
-	m_PrefsRadioStation = DMAudio.GetRadioInCar();
-
-	if (DMAudio.IsMP3RadioChannelAvailable()) {
-		if (m_PrefsRadioStation > USERTRACK)
-			m_PrefsRadioStation = CGeneral::GetRandomNumber() % 10;
-	} else if (m_PrefsRadioStation > CHATTERBOX)
-		m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9;
-	
-	CFileMgr::SetDir("");
-	//CFileMgr::SetDir("");
+	field_F0 = SCREEN_STRETCH_X(178.0f); // TODO(Miami)
 	CTimer::Stop();
+
 	CStreaming::MakeSpaceFor(350 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
 	CStreaming::ImGonnaUseStreamingMemory();
 	CGame::TidyUpMemory(false, true);
 	CTxdStore::PushCurrentTxd();
-	int frontendTxdSlot = CTxdStore::FindTxdSlot("frontend");
+	int frontendTxdSlot1 = CTxdStore::FindTxdSlot("frontend1");
 
-	if(frontendTxdSlot == -1)
-		frontendTxdSlot = CTxdStore::AddTxdSlot("frontend");
+	if(frontendTxdSlot1 == -1)
+		frontendTxdSlot1 = CTxdStore::AddTxdSlot("frontend1");
 
-	printf("LOAD frontend\n");
-	CTxdStore::LoadTxd(frontendTxdSlot, "MODELS/FRONTEND.TXD");
-	CTxdStore::AddRef(frontendTxdSlot);
-	CTxdStore::SetCurrentTxd(frontendTxdSlot);
-#ifndef GTA3_1_1_PATCH
-	CStreaming::IHaveUsedStreamingMemory();
-	CTimer::Update();
-#endif
+	printf("LOAD frontend1\n");
+	CTxdStore::LoadTxd(frontendTxdSlot1, "MODELS/FRONTEN1.TXD");
+	CTxdStore::AddRef(frontendTxdSlot1);
+	CTxdStore::SetCurrentTxd(frontendTxdSlot1);
 
-	for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); i++) {
+	for (int i = 0; i < 3; i++) {
 		m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
 		m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
 	}
 
-	int menuTxdSlot = CTxdStore::FindTxdSlot("menu");
+	CTxdStore::PopCurrentTxd();
+	CStreaming::IHaveUsedStreamingMemory();
 
-	if (menuTxdSlot == -1)
-		menuTxdSlot = CTxdStore::AddTxdSlot("menu");
+	if (!m_OnlySaveMenu) {
+		CStreaming::MakeSpaceFor(692 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
+		CStreaming::ImGonnaUseStreamingMemory();
+		CTxdStore::PushCurrentTxd();
 
-	printf("LOAD sprite\n");
-	CTxdStore::LoadTxd(menuTxdSlot, "MODELS/MENU.TXD");
-	CTxdStore::AddRef(menuTxdSlot);
-	CTxdStore::SetCurrentTxd(menuTxdSlot);
+		int frontendTxdSlot2 = CTxdStore::FindTxdSlot("frontend2");
 
-	for (int i = 0; i < ARRAY_SIZE(MenuFilenames); i++) {
-		m_aMenuSprites[i].SetTexture(MenuFilenames[i][0], MenuFilenames[i][1]);
-		m_aMenuSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
-	}
-#ifdef MENU_MAP
-	for (int i = 0; i < ARRAY_SIZE(MapFilenames); i++) {
-		m_aMapSprites[i].SetTexture(MapFilenames[i][0], MapFilenames[i][1]);
-		m_aMapSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+		if (frontendTxdSlot2 == -1)
+			frontendTxdSlot2 = CTxdStore::AddTxdSlot("frontend2");
+
+		printf("LOAD frontend2\n");
+		CTxdStore::LoadTxd(frontendTxdSlot2, "MODELS/FRONTEN2.TXD");
+		CTxdStore::AddRef(frontendTxdSlot2);
+		CTxdStore::SetCurrentTxd(frontendTxdSlot2);
+
+		for (int i = 3; i < NUM_MENU_SPRITES; i++) {
+			m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+			m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+		}
+
+		CTxdStore::PopCurrentTxd();
+		CStreaming::IHaveUsedStreamingMemory();
 	}
-#endif
-#ifdef GTA3_1_1_PATCH
-	CStreaming::IHaveUsedStreamingMemory();
-	CTimer::Update();
-#endif
+
 	m_bSpritesLoaded = true;
-	CTxdStore::PopCurrentTxd();
+	CTimer::Update();
 }
 
 void
@@ -3225,9 +3157,11 @@ CMenuManager::LoadSettings()
 	m_PrefsVsync = m_PrefsVsyncDisp;
 	CRenderer::ms_lodDistScale = m_PrefsLOD;
 
-	if (m_nPrefsAudio3DProviderIndex == -1)
+	if (m_nPrefsAudio3DProviderIndex == INVALID_AUDIO_PROVIDER)
 		m_nPrefsAudio3DProviderIndex = -2;
 
+	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
+
 	if (m_PrefsLanguage == prevLang)
 		m_bLanguageLoaded = false;
 	else {
@@ -3310,16 +3244,14 @@ CMenuManager::SaveSettings()
 		CFileMgr::Write(fileHandle, (char*)&TheCamera.bFreeCam, 1);
 #endif
 	}
+	m_lastWorking3DAudioProvider = m_nPrefsAudio3DProviderIndex;
 
 	CFileMgr::CloseFile(fileHandle);
 	CFileMgr::SetDir("");
 }
 
-bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
-void DoRWStuffEndOfFrame(void);
-
 void
-CMenuManager::MessageScreen(const char *text)
+CMenuManager::MessageScreen(const char *text, bool blackBg)
 {
 	CSprite2d *splash = LoadSplash(nil);
 	if (!DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255))
@@ -3329,41 +3261,32 @@ CMenuManager::MessageScreen(const char *text)
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
 	DefinedState();
+	// CRGBA unused(255, 255, 255, 255);
+	if (blackBg) {
+		CSprite2d::DrawRect(CRect(0, SCREEN_HEIGHT, SCREEN_WIDTH, 0), CRGBA(0, 0, 0, 255));
+	}
 
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	splash->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
+	m_nMenuFadeAlpha = 255;
+	SmallMessageScreen(text);
+	CFont::DrawFonts();
+	DoRWStuffEndOfFrame();
+}
 
+// TODO(Miami)
+void
+CMenuManager::SmallMessageScreen(const char* text)
+{
 	CFont::SetBackgroundOff();
 	CFont::SetPropOn();
 	CFont::SetJustifyOn();
 	CFont::SetBackGroundOnlyTextOn();
-	CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(170.0f));
-	CFont::SetRightJustifyWrap(SCREEN_SCALE_FROM_RIGHT(170.0f));
-	CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(120.0f), SCREEN_SCALE_Y(150.0f), SCREEN_SCALE_FROM_RIGHT(120.0f), SCREEN_SCALE_FROM_BOTTOM(220.0f)), CRGBA(50, 50, 50, 210));
+	CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(95.0f), SCREEN_SCALE_FROM_BOTTOM(165.0f), SCREEN_SCALE_FROM_RIGHT(95.0f), SCREEN_SCALE_Y(115.0f)), CRGBA(50, 50, 50, FadeIn(210)));
 	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-	CFont::SetCentreSize(SCREEN_SCALE_X(380.0f));
+	CFont::SetCentreSize(SCREEN_SCALE_X(430.0f));
 	CFont::SetCentreOn();
-	CFont::SetColor(CRGBA(255, 217, 106, 255));
+	CFont::SetColor(CRGBA(255, 217, 106, FadeIn(255)));
 	CFont::SetScale(SCREEN_SCALE_X(SMALLTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLTEXT_Y_SCALE));
 	CFont::PrintString(SCREEN_SCALE_X(320.0f), SCREEN_SCALE_Y(170.0f), TheText.Get(text));
-	CFont::DrawFonts();
-	DoRWStuffEndOfFrame();
-}
-
-void
-CMenuManager::PickNewPlayerColour()
-{
-	m_PrefsPlayerRed = 0;
-	m_PrefsPlayerGreen = 0;
-	m_PrefsPlayerBlue = 0;
-	while (true) {
-		int sum = m_PrefsPlayerRed + m_PrefsPlayerGreen + m_PrefsPlayerBlue;
-		if (sum >= 100 && sum <= 650)
-			break;
-		m_PrefsPlayerRed = CGeneral::GetRandomNumber();
-		m_PrefsPlayerGreen = CGeneral::GetRandomNumber();
-		m_PrefsPlayerBlue = CGeneral::GetRandomNumber();
-	}
 }
 
 void
@@ -3417,30 +3340,6 @@ CMenuManager::PrintBriefs()
 #endif
 }
 
-// Not sure about name. Not to be confused with CPad::PrintErrorMessage
-void
-CMenuManager::PrintErrorMessage()
-{
-	if (!CPad::bDisplayNoControllerMessage && !CPad::bObsoleteControllerMessage)
-		return;
-
-	CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(140.0f), SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f)), CRGBA(64, 16, 16, 224));
-	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-	CFont::SetBackgroundOff();
-	CFont::SetPropOn();
-	CFont::SetCentreOff();
-	CFont::SetJustifyOn();
-	CFont::SetRightJustifyOff();
-	CFont::SetBackGroundOnlyTextOn();
-	CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(40.0f));
-#ifdef FIX_BUGS
-	CFont::PrintString(SCREEN_SCALE_X(50.0f), SCREEN_SCALE_Y(180.0f), TheText.Get(CPad::bDisplayNoControllerMessage ? "NOCONT" : "WRCONT"));
-#else
-	CFont::PrintString(SCREEN_SCALE_X(50.0f), SCREEN_SCALE_Y(40.0f), TheText.Get(CPad::bDisplayNoControllerMessage ? "NOCONT" : "WRCONT"));
-#endif
-	CFont::DrawFonts();
-}
-
 void
 CMenuManager::PrintStats()
 {
@@ -3454,7 +3353,7 @@ CMenuManager::PrintStats()
 	// Scroll stats with mouse
 #ifdef SCROLLABLE_STATS_PAGE
 	static float scrollY = 0;
-	static uint32 lastChange = m_nScreenChangeDelayTimer;
+	static PauseModeTime lastChange = m_LastScreenSwitch;
 	if (CPad::GetPad(0)->GetLeftMouse()) {
 		scrollY += (m_nMouseOldPosY - m_nMousePosY);
 		lastChange = CTimer::GetTimeInMillisecondsPauseMode();
@@ -3464,7 +3363,7 @@ CMenuManager::PrintStats()
 	}
 #else
 	// MENU_Y(30.0f) per second
-	float scrollY = MENU_Y(STATS_SLIDE_Y_PER_SECOND) * (CTimer::GetTimeInMillisecondsPauseMode() - m_nScreenChangeDelayTimer) / 1000.0f;
+	float scrollY = MENU_Y(STATS_SLIDE_Y_PER_SECOND) * (CTimer::GetTimeInMillisecondsPauseMode() - m_LastScreenSwitch) / 1000.0f;
 #endif
 
 	for (int row = 0; row < rowNum; ++row) {
@@ -3527,177 +3426,95 @@ CMenuManager::PrintStats()
 	// ::Draw already does that.
 	/*
 	PREPARE_MENU_HEADER
-	CFont::PrintString(MENU_X_RIGHT_ALIGNED(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
 	*/
 	CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X), MENU_Y(MENU_TEXT_SIZE_Y));
 }
 
+// --MIAMI: Done
 void
 CMenuManager::Process(void)
 {
-	m_bMenuStateChanged = false;
-
-	if (!m_bSaveMenuActive && TheCamera.GetScreenFadeStatus() != FADE_0)
+	if (TheCamera.GetScreenFadeStatus() != FADE_0)
 		return;
 
-	m_bWantToRestart = false;
 	InitialiseChangedLanguageSettings();
 
-	// Just a hack by R* to not make game continuously resume/pause. But we it seems we can live with it.
-	if (CPad::GetPad(0)->GetEscapeJustDown())
-		RequestFrontEndStartUp();
-
-	SwitchMenuOnAndOff();
-
-	// Be able to re-open menu correctly.
 	if (m_bMenuActive) {
+		ProcessButtonPresses();
+		ProcessFileActions();
+		DMAudio.Service();
 
-		// Load frontend textures.
-		LoadAllTextures();
+		// Game calls some texture pool cleanup functions in here
+	}
 
-		// Set save/delete game pages.
-		if (m_nCurrScreen == MENUPAGE_DELETING) {
-			bool SlotPopulated = false;
+	SwitchMenuOnAndOff();
+}
 
-			if (PcSaveHelper.DeleteSlot(m_nCurrSaveSlot)) {
-				PcSaveHelper.PopulateSlotInfo();
-				SlotPopulated = true;
-			}
+// TODO(Miami)
+void
+CMenuManager::ProcessButtonPresses(void)
+{
+	if (m_nCurrScreen == MENUPAGE_OUTRO)
+		return;
 
-			if (SlotPopulated) 
-				ChangeScreen(MENUPAGE_DELETE_SUCCESS, 0, true, false);
-			else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
-		if (m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS) {
-			int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
-			PcSaveHelper.PopulateSlotInfo();
-			if (SaveSlot)
-				ChangeScreen(MENUPAGE_SAVE_SUCCESSFUL, 0, true, false);
-			else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
-		if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS) {
-#ifdef MISSION_REPLAY
-			if (doingMissionRetry) {
-				RetryMission(2, 0);
-				m_nCurrSaveSlot = SLOT_COUNT;
-				doingMissionRetry = false;
+	if (m_bWaitingForNewKeyBind) {
+		if (m_bStartWaitingForKeyBind)
+			m_bStartWaitingForKeyBind = false;
+		else {
+			pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
+			JoyButtonJustClicked = false;
+			MouseButtonJustClicked = false;
+
+			if (CPad::GetPad(0)->GetLeftMouseJustDown())
+				MouseButtonJustClicked = 1;
+			else if (CPad::GetPad(0)->GetRightMouseJustUp())
+				MouseButtonJustClicked = 3;
+			else if (CPad::GetPad(0)->GetMiddleMouseJustUp())
+				MouseButtonJustClicked = 2;
+			else if (CPad::GetPad(0)->GetMouseWheelUpJustUp())
+				MouseButtonJustClicked = 4;
+			else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
+				MouseButtonJustClicked = 5;
+			// TODO two more buttons
+
+			JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
+
+			int32 TypeOfControl = KEYBOARD;
+			if (JoyButtonJustClicked)
+				TypeOfControl = JOYSTICK;
+			if (MouseButtonJustClicked)
+				TypeOfControl = MOUSE;
+			if (*pControlEdit != rsNULL)
+				TypeOfControl = KEYBOARD;
+
+			if (!m_bKeyIsOK) {
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+				pControlEdit = nil;
+				m_bWaitingForNewKeyBind = false;
+				m_KeyPressedCode = -1;
+				m_bStartWaitingForKeyBind = false;
 			}
-#endif
-			if (CheckSlotDataValid(m_nCurrSaveSlot)) {
-#ifdef USE_DEBUG_SCRIPT_LOADER
-				scriptToLoad = 0;
-#endif
-				TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
-				if (m_PrefsVsyncDisp != m_PrefsVsync)
-					m_PrefsVsync = m_PrefsVsyncDisp;
-				DMAudio.Service();
-				m_bWantToRestart = true;
-				RequestFrontEndShutDown();
-				m_bWantToLoad = true;
-				b_FoundRecentSavedGameWantToLoad = true;
-				DMAudio.SetEffectsFadeVol(0);
-				DMAudio.SetMusicFadeVol(0);
-				DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
-			} else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
+			else if (!m_bKeyChangeNotProcessed) {
+				if (*pControlEdit != rsNULL || MouseButtonJustClicked || JoyButtonJustClicked)
+					CheckCodesForControls(TypeOfControl);
 
-		ProcessButtonPresses();
-
-		// Set binding keys.
-		if (pEditString && CPad::EditString(pEditString, 0) == nil) {
-			if (*pEditString == 0)
-				strcpy(pEditString, "NoName");
-			pEditString = nil;
-			SaveSettings();
-		}
-
-		if (m_bWaitingForNewKeyBind) {
-			if (m_bStartWaitingForKeyBind)
-				m_bStartWaitingForKeyBind = false;
+				field_159 = true;
+			}
 			else {
-				pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
-				JoyButtonJustClicked = false;
-				MouseButtonJustClicked = false;
-
-				if (CPad::GetPad(0)->GetLeftMouseJustDown())
-					MouseButtonJustClicked = 1;
-				else if (CPad::GetPad(0)->GetRightMouseJustUp())
-					MouseButtonJustClicked = 3;
-				else if (CPad::GetPad(0)->GetMiddleMouseJustUp())
-					MouseButtonJustClicked = 2;
-				else if (CPad::GetPad(0)->GetMouseWheelUpJustUp())
-					MouseButtonJustClicked = 4;
-				else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
-					MouseButtonJustClicked = 5;
-				// TODO two more buttons
-
-				JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
-
-				int32 TypeOfControl = KEYBOARD;
-				if (JoyButtonJustClicked)
-					TypeOfControl = JOYSTICK;
-				if (MouseButtonJustClicked)
-					TypeOfControl = MOUSE;
-				if (*pControlEdit != rsNULL)
-					TypeOfControl = KEYBOARD;
-
-				if (!m_bKeyIsOK) {
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
-					pControlEdit = nil;
-					m_bWaitingForNewKeyBind = false;
-					m_KeyPressedCode = -1;
-					m_bStartWaitingForKeyBind = false;
-				} else if (!m_bKeyChangeNotProcessed) {
-					if (*pControlEdit != rsNULL || MouseButtonJustClicked || JoyButtonJustClicked)
-						CheckCodesForControls(TypeOfControl);
-
-					field_535 = true;
-				} else {
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-					for (int i = 0; i < 4; i++)
-						ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
-					m_bKeyIsOK = false;
-					m_bKeyChangeNotProcessed = false;
-					pControlEdit = nil;
-					m_bWaitingForNewKeyBind = false;
-					m_KeyPressedCode = -1;
-					m_bStartWaitingForKeyBind = false;
-				}
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+				for (int i = 0; i < 4; i++)
+					ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
+				m_bKeyIsOK = false;
+				m_bKeyChangeNotProcessed = false;
+				pControlEdit = nil;
+				m_bWaitingForNewKeyBind = false;
+				m_KeyPressedCode = -1;
+				m_bStartWaitingForKeyBind = false;
 			}
 		}
-
-		if ((m_nCurrScreen == MENUPAGE_NO_MEMORY_CARD || m_nCurrScreen == MENUPAGE_PS2_LOAD_FAILED) && CTimer::GetTimeInMillisecondsPauseMode() > field_558) {
-			m_nCurrScreen = m_nPrevScreen;
-			m_nCurrOption = 0;
-		}
-
-		// Reset pad shaking.
-		if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) {
-			CPad::StopPadsShaking();
-			TimeToStopPadShaking = 0;
-		}
-
-	} else {
-		UnloadTextures();
-		m_bRenderGameInMenu = false;
-		// byte_5F33E4 = 1;	// unused
-		ChangeScreen(MENUPAGE_NONE, 0, false, false);
-		pEditString = nil;
-		m_bWaitingForNewKeyBind = false;
-	}
-
-	if (!m_bWantToRestart) {
-		if (m_bGameNotLoaded)
-			DMAudio.Service();
 	}
-}
 
-void
-CMenuManager::ProcessButtonPresses(void)
-{
 	if (pEditString || pControlEdit)
 		return;
 
@@ -3731,6 +3548,51 @@ CMenuManager::ProcessButtonPresses(void)
 		m_bShowMouse = true;
 	}
 
+	static int oldOption = -99;
+	oldOption = m_nCurrOption;
+	for (int rowToCheck = 0; rowToCheck < NUM_MENUROWS; ++rowToCheck) {
+		if (aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_NOTHING || 
+			aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_LABEL)
+			continue;
+
+		int extraOffset = 0;
+		if (aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action == MENUACTION_RADIO)
+			extraOffset = MENURADIO_ICON_SCALE;
+
+		if (m_nMousePosY > MENU_Y(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Y) &&
+			m_nMousePosY < MENU_Y(aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Y + MENU_DEFAULT_LINE_HEIGHT)) {
+			static int oldScreen = m_nCurrScreen;
+
+			m_nPrevOption = rowToCheck;
+			if (m_nMouseOldPosX != m_nMousePosX || m_nMouseOldPosY != m_nMousePosY) {
+				m_nCurrOption = rowToCheck;
+				m_bShowMouse = true;
+			}
+
+			int action = aScreens[m_nCurrScreen].m_aEntries[rowToCheck].m_Action;
+			if (action != MENUACTION_BRIGHTNESS && action != MENUACTION_DRAWDIST && action != MENUACTION_MUSICVOLUME
+				&& action != MENUACTION_SFXVOLUME && action != MENUACTION_MOUSESENS && action != MENUACTION_MP3VOLUMEBOOST)
+				m_nHoverOption = HOVEROPTION_RANDOM_ITEM;
+
+			break;
+		}
+		if (m_bShowMouse && m_nMenuFadeAlpha == 255) {
+			m_nPrevOption = oldOption;
+			m_nCurrOption = oldOption;
+		}
+	}
+
+	if (m_bShowMouse) {
+		if (oldOption != m_nCurrOption) {
+			if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_LABEL) {
+				++m_nCurrOption;
+				++m_nPrevOption;
+			}
+			m_nOptionHighlightTransitionBlend = 0;
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+		}
+	}
+
 	m_nMouseOldPosX = m_nMousePosX;
 	m_nMouseOldPosY = m_nMousePosY;
 	m_nMousePosX = m_nMouseTempPosX;
@@ -3741,8 +3603,7 @@ CMenuManager::ProcessButtonPresses(void)
 	if (m_nMousePosY < 0) m_nMousePosY = 0;
 	if (m_nMousePosY > SCREEN_HEIGHT) m_nMousePosY = SCREEN_HEIGHT;
 
-	if (m_nCurrScreen == MENUPAGE_MULTIPLAYER_FIND_GAME || m_nCurrScreen == MENUPAGE_SKIN_SELECT
-		|| m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+	if (m_nCurrScreen == MENUPAGE_SKIN_SELECT || m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
 
 		if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
 			m_nTotalListRow = m_nSkinsTotal;
@@ -3753,13 +3614,11 @@ CMenuManager::ProcessButtonPresses(void)
 				m_nSelectedListRow = m_nTotalListRow - 1;
 		}
 
-#ifndef TIDY_UP_PBP
 		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
 			m_bShowMouse = 0;
 			optionSelected = true;
 		}
-#endif
-		if (CPad::GetPad(0)->GetBackspaceJustDown() && m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS && !field_535) {
+		if (CPad::GetPad(0)->GetBackspaceJustDown() && m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS && !field_159) {
 			if (m_nCurrExLayer == HOVEROPTION_LIST) {
 				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
 				m_bWaitingForNewKeyBind = true;
@@ -3768,10 +3627,10 @@ CMenuManager::ProcessButtonPresses(void)
 				pControlEdit = &m_KeyPressedCode;
 			}
 		} else {
-			field_535 = false;
+			field_159 = false;
 		}
 
-		static uint32 lastTimeClickedScrollButton = 0;
+		static PauseModeTime lastTimeClickedScrollButton = 0;
 
 		if (CTimer::GetTimeInMillisecondsPauseMode() - lastTimeClickedScrollButton >= 200) {
 			m_bPressedPgUpOnList = false;
@@ -3783,7 +3642,7 @@ CMenuManager::ProcessButtonPresses(void)
 		}
 
 		if (CPad::GetPad(0)->GetTabJustDown()) {
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			m_bShowMouse = false;
 			switch (m_nCurrExLayer) {
 				case HOVEROPTION_BACK:
@@ -3819,7 +3678,7 @@ CMenuManager::ProcessButtonPresses(void)
 			if (!m_bPressedUpOnList) {
 				m_bPressedUpOnList = true;
 				lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				ScrollUpListByOne();
 			}
 		} else {
@@ -3841,7 +3700,7 @@ CMenuManager::ProcessButtonPresses(void)
 			if (!m_bPressedDownOnList) {
 				m_bPressedDownOnList = true;
 				lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				ScrollDownListByOne();
 			}
 		} else {
@@ -3857,7 +3716,7 @@ CMenuManager::ProcessButtonPresses(void)
 					m_bPressedPgUpOnList = true;
 					lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
 					m_bShowMouse = false;
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 					PageUpList(false);
 				}
 			}
@@ -3869,14 +3728,14 @@ CMenuManager::ProcessButtonPresses(void)
 					m_bPressedPgDnOnList = true;
 					lastTimeClickedScrollButton = CTimer::GetTimeInMillisecondsPauseMode();
 					m_bShowMouse = false;
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 					PageDownList(false);
 				}
 			}
 			if (CPad::GetPad(0)->GetHome()) {
 				m_nCurrExLayer = HOVEROPTION_LIST;
 				m_bShowMouse = false;
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				if (m_nTotalListRow >= MAX_VISIBLE_LIST_ROW) {
 					m_nFirstVisibleRowOnList = 0;
 				}
@@ -3886,7 +3745,7 @@ CMenuManager::ProcessButtonPresses(void)
 			if (CPad::GetPad(0)->GetEnd()) {
 				m_nCurrExLayer = HOVEROPTION_LIST;
 				m_bShowMouse = false;
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				if (m_nTotalListRow >= MAX_VISIBLE_LIST_ROW) {
 					m_nFirstVisibleRowOnList = m_nTotalListRow - MAX_VISIBLE_LIST_ROW;
 				}
@@ -3895,12 +3754,10 @@ CMenuManager::ProcessButtonPresses(void)
 			}
 		}
 
-#ifndef TIDY_UP_PBP
 		if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustDown()) {
 			m_bShowMouse = false;
 			goBack = true;
 		}
-#endif
 
 		if (CPad::GetPad(0)->GetLeftMouseJustDown()) {
 			switch (m_nHoverOption) {
@@ -3971,7 +3828,6 @@ CMenuManager::ProcessButtonPresses(void)
 			}
 		}
 	} else if (isPlainTextScreen(m_nCurrScreen)) {
-#ifndef TIDY_UP_PBP
 		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() || CPad::GetPad(0)->GetLeftMouseJustDown()) {
 			optionSelected = true;
 		}
@@ -3980,19 +3836,19 @@ CMenuManager::ProcessButtonPresses(void)
 				goBack = true;
 			}
 		}
-#endif
 	} else {
 		if (CPad::GetPad(0)->GetDownJustDown() || CPad::GetPad(0)->GetAnaloguePadDown() || CPad::GetPad(0)->GetDPadDownJustDown()) {
 			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			goDown = true;
+			m_nOptionHighlightTransitionBlend = 0;
 		} else if (CPad::GetPad(0)->GetUpJustDown() || CPad::GetPad(0)->GetAnaloguePadUp() || CPad::GetPad(0)->GetDPadUpJustDown()) {
 			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			goUp = true;
+			m_nOptionHighlightTransitionBlend = 0;
 		}
 
-#ifndef TIDY_UP_PBP
 		if ((m_nCurrOption == 0) && (m_nCurrScreen == MENUPAGE_PAUSE_MENU)) {
 			if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) {
 				m_bShowMouse = false;
@@ -4004,7 +3860,6 @@ CMenuManager::ProcessButtonPresses(void)
 				optionSelected = true;
 			}
 		}
-#endif
 
 		if (CPad::GetPad(0)->GetLeftMouseJustUp()) {
 #ifndef TIDY_UP_PBP
@@ -4208,7 +4063,7 @@ CMenuManager::ProcessButtonPresses(void)
 				TheCamera.m_fMouseAccelVertical = TheCamera.m_fMouseAccelHorzntl;
 				SaveSettings();
 				break;
-				}
+			}
 #else
 			switch (m_nHoverOption) {
 				case HOVEROPTION_INCREASE_BRIGHTNESS:
@@ -4227,7 +4082,7 @@ CMenuManager::ProcessButtonPresses(void)
 					break;
 			}
 #endif
-			}
+		}
 
 		if (CPad::GetPad(0)->GetLeftMouseJustUp() || CPad::GetPad(0)->GetLeftJustUp() || CPad::GetPad(0)->GetRightJustUp()
 			|| CPad::GetPad(0)->GetDPadLeftJustUp() || CPad::GetPad(0)->GetDPadRightJustUp()
@@ -4242,7 +4097,6 @@ CMenuManager::ProcessButtonPresses(void)
 				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 
 		}
-#ifndef TIDY_UP_PBP
 		if (CPad::GetPad(0)->GetBackJustDown()) {
 			if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU) {
 				m_bShowMouse = false;
@@ -4260,53 +4114,19 @@ CMenuManager::ProcessButtonPresses(void)
 		if (((goDown) || (goUp)) || (optionSelected)) {
 			goBack = false;
 		}
-#endif
-		}
-
-	// Centralized enter/back (except some conditions)
-#ifdef TIDY_UP_PBP
-	if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action != MENUACTION_RESUME) {
-		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown() ||
-			(isPlainTextScreen(m_nCurrScreen) && CPad::GetPad(0)->GetLeftMouseJustDown())) {
-
-			if (!isPlainTextScreen(m_nCurrScreen))
-				m_bShowMouse = false;
-
-			optionSelected = true;
-		}
-	} else {
-		if (CPad::GetPad(0)->GetEnterJustUp() || CPad::GetPad(0)->GetCrossJustUp()) {
-			m_bShowMouse = false;
-			optionSelected = true;
-		}
 	}
 
-	if (!goDown && !goUp && !optionSelected) {
-		if (m_nCurrScreen != MENUPAGE_START_MENU) {
-			if (isPlainTextScreen(m_nCurrScreen)) {
-				if (CPad::GetPad(0)->GetEscapeJustDown() || CPad::GetPad(0)->GetBackJustUp()) {
-					goBack = true;
-				}
-			} else {
-				if (CPad::GetPad(0)->GetEscapeJustDown() || (m_nCurrScreen != MENUPAGE_PAUSE_MENU && CPad::GetPad(0)->GetBackJustDown())) {
-					m_bShowMouse = false;
-					goBack = true;
-				}
-			}
-		}
-	}
-#endif
 
 #ifdef PS2_LIKE_MENU
 	if (CPad::GetPad(0)->GetLeftMouseJustDown() && hoveredBottomBarOption != -1) {
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 		bottomBarActive = false;
 		curBottomBarOption = hoveredBottomBarOption;
 		ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, false);
 		return;
 	} else if (bottomBarActive) {
 		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			bottomBarActive = false;
 
 			// If there's a menu change with fade ongoing, finish it now
@@ -4316,7 +4136,7 @@ CMenuManager::ProcessButtonPresses(void)
 		} else if (CPad::GetPad(0)->GetLeftJustDown() || CPad::GetPad(0)->GetAnaloguePadLeft() || CPad::GetPad(0)->GetDPadLeftJustDown()
 			|| CPad::GetPad(0)->GetUpJustDown() || CPad::GetPad(0)->GetAnaloguePadUp() || CPad::GetPad(0)->GetDPadUpJustDown()) {
 			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			if (curBottomBarOption > 0)
 				curBottomBarOption--;
 			ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, true);
@@ -4324,7 +4144,7 @@ CMenuManager::ProcessButtonPresses(void)
 		} else if (CPad::GetPad(0)->GetRightJustDown() || CPad::GetPad(0)->GetAnaloguePadRight() || CPad::GetPad(0)->GetDPadRightJustDown()
 			|| CPad::GetPad(0)->GetDownJustDown() || CPad::GetPad(0)->GetAnaloguePadDown() || CPad::GetPad(0)->GetDPadDownJustDown()) {
 			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 			if (curBottomBarOption < bbTabCount-1)
 				curBottomBarOption++;
 			ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, true);
@@ -4336,14 +4156,13 @@ CMenuManager::ProcessButtonPresses(void)
 	}
 #endif
 
-	int prevOption = m_nCurrOption;
-	if (goDown && (m_nCurrScreen != MENUPAGE_MULTIPLAYER_FIND_GAME)) {
+	if (goDown) {
 		m_nCurrOption++;
 		if (m_nCurrOption == NUM_MENUROWS || (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action == MENUACTION_NOTHING)) {
 			m_nCurrOption = 0;
 		}
 	}
-	if (goUp && (m_nCurrScreen != MENUPAGE_MULTIPLAYER_FIND_GAME)) {
+	if (goUp) {
 		if (m_nCurrOption == (aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)) {
 			while (m_nCurrOption != NUM_MENUROWS - 1
 				&& aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption + 1].m_Action != MENUACTION_NOTHING) {
@@ -4356,7 +4175,8 @@ CMenuManager::ProcessButtonPresses(void)
 
 	if (optionSelected) {
 		int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
-		if ((option == MENUACTION_CHANGEMENU) || (option == MENUACTION_POPULATESLOTS_CHANGEMENU)) {
+		if (option == MENUACTION_CHANGEMENU || option == MENUACTION_POPULATESLOTS_CHANGEMENU || option == MENUACTION_GOBACK
+			|| option == MENUACTION_YES || option == MENUACTION_NO) {
 			if (strncmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEDS_TB", 8) != 0 &&
 				strncmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FESZ_CA", 8) != 0) {
 
@@ -4387,8 +4207,9 @@ CMenuManager::ProcessButtonPresses(void)
 			}
 		} else if (option != MENUACTION_CHANGEMENU && option != MENUACTION_BRIGHTNESS && option != MENUACTION_DRAWDIST
 			&& option != MENUACTION_MUSICVOLUME && option != MENUACTION_SFXVOLUME
-			&& option != MENUACTION_CHECKSAVE && option != MENUACTION_UNK24
-			&& option != MENUACTION_MOUSESENS && option != MENUACTION_SCREENRES) {
+			&& option != MENUACTION_CHECKSAVE && option != MENUACTION_MOUSESENS
+			&& option != MENUACTION_YES && option != MENUACTION_NO
+			&& option != MENUACTION_SCREENRES) {
 
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		}
@@ -4432,14 +4253,9 @@ CMenuManager::ProcessButtonPresses(void)
 				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
 				SaveSettings();
 			} else {
-#ifndef TIDY_UP_PBP
-				ChangeScreen(!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage[1] : aScreens[m_nCurrScreen].m_PreviousPage[0],
-					GetPreviousPageOption(), true, true);
-#else
-				goBack = true;
-#endif
+				SwitchToNewScreen(-2);
 			}
-		} else if (m_nCurrScreen != MENUPAGE_MULTIPLAYER_FIND_GAME) {
+		} else {
 			option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
 			switch (option) {
 				case MENUACTION_RADIO:
@@ -4489,53 +4305,47 @@ CMenuManager::ProcessButtonPresses(void)
 					InitialiseChangedLanguageSettings();
 					SaveSettings();
 					break;
+#ifdef MORE_LANGUAGES
+				case MENUACTION_LANG_PL:
+					m_PrefsLanguage = LANGUAGE_POLISH;
+					m_bFrontEnd_ReloadObrTxtGxt = true;
+					InitialiseChangedLanguageSettings();
+					SaveSettings();
+					break;
+				case MENUACTION_LANG_RUS:
+					m_PrefsLanguage = LANGUAGE_RUSSIAN;
+					m_bFrontEnd_ReloadObrTxtGxt = true;
+					CMenuManager::InitialiseChangedLanguageSettings();
+					SaveSettings();
+					break;
+				case MENUACTION_LANG_JAP:
+					m_PrefsLanguage = LANGUAGE_JAPANESE;
+					m_bFrontEnd_ReloadObrTxtGxt = true;
+					InitialiseChangedLanguageSettings();
+					SaveSettings();
+					break;
+#endif
 				case MENUACTION_POPULATESLOTS_CHANGEMENU:
 					PcSaveHelper.PopulateSlotInfo();
 
 					// fall through
 				case MENUACTION_CHANGEMENU:
+				case MENUACTION_YES:
+				case MENUACTION_NO:
 				{
-					bool changeMenu = true;
-					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
-
-					// This should be unused.
-					if (saveSlot >= 2 && saveSlot <= 9) {
-						m_nCurrSaveSlot = saveSlot - 2;
-						switch (m_nCurrScreen) {
-						case MENUPAGE_CHOOSE_LOAD_SLOT:
-							if (Slots[m_nCurrSaveSlot + 1] != SLOT_EMPTY)
-								changeMenu = false;
-
-							break;
-						case MENUPAGE_CHOOSE_DELETE_SLOT:
-							if (Slots[m_nCurrSaveSlot + 1] == SLOT_EMPTY)
-								changeMenu = false;
-
-							break;
-						}
-					}
-					if (changeMenu) {
-						if (strncmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEDS_TB", 8) == 0) {
-#ifndef TIDY_UP_PBP
-							ResetHelperText();
-							ChangeScreen(!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage[1] : aScreens[m_nCurrScreen].m_PreviousPage[0],
-								GetPreviousPageOption(), true, true);
-#else
-							goBack = true;
-							break;
-#endif
-						} else {
+					// TODO(Miami): TEMP
 #ifdef MENU_MAP
-							if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_MAP) {
-								bMapLoaded = false;
-							}
+					if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_MAP) {
+						bMapLoaded = false;
+					}
 
 #endif
-							ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
-						}
-					}
+					SwitchToNewScreen(0);
 					break;
 				}
+				case MENUACTION_GOBACK:
+					goBack = true;
+					break;
 				case MENUACTION_CHECKSAVE:
 				{
 					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
@@ -4543,7 +4353,11 @@ CMenuManager::ProcessButtonPresses(void)
 					if (saveSlot >= 2 && saveSlot <= 9) {
 						m_nCurrSaveSlot = saveSlot - 2;
 						if (Slots[m_nCurrSaveSlot + 1] != SLOT_EMPTY && Slots[m_nCurrSaveSlot + 1] != SLOT_CORRUPTED) {
-							ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
+							if (m_nCurrScreen == MENUPAGE_CHOOSE_LOAD_SLOT) {
+								SwitchToNewScreen(MENUPAGE_LOAD_SLOT_CONFIRM);
+							} else if (m_nCurrScreen == MENUPAGE_CHOOSE_DELETE_SLOT) {
+								SwitchToNewScreen(MENUPAGE_DELETE_SLOT_CONFIRM);
+							}
 						}
 					}
 					break;
@@ -4554,43 +4368,11 @@ CMenuManager::ProcessButtonPresses(void)
 				case MENUACTION_RELOADIDE:
 					CFileLoader::ReloadObjectTypes("GTA3.IDE");
 					break;
-				case MENUACTION_RELOADIPL:
-					CGame::ReloadIPLs();
-					break;
-				case MENUACTION_SHOWCULL:
-					gbShowCullZoneDebugStuff = !gbShowCullZoneDebugStuff;
-					break;
-				case MENUACTION_MEMCARDSAVECONFIRM:
-					return;
 				case MENUACTION_RESUME_FROM_SAVEZONE:
 					RequestFrontEndShutDown();
 					break;
-				case MENUACTION_MPMAP_LIBERTY:
-				case MENUACTION_MPMAP_REDLIGHT:
-				case MENUACTION_MPMAP_CHINATOWN:
-				case MENUACTION_MPMAP_TOWER:
-				case MENUACTION_MPMAP_SEWER:
-				case MENUACTION_MPMAP_INDUSTPARK:
-				case MENUACTION_MPMAP_DOCKS:
-				case MENUACTION_MPMAP_STAUNTON:
-					m_SelectedMap = option - MENUACTION_MPMAP_LIBERTY;
-					SaveSettings();
-					ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
-					break;
-				case MENUACTION_MPMAP_DEATHMATCH1:
-				case MENUACTION_MPMAP_DEATHMATCH2:
-				case MENUACTION_MPMAP_TEAMDEATH1:
-				case MENUACTION_MPMAP_TEAMDEATH2:
-				case MENUACTION_MPMAP_STASH:
-				case MENUACTION_MPMAP_CAPTURE:
-				case MENUACTION_MPMAP_RATRACE:
-				case MENUACTION_MPMAP_DOMINATION:
-					m_SelectedGameType = option - MENUACTION_MPMAP_DEATHMATCH1;
-					SaveSettings();
-					ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
-					break;
 				case MENUACTION_KEYBOARDCTRLS:
-					ChangeScreen(MENUPAGE_KEYBOARD_CONTROLS, 0, true, true);
+					SwitchToNewScreen(MENUPAGE_KEYBOARD_CONTROLS);
 					m_nSelectedListRow = 0;
 					m_nCurrExLayer = HOVEROPTION_LIST;
 					break;
@@ -4603,34 +4385,45 @@ CMenuManager::ProcessButtonPresses(void)
 					break;
 				case MENUACTION_CANCELGAME:
 					DMAudio.Service();
-					RsEventHandler(rsQUITAPP, nil);
+					SwitchToNewScreen(MENUPAGE_OUTRO);
 					break;
 				case MENUACTION_RESUME:
-#ifndef TIDY_UP_PBP
 					if (m_PrefsVsyncDisp != m_PrefsVsync) {
 						m_PrefsVsync = m_PrefsVsyncDisp;
 					}
 					RequestFrontEndShutDown();
-#else
-					goBack = true;
-#endif
 					break;
 				case MENUACTION_DONTCANCEL:
-					ChangeScreen(!m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage[1] : aScreens[m_nCurrScreen].m_PreviousPage[0],
-						GetPreviousPageOption(), true, true);
+					SwitchToNewScreen(-2);
 					break;
 				case MENUACTION_SCREENRES:
 					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
 						m_nPrefsVideoMode = m_nDisplayVideoMode;
 						_psSelectScreenVM(m_nPrefsVideoMode);
+						SetHelperText(0); // TODO(Miami): Remove that
+						DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+						DMAudio.Service();
+						CentreMousePointer();
+						m_bShowMouse = true;
+						// m_nCurrOption = 5; // Why?
+						m_nOptionHighlightTransitionBlend = 0;
+						SaveSettings();
+					}
+					break;
+#ifdef IMPROVED_VIDEOMODE
+				case MENUACTION_SCREENMODE:
+					if (m_nSelectedScreenMode != m_nPrefsWindowed) {
+						m_nPrefsWindowed = m_nSelectedScreenMode;
+						_psSelectScreenVM(m_nPrefsVideoMode); // apply same resolution
 						SetHelperText(0);
 						SaveSettings();
 					}
 					break;
+#endif
 				case MENUACTION_AUDIOHW:
 				{
 					int selectedProvider = m_nPrefsAudio3DProviderIndex;
-					if (selectedProvider != -1) {
+					if (selectedProvider != INVALID_AUDIO_PROVIDER) {
 						m_nPrefsAudio3DProviderIndex = DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
 						if (selectedProvider == m_nPrefsAudio3DProviderIndex) {
 							DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
@@ -4645,7 +4438,7 @@ CMenuManager::ProcessButtonPresses(void)
 				}
 				case MENUACTION_SPEAKERCONF:
 #ifndef TIDY_UP_PBP
-					if (m_nPrefsAudio3DProviderIndex != -1) {
+					if (m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER) {
 						if (--m_PrefsSpeakers < 0)
 							m_PrefsSpeakers = 2;
 						DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
@@ -4657,7 +4450,7 @@ CMenuManager::ProcessButtonPresses(void)
 					break;
 				case MENUACTION_PLAYERSETUP:
 					CPlayerSkin::BeginFrontendSkinEdit();
-					ChangeScreen(MENUPAGE_SKIN_SELECT, 0, true, true);
+					SwitchToNewScreen(MENUPAGE_SKIN_SELECT);
 					m_nCurrExLayer = HOVEROPTION_LIST;
 					m_bSkinsEnumerated = false;
 					break;
@@ -4667,7 +4460,7 @@ CMenuManager::ProcessButtonPresses(void)
 						m_PrefsSpeakers = 0;
 						m_PrefsMusicVolume = 102;
 						m_PrefsStereoMono = 0;
-						m_PrefsRadioStation = HEAD_RADIO;
+						m_PrefsRadioStation = WILDSTYLE;
 						DMAudio.SetMusicMasterVolume(102);
 						DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
 						DMAudio.SetRadioInCar(m_PrefsRadioStation);
@@ -4696,7 +4489,7 @@ CMenuManager::ProcessButtonPresses(void)
 						CMBlur::BlurOn = true;
 #endif
 						SaveSettings();
-					} else if ((m_nCurrScreen != MENUPAGE_SKIN_SELECT_OLD) && (m_nCurrScreen == MENUPAGE_CONTROLLER_PC)) {
+					} else if (m_nCurrScreen == MENUPAGE_CONTROLLER_PC) {
 						ControlsManager.MakeControllerActionsBlank();
 						ControlsManager.InitDefaultControlConfiguration();
 						ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());
@@ -4738,47 +4531,20 @@ CMenuManager::ProcessButtonPresses(void)
 #endif
 					break;
 				case MENUACTION_LOADRADIO:
-					ChangeScreen(MENUPAGE_SOUND_SETTINGS, 0, true, true);
+					SwitchToNewScreen(MENUPAGE_SOUND_SETTINGS);
 					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
 					OutputDebugString("STARTED PLAYING FRONTEND AUDIO TRACK");
 					break;
-#ifdef MISSION_REPLAY
-				case MENUACTION_REJECT_RETRY:
-					doingMissionRetry = false;
-					AllowMissionReplay = 0;
-					RequestFrontEndShutDown();
-					break;
-				case MENUACTION_UNK114:
-					doingMissionRetry = false;
-					RequestFrontEndShutDown();
-					RetryMission(2, 0);
-					return;
-#endif
-#ifdef CUSTOM_FRONTEND_OPTIONS
-				case MENUACTION_TRIGGERFUNC:
-					FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu];
-					if (m_nCurrScreen == option.screen && m_nCurrOption == option.screenOptionOrder) {
-						if (option.type == FEOPTION_SELECT) {
-							if (!option.onlyApplyOnEnter) {
-								option.displayedValue++;
-								if (option.displayedValue >= option.numRightTexts || option.displayedValue < 0)
-									option.displayedValue = 0;
-							}
-							option.changeFunc(option.displayedValue);
-							*option.value = option.displayedValue;
-
-						} else if (option.type == FEOPTION_DYNAMIC) {
-							option.buttonPressFunc(FEOPTION_ACTION_SELECT);
-						} else if (option.type == FEOPTION_REDIRECT) {
-							ChangeScreen(option.to, option.option, true, option.fadeIn);
-						} else if (option.type == FEOPTION_GOBACK) {
-							goBack = true;
-						}
-					} else
-						assert(0 && "Custom frontend options are borked");
+				case MENUACTION_SAVEGAME:
+				{
+					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
 
+					if (saveSlot >= 2 && saveSlot <= 9) {
+						m_nCurrSaveSlot = m_nCurrOption;
+						SwitchToNewScreen(MENUPAGE_SAVE_OVERWRITE_CONFIRM);
+					}
 					break;
-#endif
+				}
 			}
 		}
 		ProcessOnOffMenuOptions();
@@ -4792,7 +4558,7 @@ CMenuManager::ProcessButtonPresses(void)
 #else
 		if (m_nCurrScreen == MENUPAGE_PAUSE_MENU) {
 #endif
-			if (!m_bGameNotLoaded && !m_bMenuStateChanged) {
+			if (!m_bGameNotLoaded) {
 				if (m_PrefsVsyncDisp != m_PrefsVsync) {
 					m_PrefsVsync = m_PrefsVsyncDisp;
 				}
@@ -4811,7 +4577,7 @@ CMenuManager::ProcessButtonPresses(void)
 #endif
 			RequestFrontEndShutDown();
 		}
-		// It's now in ThingsToDoBeforeGoingBack()
+		// It's now in ThingsToDoBeforeLeavingPage()
 #ifndef TIDY_UP_PBP
 		else if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
 			DMAudio.StopFrontEndTrack();
@@ -4819,11 +4585,10 @@ CMenuManager::ProcessButtonPresses(void)
 		}
 #endif
 
-		int oldScreen = !m_bGameNotLoaded ? aScreens[m_nCurrScreen].m_PreviousPage[1] : aScreens[m_nCurrScreen].m_PreviousPage[0];
-		int oldOption = GetPreviousPageOption();
+		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
 
 		if (oldScreen != -1) {
-			ThingsToDoBeforeGoingBack();
+			ThingsToDoBeforeLeavingPage();
 
 #ifdef PS2_LIKE_MENU
 			if (!bottomBarActive &&
@@ -4832,7 +4597,7 @@ CMenuManager::ProcessButtonPresses(void)
 			} else
 #endif
 			{
-				ChangeScreen(oldScreen, oldOption, true, true);
+				SwitchToNewScreen(-2);
 			}
 
 			// We will go back for sure at this point, why process other things?!
@@ -4855,13 +4620,13 @@ CMenuManager::ProcessButtonPresses(void)
 	bool increase = false;
 #endif
 	if (CPad::GetPad(0)->GetLeft() || CPad::GetPad(0)->GetPedWalkLeftRight() < 0 || CPad::GetPad(0)->GetDPadLeft()) {
-		static uint32 lastSliderDecrease = 0;
+		static PauseModeTime lastSliderDecrease = 0;
 		if (CTimer::GetTimeInMillisecondsPauseMode() - lastSliderDecrease > 150) {
 			CheckSliderMovement(-1);
 			lastSliderDecrease = CTimer::GetTimeInMillisecondsPauseMode();
 		}
 	} else if (CPad::GetPad(0)->GetRight() || CPad::GetPad(0)->GetPedWalkLeftRight() > 0 || CPad::GetPad(0)->GetDPadRight()) {
-		static uint32 lastSliderIncrease = 0;
+		static PauseModeTime lastSliderIncrease = 0;
 		if (CTimer::GetTimeInMillisecondsPauseMode() - lastSliderIncrease > 150) {
 			CheckSliderMovement(1);
 			lastSliderIncrease = CTimer::GetTimeInMillisecondsPauseMode();
@@ -4901,15 +4666,15 @@ CMenuManager::ProcessButtonPresses(void)
 				m_PrefsRadioStation += changeValueBy;
 				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				if (DMAudio.IsMP3RadioChannelAvailable()) {
-					if (m_PrefsRadioStation < HEAD_RADIO)
+					if (m_PrefsRadioStation < WILDSTYLE)
 						m_PrefsRadioStation = USERTRACK;
 					if (m_PrefsRadioStation > USERTRACK)
-						m_PrefsRadioStation = HEAD_RADIO;
+						m_PrefsRadioStation = WILDSTYLE;
 				} else {
-					if (m_PrefsRadioStation < HEAD_RADIO)
-						m_PrefsRadioStation = CHATTERBOX;
-					if (m_PrefsRadioStation > CHATTERBOX)
-						m_PrefsRadioStation = HEAD_RADIO;
+					if (m_PrefsRadioStation < WILDSTYLE)
+						m_PrefsRadioStation = WAVE;
+					if (m_PrefsRadioStation > WAVE)
+						m_PrefsRadioStation = WILDSTYLE;
 				}
 				SaveSettings();
 				DMAudio.SetRadioInCar(m_PrefsRadioStation);
@@ -4934,7 +4699,7 @@ CMenuManager::ProcessButtonPresses(void)
 			case MENUACTION_SCREENRES:
 				if (m_bGameNotLoaded) {
 					RwChar** videoMods = _psGetVideoModeList();
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 					if (changeValueBy > 0) {
 						do {
 							++m_nDisplayVideoMode;
@@ -4952,15 +4717,21 @@ CMenuManager::ProcessButtonPresses(void)
 					}
 				}
 				break;
+#ifdef IMPROVED_VIDEOMODE
+			case MENUACTION_SCREENMODE:
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
+				m_nSelectedScreenMode = !m_nSelectedScreenMode;
+				break;
+#endif
 			case MENUACTION_AUDIOHW:
-				if (m_nPrefsAudio3DProviderIndex != -1) {
+				if (m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER) {
 					m_nPrefsAudio3DProviderIndex += changeValueBy;
 					m_nPrefsAudio3DProviderIndex = clamp(m_nPrefsAudio3DProviderIndex, 0, DMAudio.GetNum3DProvidersAvailable() - 1);
 				}
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				break;
 			case MENUACTION_SPEAKERCONF:
-				if (m_nPrefsAudio3DProviderIndex != -1) {
+				if (m_nPrefsAudio3DProviderIndex != INVALID_AUDIO_PROVIDER) {
 					m_PrefsSpeakers -= changeValueBy;
 					m_PrefsSpeakers = clamp(m_PrefsSpeakers, 0, 2);
 					DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
@@ -4974,34 +4745,6 @@ CMenuManager::ProcessButtonPresses(void)
 				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				SaveSettings();
 				break;
-#ifdef CUSTOM_FRONTEND_OPTIONS
-			case MENUACTION_TRIGGERFUNC:
-				FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu];
-				if (m_nCurrScreen == option.screen && m_nCurrOption == option.screenOptionOrder) {
-					if (option.type == FEOPTION_SELECT) {
-						if (changeValueBy > 0) {
-							option.displayedValue++;
-							if (option.displayedValue >= option.numRightTexts)
-								option.displayedValue = 0;
-						} else {
-							option.displayedValue--;
-							if (option.displayedValue < 0)
-								option.displayedValue = option.numRightTexts - 1;
-						}
-						if (!option.onlyApplyOnEnter) {
-							option.changeFunc(option.displayedValue);
-							*option.value = option.displayedValue;
-						}
-					} else if (option.type == FEOPTION_DYNAMIC) {
-						option.buttonPressFunc(changeValueBy > 0 ? FEOPTION_ACTION_RIGHT : FEOPTION_ACTION_LEFT);
-					}
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-				}
-				else
-					assert(0 && "Custom frontend options are borked");
-
-				break;
-#endif
 		}
 		ProcessOnOffMenuOptions();
 		if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
@@ -5010,7 +4753,7 @@ CMenuManager::ProcessButtonPresses(void)
 			} else {
 				m_nSelectedContSetupColumn = CONTSETUP_VEHICLE_COLUMN;
 			}
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NAVIGATION, 0);
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 		}
 	}
 }
@@ -5019,13 +4762,9 @@ void
 CMenuManager::ProcessOnOffMenuOptions()
 {
 	switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
+#ifdef LEGACY_MENU_OPTIONS
 	case MENUACTION_CTRLVIBRATION:
 		m_PrefsUseVibration = !m_PrefsUseVibration;
-
-		if (m_PrefsUseVibration) {
-			CPad::GetPad(0)->StartShake(350, 150);
-			TimeToStopPadShaking = CTimer::GetTimeInMillisecondsPauseMode() + 500;
-		}
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		break;
 	case MENUACTION_CTRLCONFIG:
@@ -5034,10 +4773,7 @@ CMenuManager::ProcessOnOffMenuOptions()
 			CPad::GetPad(0)->Mode = 0;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		break;
-	case MENUACTION_CTRLDISPLAY:
-		m_DisplayControllerOnFoot = !m_DisplayControllerOnFoot;
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		break;
+#endif
 	case MENUACTION_FRAMESYNC:
 		m_PrefsVsyncDisp = !m_PrefsVsyncDisp;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
@@ -5077,23 +4813,10 @@ CMenuManager::ProcessOnOffMenuOptions()
 		gbBigWhiteDebugLightSwitchedOn = !gbBigWhiteDebugLightSwitchedOn;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		break;
-	case MENUACTION_PEDROADGROUPS:
-		gbShowPedRoadGroups = !gbShowPedRoadGroups;
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		break;
-	case MENUACTION_CARROADGROUPS:
-		gbShowCarRoadGroups = !gbShowCarRoadGroups;
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		break;
 	case MENUACTION_COLLISIONPOLYS:
 		gbShowCollisionPolys = !gbShowCollisionPolys;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		break;
-	case MENUACTION_MP_PLAYERCOLOR:
-		PickNewPlayerColour();
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		SaveSettings();
-		break;
 	case MENUACTION_SHOWHEADBOB:
 		TheCamera.m_bHeadBob = !TheCamera.m_bHeadBob;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
@@ -5115,6 +4838,13 @@ CMenuManager::ProcessOnOffMenuOptions()
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		SaveSettings();
 		break;
+#ifdef FREE_CAM
+	case MENUACTION_FREECAM:
+		TheCamera.bFreeCam = !TheCamera.bFreeCam;
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+		SaveSettings();
+		break;
+#endif
 	}
 }
 
@@ -5122,7 +4852,6 @@ void
 CMenuManager::RequestFrontEndShutDown()
 {
 	m_bShutDownFrontEndRequested = true;
-	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 }
 
 void
@@ -5139,45 +4868,12 @@ CMenuManager::ResetHelperText()
 }
 
 void
-CMenuManager::SaveLoadFileError_SetUpErrorScreen()
-{
-	switch (PcSaveHelper.nErrorCode) {
-		case SAVESTATUS_ERR_SAVE_CREATE:
-		case SAVESTATUS_ERR_SAVE_WRITE:
-		case SAVESTATUS_ERR_SAVE_CLOSE:
-			ChangeScreen(MENUPAGE_SAVE_FAILED, 0, true, false);
-			break;
-		case SAVESTATUS_ERR_LOAD_OPEN:
-		case SAVESTATUS_ERR_LOAD_READ:
-		case SAVESTATUS_ERR_LOAD_CLOSE:
-			ChangeScreen(MENUPAGE_LOAD_FAILED, 0, true, false);
-			break;
-		case SAVESTATUS_ERR_DATA_INVALID:
-			ChangeScreen(MENUPAGE_LOAD_FAILED_2, 0, true, false);
-			break;
-		case SAVESTATUS_DELETEFAILED8:
-		case SAVESTATUS_DELETEFAILED9:
-		case SAVESTATUS_DELETEFAILED10:
-			ChangeScreen(MENUPAGE_DELETE_FAILED, 0, true, false);
-			break;
-		default: break;
-	}
-}
-
-void
 CMenuManager::SetHelperText(int text)
 {
 	m_nHelperTextMsgId = text;
 	m_nHelperTextAlpha = 300;
 }
 
-void
-CMenuManager::ShutdownJustMenu()
-{
-	m_bMenuActive = false;
-	CTimer::EndUserPause();
-}
-
 float
 CMenuManager::StretchX(float x)
 {
@@ -5198,80 +4894,164 @@ float CMenuManager::StretchY(float y)
 }
 
 void
+CMenuManager::ProcessFileActions()
+{
+	switch (m_nCurrScreen) {
+		case MENUPAGE_LOADING_IN_PROGRESS:
+			if (CheckSlotDataValid(m_nCurrSaveSlot)) {
+#ifdef USE_DEBUG_SCRIPT_LOADER
+				scriptToLoad = 0;
+#endif
+				if (!m_bGameNotLoaded)
+					MessageScreen("FELD_WR", true);
+
+				DoSettingsBeforeStartingAGame();
+				m_bWantToLoad = true;
+			} else
+				SwitchToNewScreen(MENUPAGE_NEW_GAME);
+
+			break;
+		case MENUPAGE_DELETING_IN_PROGRESS:
+		{
+			static bool waitedForScreen = false;
+
+			if (waitedForScreen) {
+				bool SlotPopulated = false;
+				if (PcSaveHelper.DeleteSlot(m_nCurrSaveSlot)) {
+					PcSaveHelper.PopulateSlotInfo();
+					SlotPopulated = true;
+				}
+
+				if (SlotPopulated) {
+					SwitchToNewScreen(MENUPAGE_DELETE_SUCCESSFUL);
+				} else {
+					SwitchToNewScreen(MENUPAGE_SAVE_CUSTOM_WARNING);
+					strncpy(aScreens[m_nCurrScreen].m_ScreenName, "FES_DEL", 8);
+					strncpy(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName, "FES_DEE", 8);
+				}
+				waitedForScreen = false;
+			} else if (m_nMenuFadeAlpha >= 255)
+				waitedForScreen = true;
+
+			break;
+		}
+		case MENUPAGE_SAVING_IN_PROGRESS:
+		{
+			static bool waitedForScreen = false;
+
+			if (waitedForScreen) {
+				int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
+				PcSaveHelper.PopulateSlotInfo();
+				if (SaveSlot) {
+					SwitchToNewScreen(MENUPAGE_SAVE_CUSTOM_WARNING);
+					strncpy(aScreens[m_nCurrScreen].m_ScreenName, "FET_SG", 8);
+					strncpy(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName, "FES_CMP", 8);
+				} else
+					SwitchToNewScreen(MENUPAGE_SAVE_SUCCESSFUL);
+
+				waitedForScreen = false;
+			} else if (m_nMenuFadeAlpha >= 255)
+				waitedForScreen = true;
+
+			break;
+		}
+	}
+}
+
+// --MIAMI: Done except DxInput things, are they even needed?
+void
 CMenuManager::SwitchMenuOnAndOff()
 {
-	bool menuWasActive = GetIsMenuActive();
+	if (!TheCamera.m_WideScreenOn) {
+
+		// Reminder: You need REGISTER_START_BUTTON defined to make it work.
+		if ((CPad::GetPad(0)->GetStartJustDown() || CPad::GetPad(0)->GetEscapeJustDown())
+			&& (!m_bMenuActive || m_nCurrScreen == MENUPAGE_PAUSE_MENU || m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT || m_nCurrScreen == MENUPAGE_SAVE_CHEAT_WARNING)
+			|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested) {
+
+			if (m_nCurrScreen != MENUPAGE_LOADING_IN_PROGRESS) {
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+			}
 
-	// Reminder: You need REGISTER_START_BUTTON defined to make it work.
-	if (CPad::GetPad(0)->GetStartJustDown() 
-#ifdef FIX_BUGS
-		&& !m_bGameNotLoaded
-#endif
-		|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested) {
+			if (m_bShutDownFrontEndRequested)
+				m_bMenuActive = false;
+			else if (m_bStartUpFrontEndRequested)
+				m_bMenuActive = true;
+			else
+				m_bMenuActive = !m_bMenuActive;
 
-		m_bMenuActive = !m_bMenuActive;
+			if (m_bMenuActive) {
+				// TODO(Miami): DxInput??
 
-		if (m_bShutDownFrontEndRequested)
-			m_bMenuActive = false;
-		if (m_bStartUpFrontEndRequested)
-			m_bMenuActive = true;
+				Initialise();
+				LoadAllTextures();
+			} else {
+				if (CMBlur::BlurOn)
+					CMBlur::MotionBlurOpen(Scene.camera);
+				else
+					CMBlur::MotionBlurClose();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+
+				// TODO(Miami): DxInput??
 
-		if (m_bMenuActive) {
-			CTimer::StartUserPause();
-		} else {
 #ifdef PS2_LIKE_MENU
-			bottomBarActive = false;
-#endif
-#ifdef FIX_BUGS
-			ThingsToDoBeforeGoingBack();
+				bottomBarActive = false;
 #endif
-			ShutdownJustMenu();
-			SaveSettings();
-			m_bStartUpFrontEndRequested = false;
-			pControlEdit = nil;
-			m_bShutDownFrontEndRequested = false;
-			DisplayComboButtonErrMsg = false;
+
+				m_StatsScrollSpeed = 150.0f;
+				SaveSettings();
+				pControlEdit = nil;
+				pEditString = nil;
+				DisplayComboButtonErrMsg = false;
+				m_bShutDownFrontEndRequested = false;
+				m_bStartUpFrontEndRequested = false;
+				m_bWaitingForNewKeyBind = false;
 
 #ifdef REGISTER_START_BUTTON
-			int16 start1 = CPad::GetPad(0)->PCTempJoyState.Start, start2 = CPad::GetPad(0)->PCTempKeyState.Start,
-				start3 = CPad::GetPad(0)->OldState.Start, start4 = CPad::GetPad(0)->NewState.Start;
+				int16 start1 = CPad::GetPad(0)->PCTempJoyState.Start, start2 = CPad::GetPad(0)->PCTempKeyState.Start,
+					start3 = CPad::GetPad(0)->OldState.Start, start4 = CPad::GetPad(0)->NewState.Start;
 #endif
-			CPad::GetPad(0)->Clear(false);
-			CPad::GetPad(1)->Clear(false);
+				CPad::GetPad(0)->Clear(false);
+				CPad::GetPad(1)->Clear(false);
 #ifdef REGISTER_START_BUTTON
-			CPad::GetPad(0)->PCTempJoyState.Start = start1;
-			CPad::GetPad(0)->PCTempKeyState.Start = start2;
-			CPad::GetPad(0)->OldState.Start = start3;
-			CPad::GetPad(0)->NewState.Start = start4;
+				CPad::GetPad(0)->PCTempJoyState.Start = start1;
+				CPad::GetPad(0)->PCTempKeyState.Start = start2;
+				CPad::GetPad(0)->OldState.Start = start3;
+				CPad::GetPad(0)->NewState.Start = start4;
 #endif
-			m_nCurrScreen = MENUPAGE_NONE;
+				UnloadTextures();
+				CTimer::EndUserPause();
+				CTimer::Update();
+				m_OnlySaveMenu = false;
+			}
 		}
 	}
 
 	// Just entered the save/safe zone
-	if (m_bSaveMenuActive && !m_bQuitGameNoCD) {
-		m_bSaveMenuActive = false;
+	if (m_bActivateSaveMenu) {
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		m_bActivateSaveMenu = false;
 		m_bMenuActive = true;
-		CTimer::StartUserPause();
-#ifdef PS2_SAVE_DIALOG
-		m_nCurrScreen = MENUPAGE_SAVE;
-		m_bRenderGameInMenu = true;
-#else
+		m_OnlySaveMenu = true;
+
+		// TODO(Miami): DxInput??
+
+		Initialise();
+		LoadAllTextures();
+
+		// TODO(Miami): Cheat warning
 		m_nCurrScreen = MENUPAGE_CHOOSE_SAVE_SLOT;
-#endif
-		PcSaveHelper.PopulateSlotInfo();
-		m_nCurrOption = 0;
-	}
-/*	// PS2 leftover
-	if (m_nCurrScreen != MENUPAGE_SOUND_SETTINGS && gMusicPlaying)
-	{
-		DMAudio.StopFrontEndTrack();
-		OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
-		gMusicPlaying = 0;
+		m_nCurrOption = 8;
 	}
-*/
-	if (m_bMenuActive != menuWasActive)
-		m_bMenuStateChanged = true;
 
 	m_bStartUpFrontEndRequested = false;
 	m_bShutDownFrontEndRequested = false;
@@ -5280,27 +5060,31 @@ CMenuManager::SwitchMenuOnAndOff()
 void
 CMenuManager::UnloadTextures()
 {
-	if (!m_bSpritesLoaded)
-		return;
+	if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS)
+		DMAudio.StopFrontEndTrack();
 
-	printf("REMOVE frontend\n");
-	for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); ++i)
-		m_aFrontEndSprites[i].Delete();
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+	if (m_bSpritesLoaded) {
+		printf("REMOVE frontend\n");
+		int frontend = CTxdStore::FindTxdSlot("frontend1");
+		for (int i = 0; i < 3; ++i)
+			m_aFrontEndSprites[i].Delete();
 
-	int frontend = CTxdStore::FindTxdSlot("frontend");
-	CTxdStore::RemoveTxd(frontend);
+		CTxdStore::RemoveTxd(frontend);
 
-	printf("REMOVE menu textures\n");
-	for (int i = 0; i < ARRAY_SIZE(MenuFilenames); ++i)
-		m_aMenuSprites[i].Delete();
-#ifdef MENU_MAP
-	for (int i = 0; i < ARRAY_SIZE(MapFilenames); ++i)
-		m_aMapSprites[i].Delete();
-#endif
-	int menu = CTxdStore::FindTxdSlot("menu");
-	CTxdStore::RemoveTxd(menu);
+		if (!m_OnlySaveMenu) {
+			int frontend2 = CTxdStore::FindTxdSlot("frontend2");
+			for (int i = 3; i < NUM_MENU_SPRITES; ++i)
+				m_aFrontEndSprites[i].Delete();
 
-	m_bSpritesLoaded = false;
+			CTxdStore::RemoveTxd(frontend2);
+		}
+
+		m_bSpritesLoaded = false;
+	}
+	m_OnlySaveMenu = false;
+	// TODO(Miami): Place name thing
 }
 
 void
@@ -5323,7 +5107,7 @@ CMenuManager::WaitForUserCD()
 
 	HandleExit();
 	CPad::UpdatePads();
-	MessageScreen("NO_PCCD");
+	MessageScreen("NO_PCCD", true);
 
 	if (CPad::GetPad(0)->GetEscapeJustDown()) {
 		m_bQuitGameNoCD = true;
@@ -5332,273 +5116,89 @@ CMenuManager::WaitForUserCD()
 }
 
 void
-CMenuManager::PrintController(void)
+CMenuManager::DrawQuitGameScreen(void)
 {
-	// FIX: Originally this function doesn't have StretchX/Y, everything had constant pixel size (due to screen was abandoned early?)
-	//		Also texts and their alignment were very bad, so I tried to make them readable (commented out the original code, and marked the ones I added with X)
-
-	m_aFrontEndSprites[FE_CONTROLLERSH].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(240.0f), MENU_Y(180.0f), CRGBA(0, 0, 0, 255));
-	m_aFrontEndSprites[FE_CONTROLLER].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	if (m_DisplayControllerOnFoot) {
-		if (CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
-			m_aFrontEndSprites[FE_ARROWS1].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-		else
-			m_aFrontEndSprites[FE_ARROWS3].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	} else {
-		if (CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
-			m_aFrontEndSprites[FE_ARROWS2].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-		else
-			m_aFrontEndSprites[FE_ARROWS4].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	}
-
-	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));  // X
-
-	// CFont::SetScale(0.4f, 0.4f);
-	CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); // X
-
-	// CFont::SetColor(CRGBA(128, 128, 128, FadeIn(255)));
-	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255))); // X
-	CFont::SetDropShadowPosition(1); // X
-	CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255))); // X
-
-	if (m_DisplayControllerOnFoot) {
-		switch (CPad::GetPad(0)->Mode) {
-			case 0:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_MOV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 1:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 2:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_MOV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 3:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			default:
-				return;
-		}
-	} else {
-		switch (CPad::GetPad(0)->Mode) {
-			case 0:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_VES"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_HO3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 1:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_HOR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 2:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_VES"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_RS3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HOR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 3:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_TUC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_HO3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_SMT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_ACC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_BRA"));
-				break;
-			default:
-				return;
-		}
+	static int32 exitSignalTimer = 0;
+#ifndef MUCH_SHORTER_OUTRO_SCREEN
+	static PauseModeTime lastTickIncrease = 0;
+	if (m_nMenuFadeAlpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - lastTickIncrease > 10) {
+		exitSignalTimer++;
+		lastTickIncrease = CTimer::GetTimeInMillisecondsPauseMode();
 	}
+#else
+	static PauseModeTime sincePress = 0;
+	sincePress += frameTime;
+	if (sincePress > 500)
+		exitSignalTimer = 150;
+#endif
+	static CSprite2d *splash = nil;
+
+	if (splash == nil)
+		splash = LoadSplash("OUTRO");
+
+	m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(28.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, -(m_nMenuFadeAlpha + 1)));
+
+	// Or we can see menu background from sides
+#ifdef ASPECT_RATIO_SCALE
+	CSprite2d::DrawRect(CRect(0, 0, MENU_X_LEFT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(0, 0, 0, m_nMenuFadeAlpha));
+	CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(0.f), 0, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, m_nMenuFadeAlpha));
+#endif
+
+	splash->Draw(CRect(MENU_X_LEFT_ALIGNED(0.f), 0, MENU_X_RIGHT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(255, 255, 255, m_nMenuFadeAlpha));
+	if (m_nMenuFadeAlpha == 255 && exitSignalTimer == 150)
+		RsEventHandler(rsQUITAPP, nil);
 
-	CFont::SetDropShadowPosition(0); // X
+	m_bShowMouse = false;
+	m_AllowNavigation = false;
 }
 
 #ifdef MENU_MAP
 
 #define ZOOM(x, y, in) \
 	do { \
-		if(fMapSize > SCREEN_HEIGHT * 3.0f && in) \
+		if(m_fMapSize > SCREEN_HEIGHT * 3.0f && in) \
 			break; \
 		float z2 = in? 1.1f : 1.f/1.1f; \
-		fMapCenterX += (x - fMapCenterX) * (1.0f - z2); \
-		fMapCenterY += (y - fMapCenterY) * (1.0f - z2); \
+		m_fMapCenterX += (x - m_fMapCenterX) * (1.0f - z2); \
+		m_fMapCenterY += (y - m_fMapCenterY) * (1.0f - z2); \
 		\
-		if (fMapSize < SCREEN_HEIGHT / 2 && !in) \
+		if (m_fMapSize < SCREEN_HEIGHT / 2 && !in) \
 			break; \
 		\
-		fMapSize *= z2; \
+		m_fMapSize *= z2; \
 	} while(0) \
 
 void
 CMenuManager::PrintMap(void)
 {
 	CFont::SetJustifyOn();
-	bMenuMapActive = true;
+	m_bMenuMapActive = true;
 	CRadar::InitFrontEndMap();
 
 	// Just entered to map
 	if (!bMapLoaded) {
-		fMapSize = SCREEN_HEIGHT * 2.0f;
-		fMapCenterX = 0.0f;
-		fMapCenterY = 0.0f;
+		m_fMapSize = SCREEN_HEIGHT * 2.0f;
+		m_fMapCenterX = 0.0f;
+		m_fMapCenterY = 0.0f;
 		CVector2D radarSpacePlayer;
 		CVector2D screenSpacePlayer;
 		CRadar::TransformRealWorldPointToRadarSpace(radarSpacePlayer, CVector2D(FindPlayerCoors()));
 		CRadar::TransformRadarPointToScreenSpace(screenSpacePlayer, radarSpacePlayer);
 
-		fMapCenterX = (-screenSpacePlayer.x) + SCREEN_WIDTH / 2;
-		fMapCenterY = (-screenSpacePlayer.y) + SCREEN_HEIGHT / 2;
+		m_fMapCenterX = (-screenSpacePlayer.x) + SCREEN_WIDTH / 2;
+		m_fMapCenterY = (-screenSpacePlayer.y) + SCREEN_HEIGHT / 2;
 		bMapMouseShownOnce = false;
 		bMapLoaded = true;
 
 		// Let's wait for a frame to not toggle the waypoint
 		if (CPad::GetPad(0)->NewState.Cross) {
-			bMenuMapActive = false;
+			m_bMenuMapActive = false;
 			return;
 		}
 	}
 
-	// Because fMapSize is half of the map length, and map consists of 3x3 tiles.
-	float halfTile = fMapSize / 3.0f;
+	// Because m_fMapSize is half of the map length, and map consists of 3x3 tiles.
+	float halfTile = m_fMapSize / 3.0f;
 
 	// Darken background a bit
 	CSprite2d::DrawRect(CRect(0, 0,
@@ -5607,49 +5207,49 @@ CMenuManager::PrintMap(void)
 
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aMapSprites[MAPTOP1].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY - fMapSize,
-			fMapCenterX - halfTile, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX - halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aMapSprites[MAPTOP2].Draw(CRect(fMapCenterX - halfTile, fMapCenterY - fMapSize,
-			fMapCenterX + halfTile, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aMapSprites[MAPTOP3].Draw(CRect(fMapCenterX + halfTile, fMapCenterY - fMapSize,
-			fMapCenterX + fMapSize, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aMapSprites[MAPMID1].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY - halfTile,
-			fMapCenterX - halfTile, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aMapSprites[MAPMID2].Draw(CRect(fMapCenterX - halfTile, fMapCenterY - halfTile,
-			fMapCenterX + halfTile, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aMapSprites[MAPMID3].Draw(CRect(fMapCenterX + halfTile, fMapCenterY - halfTile,
-			fMapCenterX + fMapSize, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aMapSprites[MAPBOT1].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY + halfTile,
-			fMapCenterX - halfTile, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY + halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aMapSprites[MAPBOT2].Draw(CRect(fMapCenterX - halfTile, fMapCenterY + halfTile,
-			fMapCenterX + halfTile, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aMapSprites[MAPBOT3].Draw(CRect(fMapCenterX + halfTile, fMapCenterY + halfTile,
-			fMapCenterX + fMapSize, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
 	CRadar::DrawBlips();
@@ -5673,34 +5273,35 @@ CMenuManager::PrintMap(void)
 		CRGBA(0, 0, 0, 150));
 
 	if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
-		if (mapPoint.y > fMapCenterY - fMapSize && mapPoint.y < fMapCenterY + fMapSize &&
-			mapPoint.x > fMapCenterX - fMapSize && mapPoint.x < fMapCenterX + fMapSize) {
+		if (mapPoint.y > m_fMapCenterY - m_fMapSize && mapPoint.y < m_fMapCenterY + m_fMapSize &&
+			mapPoint.x > m_fMapCenterX - m_fMapSize && mapPoint.x < m_fMapCenterX + m_fMapSize) {
 
-			float diffX = fMapCenterX - fMapSize, diffY = fMapCenterY - fMapSize;
-			float x = ((mapPoint.x - diffX) / (fMapSize * 2)) * 4000.0f - 2000.0f;
-			float y = 2000.0f - ((mapPoint.y - diffY) / (fMapSize * 2)) * 4000.0f;
+			// Don't ask me the meanings, I don't know. Found them by trying
+			float diffX = m_fMapCenterX - m_fMapSize, diffY = m_fMapCenterY - m_fMapSize;
+			float x = ((mapPoint.x - diffX) / (m_fMapSize * 2)) * (WORLD_SIZE_X / MENU_MAP_WIDTH_SCALE) - (WORLD_SIZE_X / 2 + MENU_MAP_LEFT_OFFSET * MENU_MAP_LENGTH_UNIT);
+			float y = (WORLD_SIZE_Y / 2 - MENU_MAP_TOP_OFFSET * MENU_MAP_LENGTH_UNIT) - ((mapPoint.y - diffY) / (m_fMapSize * 2)) * (WORLD_SIZE_Y / MENU_MAP_HEIGHT_SCALE);
 			CRadar::ToggleTargetMarker(x, y);
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 		}
 	}
 
 	if (CPad::GetPad(0)->GetLeftMouse()) {
-		fMapCenterX += m_nMousePosX - m_nMouseOldPosX;
-		fMapCenterY += m_nMousePosY - m_nMouseOldPosY;
+		m_fMapCenterX += m_nMousePosX - m_nMouseOldPosX;
+		m_fMapCenterY += m_nMousePosY - m_nMouseOldPosY;
 	} else if (CPad::GetPad(0)->GetLeft() || CPad::GetPad(0)->GetDPadLeft()) {
-		fMapCenterX += 15.0f;
+		m_fMapCenterX += 15.0f;
 	} else if (CPad::GetPad(0)->GetRight() || CPad::GetPad(0)->GetDPadRight()) {
-		fMapCenterX -= 15.0f;
+		m_fMapCenterX -= 15.0f;
 	} else if (CPad::GetPad(0)->GetLeftStickX()) {
-		fMapCenterX -= CPad::GetPad(0)->GetLeftStickX() / 128.0f * 20.0f;
+		m_fMapCenterX -= CPad::GetPad(0)->GetLeftStickX() / 128.0f * 20.0f;
 	}
 
 	if (CPad::GetPad(0)->GetUp() || CPad::GetPad(0)->GetDPadUp()) {
-		fMapCenterY += 15.0f;
+		m_fMapCenterY += 15.0f;
 	} else if (CPad::GetPad(0)->GetDown() || CPad::GetPad(0)->GetDPadDown()) {
-		fMapCenterY -= 15.0f;
+		m_fMapCenterY -= 15.0f;
 	} else if (CPad::GetPad(0)->GetLeftStickY()) {
-		fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
+		m_fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
 	}
 
 	if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) {
@@ -5715,25 +5316,26 @@ CMenuManager::PrintMap(void)
 			ZOOM(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, true);
 	}
 	
-	if (fMapCenterX - fMapSize > SCREEN_WIDTH / 2)
-		fMapCenterX = fMapSize + SCREEN_WIDTH / 2;
+	if (m_fMapCenterX - m_fMapSize > SCREEN_WIDTH / 2)
+		m_fMapCenterX = m_fMapSize + SCREEN_WIDTH / 2;
 
-	if (fMapCenterX + fMapSize < SCREEN_WIDTH / 2)
-		fMapCenterX = SCREEN_WIDTH / 2 - fMapSize;
+	if (m_fMapCenterX + m_fMapSize < SCREEN_WIDTH / 2)
+		m_fMapCenterX = SCREEN_WIDTH / 2 - m_fMapSize;
 
-	if (fMapCenterY + fMapSize < SCREEN_HEIGHT - MENU_Y(60.0f))
-		fMapCenterY = SCREEN_HEIGHT - MENU_Y(60.0f) - fMapSize;
+	if (m_fMapCenterY + m_fMapSize < SCREEN_HEIGHT - MENU_Y(60.0f))
+		m_fMapCenterY = SCREEN_HEIGHT - MENU_Y(60.0f) - m_fMapSize;
 	
-	fMapCenterY = Min(fMapCenterY, fMapSize); // To not show beyond north border
+	if (m_fMapCenterY - m_fMapSize > SCREEN_HEIGHT / 2)
+		m_fMapCenterY = SCREEN_HEIGHT / 2 + m_fMapSize;
 
-	bMenuMapActive = false;
+	m_bMenuMapActive = false;
 
 	// CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(5.0f)); // From VC
 	// CFont::SetRightJustifyWrap(10.0f);
 
 	CSprite2d::DrawRect(CRect(MENU_X(14.0f), SCREEN_STRETCH_FROM_BOTTOM(95.0f),
 		SCREEN_STRETCH_FROM_RIGHT(11.0f), SCREEN_STRETCH_FROM_BOTTOM(59.0f)),
-		CRGBA(235, 170, 50, 255));
+		CRGBA(MAPINFOBOX_COLOR.r, MAPINFOBOX_COLOR.g, MAPINFOBOX_COLOR.b, MAPINFOBOX_COLOR.a));
 
 	CFont::SetScale(MENU_X(0.4f), MENU_Y(0.7f));
 	CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
@@ -5794,9 +5396,7 @@ CMenuManager::ConstructStatLine(int rowIdx)
 
 	STAT_LINE("PL_STAT", nil, false, nil);
 
-	int percentCompleted = (CStats::TotalProgressInGame == 0 ? 0 :
-		CStats::ProgressMade * 100.0f / (CGame::nastyGame ? CStats::TotalProgressInGame : CStats::TotalProgressInGame - 1));
-	percentCompleted = Min(percentCompleted, 100);
+	int percentCompleted = CStats::GetPercentageProgress();
 
 	STAT_LINE("PER_COM", &percentCompleted, false, nil);
 	STAT_LINE("NMISON", &CStats::MissionsGiven, false, nil);
@@ -5970,4 +5570,3 @@ uint8 CMenuManager::GetNumberOfMenuOptions()
 
 #undef GetBackJustUp
 #undef GetBackJustDown
-#undef ChangeScreen
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index f992b5c8..afce0acd 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -7,30 +7,43 @@
 #define MENUHEADER_POS_Y 75.0f
 #define MENUHEADER_HEIGHT 1.3f
 #else
-#define MENUHEADER_POS_X 35.0f
-#define MENUHEADER_POS_Y 93.0f
-#define MENUHEADER_HEIGHT 1.6f
+#define MENUHEADER_POS_X 10.0f
+#define MENUHEADER_POS_Y 10.0f
+#define MENUHEADER_HEIGHT 2.0f
 #endif
-#define MENUHEADER_WIDTH 0.84f
+#define MENUHEADER_WIDTH 1.0f
+
+#define MENU_UNK_X_MARGIN 10.0f
+#define MENU_UNK_WIDTH 10.0f
 
-#define MENU_X_MARGIN 40.0f
-#define MENUACTION_POS_Y 60.0f
-#define MENUACTION_WIDTH 38.0f
 #define MENUACTION_SCALE_MULT 0.9f
 
-#define MENURADIO_ICON_SCALE 60.0f
+#define MENULABEL_X_MARGIN 80.0f
+#define MENULABEL_WIDTH 80.0f
+#define MENULABEL_POS_X 100.0f
+#define MENULABEL_POS_Y 97.0f
+
+#define MENU_DEFAULT_CONTENT_X 320
+#define MENU_DEFAULT_CONTENT_Y 100
+#define MENU_DEFAULT_LINE_HEIGHT 29
 
-#define MENUSLIDER_X 256.0f
-#define MENUSLIDER_UNK 256.0f
+#define MENURADIO_ICON_SCALE 60.0f
 
-#define BIGTEXT_X_SCALE 0.75f
-#define BIGTEXT_Y_SCALE 0.9f
-#define MEDIUMTEXT_X_SCALE 0.55f
-#define MEDIUMTEXT_Y_SCALE 0.8f
-#define SMALLTEXT_X_SCALE 0.45f
-#define SMALLTEXT_Y_SCALE 0.7f
-#define SMALLESTTEXT_X_SCALE 0.4f
-#define SMALLESTTEXT_Y_SCALE 0.6f
+#define MENUSLIDER_X 500.0f
+#define MENUSLIDER_UNK 100.0f
+#define MENUSLIDER_SMALLEST_BAR 8.0f
+#define MENUSLIDER_BIGGEST_BAR 25.0f
+
+#define BIGTEXT2_X_SCALE 0.6f
+#define BIGTEXT2_Y_SCALE 1.2f
+#define BIGTEXT_X_SCALE 0.6f
+#define BIGTEXT_Y_SCALE 1.0f
+#define MEDIUMTEXT_X_SCALE 0.48f
+#define MEDIUMTEXT_Y_SCALE 1.0f
+#define SMALLTEXT_X_SCALE 0.42f
+#define SMALLTEXT_Y_SCALE 0.9f
+#define SMALLESTTEXT_X_SCALE 0.3f
+#define SMALLESTTEXT_Y_SCALE 0.7f
 
 #define PLAYERSETUP_LIST_TOP 28.0f
 #define PLAYERSETUP_LIST_BOTTOM 125.0f
@@ -95,62 +108,41 @@ enum eLanguages
 #endif
 };
 
-enum eFrontendSprites
+enum
 {
-	FE2_MAINPANEL_UL,
-	FE2_MAINPANEL_UR,
-	FE2_MAINPANEL_DL,
-	FE2_MAINPANEL_DR,
-	FE2_MAINPANEL_DR2,
-	FE2_TABACTIVE,
-	FE_ICONBRIEF,
-	FE_ICONSTATS,
-	FE_ICONCONTROLS,
-	FE_ICONSAVE,
-	FE_ICONAUDIO,
-	FE_ICONDISPLAY,
-	FE_ICONLANGUAGE,
-	FE_CONTROLLER,
-	FE_CONTROLLERSH,
-	FE_ARROWS1,
-	FE_ARROWS2,
-	FE_ARROWS3,
-	FE_ARROWS4,
-	FE_RADIO1,
-	FE_RADIO2,
-	FE_RADIO3,
-	FE_RADIO4,
-	FE_RADIO5,
-	FE_RADIO6,
-	FE_RADIO7,
-	FE_RADIO8,
-	FE_RADIO9,
-
-	NUM_FE_SPRITES
+	MENUALIGN_LEFT = 1,
+	MENUALIGN_RIGHT,
+	MENUALIGN_CENTER,
 };
 
 enum eMenuSprites
 {
-	MENUSPRITE_CONNECTION,
-	MENUSPRITE_FINDGAME,
-	MENUSPRITE_HOSTGAME,
-	MENUSPRITE_MAINMENU,
-	MENUSPRITE_PLAYERSET,
-	MENUSPRITE_SINGLEPLAYER,
-	MENUSPRITE_MULTIPLAYER,
-	MENUSPRITE_DMALOGO,
-	MENUSPRITE_GTALOGO,
-	MENUSPRITE_RSTARLOGO,
-	MENUSPRITE_GAMESPY,
+	MENUSPRITE_BACKGROUND,
+	MENUSPRITE_VCLOGO,
 	MENUSPRITE_MOUSE,
-	MENUSPRITE_MOUSET,
-	MENUSPRITE_MP3LOGO,
+	MENUSPRITE_MAPTOP01,
+	MENUSPRITE_MAPTOP02,
+	MENUSPRITE_MAPTOP03,
+	MENUSPRITE_MAPMID01,
+	MENUSPRITE_MAPMID02,
+	MENUSPRITE_MAPMID03,
+	MENUSPRITE_MAPBOT01,
+	MENUSPRITE_MAPBOT02,
+	MENUSPRITE_MAPBOT03,
+	MENUSPRITE_WILDSTYLE,
+	MENUSPRITE_FLASH,
+	MENUSPRITE_KCHAT,
+	MENUSPRITE_FEVER,
+	MENUSPRITE_VROCK,
+	MENUSPRITE_VCPR,
+	MENUSPRITE_ESPANTOSO,
+	MENUSPRITE_EMOTION,
+	MENUSPRITE_WAVE,
+	MENUSPRITE_MP3,
 	MENUSPRITE_DOWNOFF,
 	MENUSPRITE_DOWNON,
 	MENUSPRITE_UPOFF,
 	MENUSPRITE_UPON,
-	MENUSPRITE_GTA3LOGO,
-	MENUSPRITE_UNUSED,
 	NUM_MENU_SPRITES
 };
 
@@ -169,86 +161,52 @@ enum eSaveSlot
 	SAVESLOT_LABEL = 36
 };
 
-#ifdef MENU_MAP
-enum MapSprites
-{
-	MAPMID1,
-	MAPMID2,
-	MAPMID3,
-	MAPBOT1,
-	MAPBOT2,
-	MAPBOT3,
-	MAPTOP1,
-	MAPTOP2,
-	MAPTOP3,
-	NUM_MAP_SPRITES
-};
-#endif
-
 enum eMenuScreen
 {
 	MENUPAGE_DISABLED = -1,
-	MENUPAGE_NONE = 0,
-	MENUPAGE_STATS = 1,
-	MENUPAGE_NEW_GAME = 2,
-	MENUPAGE_BRIEFS = 3,
-	MENUPAGE_CONTROLLER_SETTINGS = 4,
-	MENUPAGE_SOUND_SETTINGS = 5,
-	MENUPAGE_GRAPHICS_SETTINGS = 6,
-	MENUPAGE_LANGUAGE_SETTINGS = 7,
+	MENUPAGE_STATS = 0,
+	MENUPAGE_NEW_GAME = 1,
+	MENUPAGE_BRIEFS = 2,
+	MENUPAGE_SOUND_SETTINGS = 3,
+	MENUPAGE_GRAPHICS_SETTINGS = 4,
+	MENUPAGE_LANGUAGE_SETTINGS = 5,
+	MENUPAGE_MAP = 6,
+	MENUPAGE_NEW_GAME_RELOAD = 7,
 	MENUPAGE_CHOOSE_LOAD_SLOT = 8,
 	MENUPAGE_CHOOSE_DELETE_SLOT = 9,
-	MENUPAGE_NEW_GAME_RELOAD = 10,
-	MENUPAGE_LOAD_SLOT_CONFIRM = 11,
-	MENUPAGE_DELETE_SLOT_CONFIRM = 12,
-	MENUPAGE_NO_MEMORY_CARD = 13, // hud adjustment page in mobile
-	MENUPAGE_LOADING_IN_PROGRESS = 14,
-	MENUPAGE_DELETING_IN_PROGRESS = 15,
-	MENUPAGE_PS2_LOAD_FAILED = 16,
-	MENUPAGE_DELETE_FAILED = 17,
-	MENUPAGE_DEBUG_MENU = 18,
-	MENUPAGE_MEMORY_CARD_DEBUG = 19,
-	MENUPAGE_MEMORY_CARD_TEST = 20,
-	MENUPAGE_MULTIPLAYER_MAIN = 21,
-	MENUPAGE_PS2_SAVE_FAILED = 22,
-	MENUPAGE_PS2_SAVE_FAILED_2 = 23,
-	MENUPAGE_SAVE = 24,
-	MENUPAGE_NO_MEMORY_CARD_2 = 25,
-	MENUPAGE_CHOOSE_SAVE_SLOT = 26,
-	MENUPAGE_SAVE_OVERWRITE_CONFIRM = 27,
-	MENUPAGE_MULTIPLAYER_MAP = 28,
-	MENUPAGE_MULTIPLAYER_CONNECTION = 29,
-	MENUPAGE_MULTIPLAYER_FIND_GAME = 30,
-	MENUPAGE_MULTIPLAYER_MODE = 31,
-	MENUPAGE_MULTIPLAYER_CREATE = 32,
-	MENUPAGE_MULTIPLAYER_START = 33,
-	MENUPAGE_SKIN_SELECT_OLD = 34,
-	MENUPAGE_CONTROLLER_PC = 35,
-	MENUPAGE_CONTROLLER_PC_OLD1 = 36,
-	MENUPAGE_CONTROLLER_PC_OLD2 = 37,
-	MENUPAGE_CONTROLLER_PC_OLD3 = 38,
-	MENUPAGE_CONTROLLER_PC_OLD4 = 39,
-	MENUPAGE_CONTROLLER_DEBUG = 40,
-	MENUPAGE_OPTIONS = 41,
-	MENUPAGE_EXIT = 42,
-	MENUPAGE_SAVING_IN_PROGRESS = 43,
-	MENUPAGE_SAVE_SUCCESSFUL = 44,
-	MENUPAGE_DELETING = 45,
-	MENUPAGE_DELETE_SUCCESS = 46,
-	MENUPAGE_SAVE_FAILED = 47,
-	MENUPAGE_LOAD_FAILED = 48,
-	MENUPAGE_LOAD_FAILED_2 = 49,
-	MENUPAGE_FILTER_GAME = 50,
-	MENUPAGE_START_MENU = 51,
-	MENUPAGE_PAUSE_MENU = 52,
-	MENUPAGE_CHOOSE_MODE = 53,
-	MENUPAGE_SKIN_SELECT = 54,
-	MENUPAGE_KEYBOARD_CONTROLS = 55,
-	MENUPAGE_MOUSE_CONTROLS = 56,
-	MENUPAGE_MISSION_RETRY = 57,
-	MENUPAGE_58 = 58,
-#ifdef MENU_MAP
-	MENUPAGE_MAP = 59,
+	MENUPAGE_LOAD_SLOT_CONFIRM = 10,
+	MENUPAGE_DELETE_SLOT_CONFIRM = 11,
+	MENUPAGE_LOADING_IN_PROGRESS = 12,
+	MENUPAGE_DELETING_IN_PROGRESS = 13,
+	MENUPAGE_DELETE_SUCCESSFUL = 14,
+	MENUPAGE_CHOOSE_SAVE_SLOT = 15,
+	MENUPAGE_SAVE_OVERWRITE_CONFIRM = 16,
+	MENUPAGE_SAVING_IN_PROGRESS = 17,
+	MENUPAGE_SAVE_SUCCESSFUL = 18,
+	MENUPAGE_SAVE_CUSTOM_WARNING = 19,
+	MENUPAGE_SAVE_CHEAT_WARNING = 20,
+	MENUPAGE_SKIN_SELECT = 21,
+	MENUPAGE_SAVE_UNUSED = 22,
+	MENUPAGE_SAVE_FAILED = 23,
+	MENUPAGE_SAVE_FAILED_2 = 24,
+	MENUPAGE_LOAD_FAILED = 25,
+	MENUPAGE_CONTROLLER_PC = 26,
+	MENUPAGE_OPTIONS = 27,
+	MENUPAGE_EXIT = 28,
+	MENUPAGE_START_MENU = 29,
+	MENUPAGE_KEYBOARD_CONTROLS = 30,
+	MENUPAGE_MOUSE_CONTROLS = 31,
+	MENUPAGE_PAUSE_MENU = 32,
+	MENUPAGE_NONE = 33, // Then chooses main menu or pause menu 
+	MENUPAGE_OUTRO = 34,
+#ifdef LEGACY_MENU_OPTIONS
+	MENUPAGE_CONTROLLER_SETTINGS,
+	MENUPAGE_DEBUG_MENU,
+	MENUPAGE_CONTROLLER_PC_OLD1,
+	MENUPAGE_CONTROLLER_PC_OLD2,
+	MENUPAGE_CONTROLLER_PC_OLD3,
+	MENUPAGE_CONTROLLER_PC_OLD4,
+	MENUPAGE_CONTROLLER_DEBUG,
 #endif
 	MENUPAGES
 };
@@ -257,20 +215,19 @@ enum eMenuAction
 {
 	MENUACTION_NOTHING,
 	MENUACTION_LABEL,
+	MENUACTION_YES,
+	MENUACTION_NO,
 	MENUACTION_CHANGEMENU,
-	MENUACTION_CTRLVIBRATION,
-	MENUACTION_CTRLCONFIG,
-	MENUACTION_CTRLDISPLAY,
+	MENUACTION_UNK5,
+	MENUACTION_INVERTPADY,
 	MENUACTION_FRAMESYNC,
 	MENUACTION_FRAMELIMIT,
 	MENUACTION_TRAILS,
 	MENUACTION_SUBTITLES,
 	MENUACTION_WIDESCREEN,
 	MENUACTION_BRIGHTNESS,
-	MENUACTION_DRAWDIST,
 	MENUACTION_MUSICVOLUME,
 	MENUACTION_SFXVOLUME,
-	MENUACTION_UNK15,
 	MENUACTION_RADIO,
 	MENUACTION_LANG_ENG,
 	MENUACTION_LANG_FRE,
@@ -279,74 +236,32 @@ enum eMenuAction
 	MENUACTION_LANG_SPA,
 	MENUACTION_POPULATESLOTS_CHANGEMENU,
 	MENUACTION_CHECKSAVE,
-	MENUACTION_UNK24,
 	MENUACTION_NEWGAME,
+	MENUACTION_RESUME_FROM_SAVEZONE,
 	MENUACTION_RELOADIDE,
-	MENUACTION_RELOADIPL,
 	MENUACTION_SETDBGFLAG,
+	MENUACTION_LOADRADIO,
+	MENUACTION_SAVEGAME,
+
+	// Below this is TODO(Miami)
+	MENUACTION_DRAWDIST,
 	MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,
-	MENUACTION_PEDROADGROUPS,
-	MENUACTION_CARROADGROUPS,
 	MENUACTION_COLLISIONPOLYS,
-	MENUACTION_REGMEMCARD1,
-	MENUACTION_TESTFORMATMEMCARD1,
-	MENUACTION_TESTUNFORMATMEMCARD1,
-	MENUACTION_CREATEROOTDIR,
-	MENUACTION_CREATELOADICONS,
-	MENUACTION_FILLWITHGUFF,
-	MENUACTION_SAVEONLYTHEGAME,
-	MENUACTION_SAVEGAME,
-	MENUACTION_SAVEGAMEUNDERGTA,
-	MENUACTION_CREATECOPYPROTECTED,
-	MENUACTION_TESTSAVE,
-	MENUACTION_TESTLOAD,
-	MENUACTION_TESTDELETE,
+	MENUACTION_LEGENDS,
+	MENUACTION_RADARMODE,
+	MENUACTION_HUD,
+	MENUACTION_GOBACK,
+	MENUACTION_KEYBOARDCTRLS,
 	MENUACTION_PARSEHEAP,
-	MENUACTION_SHOWCULL,
-	MENUACTION_MEMCARDSAVECONFIRM,
-	MENUACTION_RESUME_FROM_SAVEZONE,
-	MENUACTION_UNK50,
+	// MENUACTION_MEMCARDSAVECONFIRM is that on VC enum??
 	MENUACTION_DEBUGSTREAM,
-	MENUACTION_MPMAP_LIBERTY,
-	MENUACTION_MPMAP_REDLIGHT,
-	MENUACTION_MPMAP_CHINATOWN,
-	MENUACTION_MPMAP_TOWER,
-	MENUACTION_MPMAP_SEWER,
-	MENUACTION_MPMAP_INDUSTPARK,
-	MENUACTION_MPMAP_DOCKS,
-	MENUACTION_MPMAP_STAUNTON,
-	MENUACTION_MPMAP_DEATHMATCH1,
-	MENUACTION_MPMAP_DEATHMATCH2,
-	MENUACTION_MPMAP_TEAMDEATH1,
-	MENUACTION_MPMAP_TEAMDEATH2,
-	MENUACTION_MPMAP_STASH,
-	MENUACTION_MPMAP_CAPTURE,
-	MENUACTION_MPMAP_RATRACE,
-	MENUACTION_MPMAP_DOMINATION,
-	MENUACTION_STARTMP,
-	MENUACTION_UNK69,
-	MENUACTION_UNK70,
-	MENUACTION_FINDMP,
-	MENUACTION_KEYBOARDCTRLS,
-	MENUACTION_UNK73,
-	MENUACTION_INITMP,
-	MENUACTION_MP_PLAYERCOLOR,
-	MENUACTION_MP_PLAYERNAME,
-	MENUACTION_MP_GAMENAME,
 	MENUACTION_GETKEY,
 	MENUACTION_SHOWHEADBOB,
 	MENUACTION_UNK80,
 	MENUACTION_INVVERT,
 	MENUACTION_CANCELGAME,
-	MENUACTION_MP_PLAYERNUMBER,
 	MENUACTION_MOUSESENS,
-	MENUACTION_CHECKMPGAMES,
-	MENUACTION_CHECKMPPING,
-	MENUACTION_MP_SERVER,
-	MENUACTION_MP_MAP,
-	MENUACTION_MP_GAMETYPE,
-	MENUACTION_MP_LAN,
-	MENUACTION_MP_INTERNET,
+	MENUACTION_MP3VOLUMEBOOST,
 	MENUACTION_RESUME,
 	MENUACTION_DONTCANCEL,
 	MENUACTION_SCREENRES,
@@ -356,22 +271,22 @@ enum eMenuAction
 	MENUACTION_RESTOREDEF,
 	MENUACTION_CTRLMETHOD,
 	MENUACTION_DYNAMICACOUSTIC,
-	MENUACTION_LOADRADIO,
 	MENUACTION_MOUSESTEER,
-	MENUACTION_UNK103,
-	MENUACTION_UNK104,
-	MENUACTION_UNK105,
-	MENUACTION_UNK106,
-	MENUACTION_UNK107,
-	MENUACTION_UNK108,
-	MENUACTION_UNK109,
 	MENUACTION_UNK110,
-	MENUACTION_UNK111,
-	MENUACTION_UNK112,
-	MENUACTION_REJECT_RETRY,
-	MENUACTION_UNK114,
-#ifdef CUSTOM_FRONTEND_OPTIONS
-	MENUACTION_TRIGGERFUNC
+#ifdef MORE_LANGUAGES
+	MENUACTION_LANG_PL,
+	MENUACTION_LANG_RUS,
+	MENUACTION_LANG_JAP,
+#endif
+#ifdef IMPROVED_VIDEOMODE
+	MENUACTION_SCREENMODE,
+#endif
+#ifdef FREE_CAM
+	MENUACTION_FREECAM,
+#endif
+#ifdef LEGACY_MENU_OPTIONS
+	MENUACTION_CTRLVIBRATION,
+	MENUACTION_CTRLCONFIG,
 #endif
 };
 
@@ -424,7 +339,11 @@ enum eCheckHover
 
 enum
 {
-	NUM_MENUROWS = 18,
+#ifdef LEGACY_MENU_OPTIONS
+	NUM_MENUROWS = 14,
+#else
+	NUM_MENUROWS = 12,
+#endif
 };
 
 enum eControlMethod
@@ -458,82 +377,210 @@ struct BottomBarOption
 struct CMenuScreen
 {
 	char m_ScreenName[8];
-	int32 unk; // 2 on MENUPAGE_MULTIPLAYER_START, 1 on everywhere else
-	int32 m_PreviousPage[2]; // eMenuScreen
-	int32 m_ParentEntry[2]; // row
+	int32 m_PreviousPage; // eMenuScreen
+	int32 m_ParentEntry; // row
 
 	struct CMenuEntry
 	{
 		int32 m_Action; // eMenuAction
 		char m_EntryName[8];
 		int32 m_SaveSlot; // eSaveSlot
-		int32 m_TargetMenu; // eMenuScreen // FrontendOption ID if it's a custom option
+		int32 m_TargetMenu; // eMenuScreen
+		uint16 m_X;
+		uint16 m_Y;
+		uint8 m_Align;
 	} m_aEntries[NUM_MENUROWS];
 };
 
+struct MenuTrapezoid
+{
+	float topLeft_x;
+	float topLeft_y;
+	float topRight_x;
+	float topRight_y;
+	float bottomLeft_x;
+	float bottomLeft_y;
+	float bottomRight_x;
+	float bottomRight_y;
+	float old_topRight_x;
+	float old_topRight_y;
+	float old_topLeft_x;
+	float old_topLeft_y;
+	float old_bottomLeft_x;
+	float old_bottomLeft_y;
+	float old_bottomRight_x;
+	float old_bottomRight_y;
+	float mult_topRight_x;
+	float mult_topRight_y;
+	float mult_topLeft_x;
+	float mult_topLeft_y;
+	float mult_bottomLeft_x;
+	float mult_bottomLeft_y;
+	float mult_bottomRight_x;
+	float mult_bottomRight_y;
+
+	MenuTrapezoid(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4) {
+		topLeft_x = x1;
+		topLeft_y = y1;
+		topRight_x = x2;
+		topRight_y = y2;
+		bottomLeft_x = x3;
+		bottomLeft_y = y3;
+		bottomRight_x = x4;
+		bottomRight_y = y4;
+	};
+
+	void SaveCurrentCoors() {
+		old_topLeft_x = topLeft_x;
+		old_topLeft_y = topLeft_y;
+		old_topRight_x = topRight_x;
+		old_topRight_y = topRight_y;
+		old_bottomLeft_x = bottomLeft_x;
+		old_bottomLeft_y = bottomLeft_y;
+		old_bottomRight_x = bottomRight_x;
+		old_bottomRight_y = bottomRight_y;
+	}
+
+	void Translate(int delta) {
+		bottomRight_x = delta * mult_bottomRight_x + old_bottomRight_x;
+		bottomRight_y = delta * mult_bottomRight_y + old_bottomRight_y;
+		bottomLeft_x = delta * mult_bottomLeft_x + old_bottomLeft_x;
+		bottomLeft_y = delta * mult_bottomLeft_y + old_bottomLeft_y;
+		topRight_x = delta * mult_topRight_x + old_topRight_x;
+		topRight_y = delta * mult_topRight_y + old_topRight_y;
+		topLeft_x = delta * mult_topLeft_x + old_topLeft_x;
+		topLeft_y = delta * mult_topLeft_y + old_topLeft_y;
+	}
+
+	void UpdateMultipliers() {
+		mult_bottomRight_x = (bottomRight_x - old_bottomRight_x) / 255.0f;
+		mult_bottomRight_y = (bottomRight_y - old_bottomRight_y) / 255.0f;
+		mult_bottomLeft_x = (bottomLeft_x - old_bottomLeft_x) / 255.0f;
+		mult_bottomLeft_y = (bottomLeft_y - old_bottomLeft_y) / 255.0f;
+		mult_topRight_x = (topRight_x - old_topRight_x) / 255.0f;
+		mult_topRight_y = (topRight_y - old_topRight_y) / 255.0f;
+		mult_topLeft_x = (topLeft_x - old_topLeft_x) / 255.0f;
+		mult_topLeft_y = (topLeft_y - old_topLeft_y) / 255.0f;
+	}
+};
+
 class CMenuManager
 {
 public:
-	int32 m_nPrefsVideoMode;
-	int32 m_nDisplayVideoMode;
+	int8 m_StatsScrollDirection;
+	float m_StatsScrollSpeed;
+	uint8 field_8;
+	bool m_PrefsUseVibration;
+	bool m_PrefsShowHud;
+	int32 m_PrefsRadarMode;
+	uint8 field_10;
+	bool m_bShutDownFrontEndRequested;
+	bool m_bStartUpFrontEndRequested;
+	int32 m_KeyPressedCode;
+	int32 m_PrefsBrightness;
+	float m_PrefsLOD;
+	int8 m_PrefsShowSubtitles;
+	int8 m_PrefsShowLegends;
+	int8 m_PrefsUseWideScreen;
+	int8 m_PrefsVsync; // TODO(Miami): Are we sure?
+	int8 m_PrefsVsyncDisp;
+	int8 m_PrefsFrameLimiter;
 	int8 m_nPrefsAudio3DProviderIndex;
-	bool m_bKeyChangeNotProcessed;
-	char m_aSkinName[256];
-	int32 m_nHelperTextMsgId;
-	bool m_bLanguageLoaded;
+	int8 m_PrefsSpeakers;
+	int8 m_PrefsDMA;
+	uint8 m_PrefsSfxVolume;
+	uint8 m_PrefsMusicVolume;
+	uint8 m_PrefsRadioStation;
+	uint8 field_2C;
+	int32 m_nCurrOption;
+	bool m_bQuitGameNoCD;
+	bool m_bMenuMapActive;
+	bool m_AllowNavigation;
+	uint8 field_37;
 	bool m_bMenuActive;
-	bool m_bMenuStateChanged;
-	bool m_bWaitingForNewKeyBind;
 	bool m_bWantToRestart;
 	bool m_bFirstTime;
-	bool m_bGameNotLoaded;
-	int32 m_nMousePosX;
-	int32 m_nMousePosY;
+	bool m_bActivateSaveMenu;
+	bool m_bWantToLoad;
+	float m_fMapSize;
+	float m_fMapCenterX;
+	float m_fMapCenterY;
+	uint32 OS_Language;
+	int32 m_PrefsLanguage;
+	int32 field_54;
+	int8 m_bLanguageLoaded;
+	uint8 m_PrefsAllowNastyGame;
+	uint8 m_PrefsMP3BoostVolume;
+	uint8 m_ControlMethod;
+	int32 m_nPrefsVideoMode;
+	int32 m_nDisplayVideoMode;
 	int32 m_nMouseTempPosX;
 	int32 m_nMouseTempPosY;
-	bool m_bShowMouse;
-	tSkinInfo m_pSkinListHead;
-	tSkinInfo *m_pSelectedSkin;
-	int32 m_nFirstVisibleRowOnList;
-	float m_nScrollbarTopMargin;
-	int32 m_nTotalListRow;
-	int32 m_nSkinsTotal;
- char _unk0[4];
-	int32 m_nSelectedListRow;
-	bool m_bSkinsEnumerated;
-	bool m_bQuitGameNoCD;
- bool m_bRenderGameInMenu;
-	bool m_bSaveMenuActive;
-	bool m_bWantToLoad;
- char field_455;
-	bool m_bStartWaitingForKeyBind;
+	bool m_bGameNotLoaded;
+	int8 m_lastWorking3DAudioProvider;
+	bool m_bFrontEnd_ReloadObrTxtGxt;
+	int32 *pEditString;
+	uint8 field_74[4];
+	int32 *pControlEdit;
+	bool m_OnlySaveMenu;
+	int32 m_menuTransitionProgress;
+	CSprite2d m_aFrontEndSprites[NUM_MENU_SPRITES];
 	bool m_bSpritesLoaded;
-	CSprite2d m_aFrontEndSprites[NUM_FE_SPRITES];
-	CSprite2d m_aMenuSprites[NUM_MENU_SPRITES];
- int32 field_518;
+	int32 field_F0;
+	int32 m_LastRadioScrollDir;
+	int32 m_nCurrScreen;
+	int32 m_nPrevScreen;
+	int32 m_nCurrSaveSlot;
+	uint32 m_LastScreenSwitch;
 	int32 m_nMenuFadeAlpha;
+	int32 m_nOptionHighlightTransitionBlend;
+	bool bMenuChangeOngoing;
+	int32 MouseButtonJustClicked;
+	int32 JoyButtonJustClicked;
+	bool DisplayComboButtonErrMsg;
+	bool m_NoEmptyBinding;
+	bool m_ShowEmptyBindingError;
+	int32 m_nHelperTextAlpha;
 	bool m_bPressedPgUpOnList;
 	bool m_bPressedPgDnOnList;
 	bool m_bPressedUpOnList;
 	bool m_bPressedDownOnList;
 	bool m_bPressedScrollButton;
-	int32 m_CurrCntrlAction;
- char _unk1[4];
- int32 m_nSelectedContSetupColumn;
-	 bool m_bKeyIsOK;
- bool field_535;
-	int8 m_nCurrExLayer;
-	int32 m_nHelperTextAlpha;
+	uint8 field_129;
+	uint8 field_12A;
+	uint8 field_12B;
+	int32 m_nMousePosX;
+	int32 m_nMousePosY;
 	int32 m_nMouseOldPosX;
 	int32 m_nMouseOldPosY;
 	int32 m_nHoverOption;
-	int32 m_nCurrScreen;
-	int32 m_nCurrOption;
+	bool m_bShowMouse;
 	int32 m_nPrevOption;
-	int32 m_nPrevScreen;
- uint32 field_558;
-	int32 m_nCurrSaveSlot;
-	int32 m_nScreenChangeDelayTimer;
+	bool m_bStartWaitingForKeyBind;
+	bool m_bWaitingForNewKeyBind;
+	bool m_bKeyChangeNotProcessed;
+	int32 m_CurrCntrlAction;
+	uint8 field_150;
+	uint8 field_151;
+	uint8 field_152;
+	uint8 field_153;
+	int32 m_nSelectedContSetupColumn;
+	bool m_bKeyIsOK;
+	bool field_159;
+	uint8 m_nCurrExLayer;
+	char m_PrefsSkinFile[256];
+	char m_aSkinName[256];
+	uint8 field_35B;
+	int32 m_nHelperTextMsgId;
+	tSkinInfo m_pSkinListHead;
+	tSkinInfo *m_pSelectedSkin;
+	int32 m_nFirstVisibleRowOnList;
+	float m_nScrollbarTopMargin;
+	int32 m_nTotalListRow;
+	int32 m_nSkinsTotal;
+	uint8 field_67C[4];
+	int32 m_nSelectedListRow;
+	bool m_bSkinsEnumerated;
 
 #ifdef IMPROVED_VIDEOMODE
 	int32 m_nPrefsWidth;
@@ -544,123 +591,78 @@ public:
 	int32 m_nSelectedScreenMode;
 #endif
 
-public:
 	bool GetIsMenuActive() {return !!m_bMenuActive;}
 
-public:
-	static int32 OS_Language;
-	static int8 m_PrefsUseVibration;
-	static int8 m_DisplayControllerOnFoot;
-	static int8 m_PrefsUseWideScreen;
-	static int8 m_PrefsRadioStation;
-	static int8 m_PrefsVsync;
-	static int8 m_PrefsVsyncDisp;
-	static int8 m_PrefsFrameLimiter;
-	static int8 m_PrefsShowSubtitles;
-	static int8 m_PrefsSpeakers;
-	static int32 m_ControlMethod;
-	static int8 m_PrefsDMA;
-	static int32 m_PrefsLanguage;
-	static int32 m_PrefsBrightness;
-	static float m_PrefsLOD;
-	static int8 m_bFrontEnd_ReloadObrTxtGxt;
-	static int32 m_PrefsMusicVolume;
-	static int32 m_PrefsSfxVolume;
-	static char m_PrefsSkinFile[256];
-	static int32 m_KeyPressedCode;
-
-	static bool m_bStartUpFrontEndRequested;
-	static bool m_bShutDownFrontEndRequested;
-	static bool m_PrefsAllowNastyGame;
-	
 	static uint8 m_PrefsStereoMono;
-	static int32 m_SelectedMap;
-	static int32 m_SelectedGameType;
-	static uint8 m_PrefsPlayerRed;
-	static uint8 m_PrefsPlayerGreen;
-	static uint8 m_PrefsPlayerBlue;
 
 #ifndef MASTER
 	static bool m_PrefsMarketing;
 	static bool m_PrefsDisableTutorials;
 #endif // !MASTER
 
-#ifdef MENU_MAP
-	static bool bMenuMapActive;
-	static bool bMapMouseShownOnce;
-	static bool bMapLoaded;
-	static float fMapSize;
-	static float fMapCenterY;
-	static float fMapCenterX;
-	static CSprite2d m_aMapSprites[NUM_MAP_SPRITES];
+	CMenuManager(void);
+	~CMenuManager(void) { UnloadTextures(); }
+	
+	void Initialise();
 	void PrintMap();
-#endif
-
-public:
+	void SetFrontEndRenderStates();
 	static void BuildStatLine(Const char *text, void *stat, bool itsFloat, void *stat2);
 	static void CentreMousePointer();
 	void CheckCodesForControls(int);
 	bool CheckHover(int x1, int x2, int y1, int y2);
 	void CheckSliderMovement(int);
-	int CostructStatLine(int);
 	void DisplayHelperText();
-	int DisplaySlider(float, float, float, float, float, float);
+	int DisplaySlider(float, float, float, float, float, float, float);
 	void DoSettingsBeforeStartingAGame();
-	void Draw();
+	void DrawStandardMenus(bool);
 	void DrawControllerBound(int32, int32, int32, int8);
 	void DrawControllerScreenExtraText(int, int, int);
 	void DrawControllerSetupScreen();
+	void DrawQuitGameScreen();
 	void DrawFrontEnd();
-	void DrawFrontEndNormal();
-#ifdef PS2_SAVE_DIALOG
-	void DrawFrontEndSaveZone();
-#endif
+	void DrawBackground(bool transitionCall);
 	void DrawPlayerSetupScreen();
 	int FadeIn(int alpha);
 	void FilterOutColorMarkersFromString(wchar*, CRGBA &);
 	int GetStartOptionsCntrlConfigScreens();
-	static void InitialiseChangedLanguageSettings();
+	void InitialiseChangedLanguageSettings();
 	void LoadAllTextures();
 	void LoadSettings();
-	void MessageScreen(const char *);
-	void PickNewPlayerColour();
+	void MessageScreen(const char *str, bool);
+	void SmallMessageScreen(const char *str);
 	void PrintBriefs();
 	static void PrintErrorMessage();
 	void PrintStats();
 	void Process();
 	void ProcessButtonPresses();
+	void ProcessFileActions();
 	void ProcessOnOffMenuOptions();
-	static void RequestFrontEndShutDown();
-	static void RequestFrontEndStartUp();
+	void RequestFrontEndShutDown();
+	void RequestFrontEndStartUp();
 	void ResetHelperText();
-	void SaveLoadFileError_SetUpErrorScreen();
 	void SaveSettings();
 	void SetHelperText(int text);
-	void ShutdownJustMenu();
 	float StretchX(float);
 	float StretchY(float);
 	void SwitchMenuOnAndOff();
 	void UnloadTextures();
 	void WaitForUserCD();
-	void PrintController();
 	int GetNumOptionsCntrlConfigScreens();
 	int ConstructStatLine(int);
+	void SwitchToNewScreen(int8);
 
-	// Those are either inlined in game, not in function yet, or I can't believe that they're not inlined.
-	// Names were made up by me.
-	void ThingsToDoBeforeGoingBack();
+	// New (not in function or inlined in the game)
+	void ThingsToDoBeforeLeavingPage();
 	void ScrollUpListByOne();
 	void ScrollDownListByOne();
 	void PageUpList(bool);
 	void PageDownList(bool);
-	int8 GetPreviousPageOption();
 	
 	// uint8 GetNumberOfMenuOptions();
 };
 
 #ifndef IMPROVED_VIDEOMODE
-VALIDATE_SIZE(CMenuManager, 0x564);
+VALIDATE_SIZE(CMenuManager, 0x688);
 #endif
 
 extern CMenuManager FrontEndMenuManager;
-extern CMenuScreen aScreens[];
\ No newline at end of file
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 7983a7c3..3f75b46b 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -64,6 +64,7 @@
 #include "Script.h"
 #include "Shadows.h"
 #include "Skidmarks.h"
+#include "SetPieces.h"
 #include "SpecialFX.h"
 #include "Sprite2d.h"
 #include "Stats.h"
@@ -84,10 +85,11 @@
 #include "World.h"
 #include "ZoneCull.h"
 #include "Zones.h"
+#include "Occlusion.h"
 #include "debugmenu.h"
-#include "frontendoption.h"
 
 eLevelName CGame::currLevel;
+int32 CGame::currArea;
 bool CGame::bDemoMode = true;
 bool CGame::nastyGame = true;
 bool CGame::frenchGame;
@@ -218,20 +220,20 @@ bool CGame::InitialiseOnceAfterRW(void)
 
 	if ( FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -99 || FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -2 )
 	{
-		CMenuManager::m_PrefsSpeakers = 0;
+		FrontEndMenuManager.m_PrefsSpeakers = 0;
 		int8 provider = DMAudio.AutoDetect3DProviders();
 		if ( provider != -1 )
 			FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = provider;
 	}
 
 	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
-	DMAudio.SetSpeakerConfig(CMenuManager::m_PrefsSpeakers);
-	DMAudio.SetDynamicAcousticModelingStatus(CMenuManager::m_PrefsDMA);
-	DMAudio.SetMusicMasterVolume(CMenuManager::m_PrefsMusicVolume);
-	DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
+	DMAudio.SetSpeakerConfig(FrontEndMenuManager.m_PrefsSpeakers);
+	DMAudio.SetDynamicAcousticModelingStatus(FrontEndMenuManager.m_PrefsDMA);
+	DMAudio.SetMusicMasterVolume(FrontEndMenuManager.m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
 	DMAudio.SetEffectsFadeVol(127);
 	DMAudio.SetMusicFadeVol(127);
-	CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
+	CWorld::Players[0].SetPlayerSkin(FrontEndMenuManager.m_PrefsSkinFile);
 
 #ifdef CUSTOM_FRONTEND_OPTIONS
 	CustomFrontendOptionsPopulate();
@@ -253,7 +255,7 @@ bool CGame::Initialise(const char* datFile)
 	strcpy(aDatFile, datFile);
 	CPools::Initialise();
 	CIniFile::LoadIniFile();
-	currLevel = LEVEL_INDUSTRIAL;
+	currLevel = LEVEL_BEACH;
 	LoadingScreen("Loading the Game", "Loading generic textures", GetRandomSplashScreen());
 	gameTxdSlot = CTxdStore::AddTxdSlot("generic");
 	CTxdStore::Create(gameTxdSlot);
@@ -273,7 +275,9 @@ bool CGame::Initialise(const char* datFile)
 	ThePaths.AllocatePathFindInfoMem(4500);
 	CWeather::Init();
 	CCullZones::Init();
+	COcclusion::Init();
 	CCollision::Init();
+	CSetPieces::Init();
 	CTheZones::Init();
 	CUserDisplay::Init();
 	CMessages::Init();
@@ -303,12 +307,11 @@ bool CGame::Initialise(const char* datFile)
 	CWorld::Players[0].LoadPlayerSkin();
 	TestModelIndices();
 	LoadingScreen("Loading the Game", "Setup water", nil);
-	CWaterLevel::Initialise("DATA\\WATER.DAT");
+	WaterLevelInitialise("DATA\\WATER.DAT");
 	TheConsole.Init();
 	CDraw::SetFOV(120.0f);
 	CDraw::ms_fLODDistance = 500.0f;
 	LoadingScreen("Loading the Game", "Setup streaming", nil);
-	CStreaming::Init();
 	CStreaming::LoadInitialVehicles();
 	CStreaming::LoadInitialPeds();
 	CStreaming::RequestBigBuildings(LEVEL_NONE);
@@ -316,6 +319,7 @@ bool CGame::Initialise(const char* datFile)
 	printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
 	LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
 	CAnimManager::LoadAnimFiles();
+	CStreaming::LoadInitialWeapons();
 	CPed::Initialise();
 	CRouteNode::Initialise();
 	CEventList::Initialise();
@@ -356,10 +360,7 @@ bool CGame::Initialise(const char* datFile)
 	CWaterCannons::Init();
 	CBridge::Init();
 	CGarages::Init();
-	LoadingScreen("Loading the Game", "Position dynamic objects", nil);
-	CWorld::RepositionCertainDynamicObjects();
 	LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
-	CCullZones::ResolveVisibilities();
 	CTrain::InitTrains();
 	CPlane::InitPlanes();
 	CCredits::Init();
@@ -370,7 +371,6 @@ bool CGame::Initialise(const char* datFile)
 	CTheScripts::Process();
 	TheCamera.Process();
 	LoadingScreen("Loading the Game", "Load scene", nil);
-	CModelInfo::RemoveColModelsFromOtherLevels(currLevel);
 	CCollision::ms_collisionInMemory = currLevel;
 	for (int i = 0; i < MAX_PADS; i++)
 		CPad::GetPad(i)->Clear(true);
@@ -476,7 +476,6 @@ void CGame::ReInitGameObjectVariables(void)
 	CSpecialFX::Init();
 	CWaterCannons::Init();
 	CParticle::ReloadConfig();
-	CCullZones::ResolveVisibilities();
 
 	if ( !FrontEndMenuManager.m_bWantToLoad )
 	{
@@ -494,24 +493,7 @@ void CGame::ReInitGameObjectVariables(void)
 
 void CGame::ReloadIPLs(void)
 {
-	CTimer::Stop();
-	CWorld::RemoveStaticObjects();
-	ThePaths.Init();
-	CCullZones::Init();
-	CFileLoader::ReloadPaths("GTA3.IDE");
-	CFileLoader::LoadScene("INDUST.IPL");
-	CFileLoader::LoadScene("COMMER.IPL");
-	CFileLoader::LoadScene("SUBURBAN.IPL");
-	CFileLoader::LoadScene("CULL.IPL");
-	ThePaths.PreparePathData();
-	CTrafficLights::ScanForLightsOnMap();
-	CRoadBlocks::Init();
-	CCranes::InitCranes();
-	CGarages::Init();
-	CWorld::RepositionCertainDynamicObjects();
-	CCullZones::ResolveVisibilities();
-	CRenderer::SortBIGBuildings();
-	CTimer::Update();
+	// Empty and unused
 }
 
 void CGame::ShutDownForRestart(void)
@@ -527,6 +509,7 @@ void CGame::ShutDownForRestart(void)
 	CTheScripts::UndoBuildingSwaps();
 	CTheScripts::UndoEntityInvisibilitySettings();
 	CWorld::ClearForRestart();
+	CGameLogic::ClearShortCut();
 	CTimer::Shutdown();
 	CStreaming::FlushRequestList();
 	CStreaming::DeleteAllRwObjects();
@@ -535,6 +518,7 @@ void CGame::ShutDownForRestart(void)
 	CRadar::RemoveRadarSections();
 	FrontEndMenuManager.UnloadTextures();
 	CParticleObject::RemoveAllParticleObjects();
+	CSetPieces::Init();
 	CPedType::Shutdown();
 	CSpecialFX::Shutdown();
 	TidyUpMemory(true, false);
@@ -547,7 +531,14 @@ void CGame::InitialiseWhenRestarting(void)
 	
 	CTimer::Initialise();
 	CSprite2d::SetRecipNearClip();
-	
+
+	if (b_FoundRecentSavedGameWantToLoad || FrontEndMenuManager.m_bWantToLoad)
+	{
+		LoadSplash("splash1");
+		if (FrontEndMenuManager.m_bWantToLoad)
+			FrontEndMenuManager.MessageScreen("FELD_WR", true);
+	}
+
 	b_FoundRecentSavedGameWantToLoad = false;
 	
 	TheCamera.Init();
@@ -573,7 +564,7 @@ void CGame::InitialiseWhenRestarting(void)
 			for ( int32 i = 0; i < 50; i++ )
 			{
 				HandleExit();
-				FrontEndMenuManager.MessageScreen("FED_LFL"); // Loading save game has failed. The game will restart now. 
+				FrontEndMenuManager.MessageScreen("FED_LFL", true); // Loading save game has failed. The game will restart now. 
 			}
 			
 			ShutDownForRestart();
@@ -581,7 +572,7 @@ void CGame::InitialiseWhenRestarting(void)
 			CTimer::Initialise();
 			FrontEndMenuManager.m_bWantToLoad = false;
 			ReInitGameObjectVariables();
-			currLevel = LEVEL_INDUSTRIAL;
+			currLevel = LEVEL_NONE;
 			CCollision::SortOutCollisionAfterLoad();
 		}
 	}
@@ -628,6 +619,7 @@ void CGame::Process(void)
 		CAntennas::Update();
 		CGlass::Update();
 		CSceneEdit::Update();
+		CSetPieces::Update();
 		CEventList::Update();
 		CParticle::Update();
 		gFireManager.Update();
@@ -670,6 +662,30 @@ void CGame::Process(void)
 	}
 }
 
+void
+CGame::InitAfterFocusLoss()
+{
+	FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = FrontEndMenuManager.m_lastWorking3DAudioProvider;
+	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_lastWorking3DAudioProvider);
+
+	if (!FrontEndMenuManager.m_bGameNotLoaded && !FrontEndMenuManager.m_bMenuActive)
+		FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
+}
+
+bool
+CGame::CanSeeWaterFromCurrArea(void)
+{
+	return currArea == AREA_MAIN_MAP || currArea == AREA_MANSION
+		|| currArea == AREA_HOTEL;
+}
+
+bool
+CGame::CanSeeOutSideFromCurrArea(void)
+{
+	return currArea == AREA_MAIN_MAP || currArea == AREA_MALL || 
+		currArea == AREA_MANSION || currArea == AREA_HOTEL;
+}
+
 void CGame::DrasticTidyUpMemory(bool)
 {
 #ifdef PS2
diff --git a/src/core/Game.h b/src/core/Game.h
index 48f31abc..49a3e67c 100644
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -3,15 +3,37 @@
 enum eLevelName {
 	LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel
 	LEVEL_NONE = 0,
-	LEVEL_INDUSTRIAL,
-	LEVEL_COMMERCIAL,
-	LEVEL_SUBURBAN
+	LEVEL_BEACH,
+	LEVEL_MAINLAND
+};
+
+enum eAreaName {
+	AREA_MAIN_MAP,
+	AREA_HOTEL,
+	AREA_MANSION,
+	AREA_BANK,
+	AREA_MALL,
+	AREA_STRIP_CLUB,
+	AREA_LAWYERS,
+	AREA_COFFEE_SHOP,
+	AREA_CONCERT_HALL,
+	AREA_STUDIO,
+	AREA_RIFLE_RANGE,
+	AREA_BIKER_BAR,
+	AREA_POLICE_STATION,
+	AREA_EVERYWHERE,
+	AREA_DIRT,
+	AREA_BLOOD,
+	AREA_OVALRING,
+	AREA_MALIBU_CLUB,
+	AREA_PRINT_WORKS
 };
 
 class CGame
 {
 public:
 	static eLevelName currLevel;
+	static int32 currArea;
 	static bool bDemoMode;
 	static bool nastyGame;
 	static bool frenchGame;
@@ -36,9 +58,17 @@ public:
 	static void ShutDownForRestart(void);
 	static void InitialiseWhenRestarting(void);
 	static void Process(void);
+
+	static void InitAfterFocusLoss(void);
+
+	static bool IsInInterior(void) { return currArea != AREA_MAIN_MAP; }
+	static bool CanSeeWaterFromCurrArea(void);
+	static bool CanSeeOutSideFromCurrArea(void);
 	
 	// NB: these do something on PS2
 	static void TidyUpMemory(bool, bool);
 	static void DrasticTidyUpMemory(bool);
 	static void ProcessTidyUpMemory(void);
 };
+
+inline bool IsAreaVisible(int area) { return area == CGame::currArea || area == AREA_EVERYWHERE; }
diff --git a/src/core/General.h b/src/core/General.h
index 7ffa99de..3188d82b 100644
--- a/src/core/General.h
+++ b/src/core/General.h
@@ -145,4 +145,6 @@ public:
 		
 	static int32 GetRandomNumberInRange(int32 low, int32 high)
 		{ return low + (high - low)*(GetRandomNumber()/float(MYRAND_MAX + 1)); }
+	static void SetRandomSeed(int32 seed)
+		{ mysrand(seed); }
 };
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
deleted file mode 100644
index 7b66a27a..00000000
--- a/src/core/MenuScreens.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-#include "common.h"
-#include "Frontend.h"
-
-// If you want to add new options, please don't do that here and see CustomFrontendOptionsPopulate in re3.cpp.
-
-CMenuScreen aScreens[] = {
-	// MENUPAGE_NONE = 0
-	{ "", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0, },
-
-	// MENUPAGE_STATS = 1
-	{ "FET_STA", 1, MENUPAGE_NONE, MENUPAGE_NONE, 5, 2,
-		MENUACTION_CHANGEMENU, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_NEW_GAME = 2
-	{ "FET_SGA", 1, MENUPAGE_NONE, MENUPAGE_NONE, 0, 1,
-		MENUACTION_CHANGEMENU, "FES_SNG", SAVESLOT_NONE, MENUPAGE_NEW_GAME_RELOAD,
-		MENUACTION_POPULATESLOTS_CHANGEMENU, "GMLOAD",  SAVESLOT_NONE, MENUPAGE_CHOOSE_LOAD_SLOT,
-		MENUACTION_POPULATESLOTS_CHANGEMENU, "FES_DGA", SAVESLOT_NONE, MENUPAGE_CHOOSE_DELETE_SLOT,
-		MENUACTION_CHANGEMENU, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_BRIEFS = 3
-	{ "FET_BRE", 1, MENUPAGE_NONE, MENUPAGE_NONE, 6, 3,
-		MENUACTION_CHANGEMENU, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_CONTROLLER_SETTINGS = 4
-	{ "FET_CON", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 0, 0,
-		MENUACTION_CTRLCONFIG,		"FEC_CCF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS,
-		MENUACTION_CTRLDISPLAY,		"FEC_CDP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS,
-		MENUACTION_CTRLVIBRATION,	"FEC_VIB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS,
-		MENUACTION_CHANGEMENU,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_SOUND_SETTINGS = 5
-	{ "FET_AUD", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 1, 1,
-		MENUACTION_MUSICVOLUME,		"FEA_MUS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_SFXVOLUME,		"FEA_SFX", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_AUDIOHW,			"FEA_3DH", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_SPEAKERCONF,		"FEA_SPK", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_DYNAMICACOUSTIC,	"FET_DAM", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_RADIO,			"FEA_RSS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_RESTOREDEF,		"FET_DEF", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_CHANGEMENU,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_GRAPHICS_SETTINGS = 6
-	{ "FET_DIS", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 2, 2,
-		MENUACTION_BRIGHTNESS,	"FED_BRI", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_DRAWDIST,	"FEM_LOD", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_FRAMESYNC,	"FEM_VSC", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_FRAMELIMIT,	"FEM_FRM", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_TRAILS,		"FED_TRA", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_SUBTITLES,	"FED_SUB", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_WIDESCREEN,	"FED_WIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_SCREENRES,	"FED_RES", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_LANGUAGE_SETTINGS = 7
-	{ "FET_LAN", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 3, 3,
-		MENUACTION_LANG_ENG,	"FEL_ENG", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_LANG_FRE,	"FEL_FRE", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_LANG_SPA,    "FEL_SPA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
-	{ "FET_LG", 1, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, 1, 1,
-		MENUACTION_CHANGEMENU,	"FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHECKSAVE,	"FEM_SL0", SAVESLOT_1,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_2,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_3,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_4,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_5,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_6,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_7,		MENUPAGE_LOAD_SLOT_CONFIRM,
-		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_8,		MENUPAGE_LOAD_SLOT_CONFIRM,
-	},
-
-	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
-	{ "FET_DG", 1, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, 2, 2,
-		MENUACTION_CHANGEMENU,	"FESZ_CA",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_CHANGEMENU,	"FEM_SL0",	SAVESLOT_1,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL1",	SAVESLOT_2,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL2",	SAVESLOT_3,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL3",	SAVESLOT_4,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL4",	SAVESLOT_5,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL5",	SAVESLOT_6,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL6",	SAVESLOT_7,		MENUPAGE_DELETE_SLOT_CONFIRM,
-		MENUACTION_CHANGEMENU,	"FEM_SL7",	SAVESLOT_8,		MENUPAGE_DELETE_SLOT_CONFIRM,
-	},
-
-	// MENUPAGE_NEW_GAME_RELOAD = 10
-	{ "FET_NG", 1, MENUPAGE_NEW_GAME, MENUPAGE_NEW_GAME, 0, 0,
-		MENUACTION_LABEL,		"FESZ_QR",	SAVESLOT_NONE,	MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		MENUACTION_NEWGAME,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME_RELOAD,
-	},
-
-	// MENUPAGE_LOAD_SLOT_CONFIRM = 11
-	{ "FET_LG", 1, MENUPAGE_CHOOSE_LOAD_SLOT, MENUPAGE_CHOOSE_LOAD_SLOT, 0, 0,
-		 MENUACTION_LABEL,		"FESZ_QL",	SAVESLOT_NONE,	MENUPAGE_NONE,
-		 MENUACTION_CHANGEMENU,	"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_LOAD_SLOT,
-		 MENUACTION_CHANGEMENU,	"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_LOADING_IN_PROGRESS,
-	},
-
-	// MENUPAGE_DELETE_SLOT_CONFIRM = 12
-	{ "FET_DG", 1, MENUPAGE_CHOOSE_DELETE_SLOT, MENUPAGE_CHOOSE_DELETE_SLOT, 0, 0,
-		 MENUACTION_LABEL,		"FESZ_QD",	SAVESLOT_NONE,  MENUPAGE_NONE,
-		 MENUACTION_CHANGEMENU,	"FEM_NO",	SAVESLOT_NONE,  MENUPAGE_CHOOSE_DELETE_SLOT,
-		 MENUACTION_CHANGEMENU,	"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_DELETING,
-	},
-
-	// MENUPAGE_NO_MEMORY_CARD = 13
-	{ "FES_NOC", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		// hud adjustment page in mobile
-	},
-
-	// MENUPAGE_LOADING_IN_PROGRESS = 14
-	{ "FET_LG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_LABEL, "FED_LDW", SAVESLOT_NONE, MENUPAGE_LOAD_SLOT_CONFIRM,
-	},
-
-	// MENUPAGE_DELETING_IN_PROGRESS = 15
-	{ "FET_DG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_LABEL, "FEDL_WR", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_PS2_LOAD_FAILED = 16
-	{ "FET_LG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_LABEL, "FES_LOE", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_DELETE_FAILED = 17
-	{ "FET_DG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_LABEL, "FES_DEE", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU, "FEC_OKK", SAVESLOT_NONE, MENUPAGE_CHOOSE_DELETE_SLOT,
-	},
-
-	// MENUPAGE_DEBUG_MENU = 18
-	{ "FED_DBG", 1, MENUPAGE_NONE, MENUPAGE_NONE, 4, 0,
-		MENUACTION_RELOADIDE,	"FED_RID", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_RELOADIPL,	"FED_RIP", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SETDBGFLAG,	"FED_DFL", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,	"FED_DLS", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_PEDROADGROUPS,	"FED_SPR", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CARROADGROUPS,	"FED_SCR", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_COLLISIONPOLYS,	"FED_SCP", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_PARSEHEAP,	"FED_PAH", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SHOWCULL,	"FED_SCZ", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_DEBUGSTREAM,	"FED_DSR", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_MEMORY_CARD_DEBUG = 19
-	{ "FEM_MCM", 1, MENUPAGE_NONE, MENUPAGE_NONE, 7, 0,
-		MENUACTION_REGMEMCARD1,	"FEM_RMC", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_TESTFORMATMEMCARD1,	"FEM_TFM", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_TESTUNFORMATMEMCARD1,	"FEM_TUM", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CREATEROOTDIR,	"FEM_CRD", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CREATELOADICONS,	"FEM_CLI", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_FILLWITHGUFF,	"FEM_FFF", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SAVEONLYTHEGAME,	"FEM_SOG", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SAVEGAME,	"FEM_STG", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_SAVEGAMEUNDERGTA,	"FEM_STS", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CREATECOPYPROTECTED,	"FEM_CPD", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_MEMORY_CARD_TEST = 20
-	{ "FEM_MC2", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_MAIN = 21
-	{ "FET_MP", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_PS2_SAVE_FAILED = 22
-	{ "MCDNSP", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_MEMCARDSAVECONFIRM, "JAILB_U", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_PS2_SAVE_FAILED_2 = 23
-	{ "MCGNSP", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_MEMCARDSAVECONFIRM, "JAILB_U", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// Unused in PC but anyway
-	// MENUPAGE_SAVE = 24
-#ifdef PS2_SAVE_DIALOG
-	{ "FET_SG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_CHANGEMENU,			"FESZ_SA",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT,
-		MENUACTION_RESUME_FROM_SAVEZONE,	"FESZ_CA",	SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-#else
-	{ "FET_SG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_LABEL,				"FES_SCG",	SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_POPULATESLOTS_CHANGEMENU,			"GMSAVE",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT,
-		MENUACTION_RESUME_FROM_SAVEZONE,	"FESZ_CA",	SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-#endif
-
-	// MENUPAGE_NO_MEMORY_CARD_2 = 25
-	{ "FES_NOC", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_CHANGEMENU,	"FESZ_CA",	SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_CHOOSE_SAVE_SLOT = 26
-	{ "FET_SG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_RESUME_FROM_SAVEZONE,	"FESZ_CA", SAVESLOT_NONE,	MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,			"FEM_SL1", SAVESLOT_1,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL2", SAVESLOT_2,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL3", SAVESLOT_3,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL4", SAVESLOT_4,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL5", SAVESLOT_5,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL6", SAVESLOT_6,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL7", SAVESLOT_7,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-		MENUACTION_CHANGEMENU,			"FEM_SL8", SAVESLOT_8,		MENUPAGE_SAVE_OVERWRITE_CONFIRM,
-	},
-
-	// MENUPAGE_SAVE_OVERWRITE_CONFIRM = 27
-	{ "FET_SG", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-		MENUACTION_LABEL,		"FESZ_QO", SAVESLOT_NONE, MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEM_YES", SAVESLOT_NONE, MENUPAGE_SAVING_IN_PROGRESS,
-		MENUACTION_CHANGEMENU,	"FEM_NO",  SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT,
-	},
-
-	// MENUPAGE_MULTIPLAYER_MAP = 28
-	{ "FET_MAP", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_CONNECTION = 29
-	{ "FET_CON", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_FIND_GAME = 30
-	{ "FET_FG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_MODE = 31
-	{ "FET_GT", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_CREATE = 32
-	{ "FET_HG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_MULTIPLAYER_START = 33
-	{ "FEN_STA", 2, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_SKIN_SELECT_OLD = 34
-	{ "FET_PS", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-	},
-
-	// MENUPAGE_CONTROLLER_PC = 35
-	{ "FET_CTL", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 0, 0,
-		MENUACTION_CTRLMETHOD,	"FET_CME", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
-		MENUACTION_KEYBOARDCTRLS,"FET_RDK", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS,
-		MENUACTION_CHANGEMENU,	"FET_AMS", SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
-		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_CONTROLLER_PC_OLD1 = 36
-	{ "FET_CTL", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 0, 0,
-		MENUACTION_GETKEY,	"FEC_PLB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_CWL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_CWR", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_LKT", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_PJP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_PSP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_TLF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_TRG", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_GETKEY,	"FEC_CCM", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-
-	// MENUPAGE_CONTROLLER_PC_OLD2 = 37
-	{ "FET_CTL", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 1, 1,
-
-	},
-
-	// MENUPAGE_CONTROLLER_PC_OLD3 = 38
-   { "FET_CTL", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 2, 2,
-		MENUACTION_GETKEY,	"FEC_LUP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3,
-		MENUACTION_GETKEY,	"FEC_LDN", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3,
-		MENUACTION_GETKEY,	"FEC_SMS", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3,
-		MENUACTION_SHOWHEADBOB,	"FEC_GSL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3,
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_CONTROLLER_PC_OLD4 = 39
-   { "FET_CTL", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 3, 3,
-
-   },
-
-   // MENUPAGE_CONTROLLER_DEBUG = 40
-   { "FEC_DBG", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 3, 3,
-		MENUACTION_GETKEY,	"FEC_TGD",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG,
-		MENUACTION_GETKEY,	"FEC_TDO",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG,
-		MENUACTION_GETKEY,	"FEC_TSS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG,
-		MENUACTION_GETKEY,	"FEC_SMS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG,
-		MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_OPTIONS = 41
-   { "FET_OPT", 1, MENUPAGE_NONE, MENUPAGE_NONE, 1, 4,
-		MENUACTION_CHANGEMENU,		"FET_CTL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
-		MENUACTION_LOADRADIO,		"FET_AUD", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS,
-		MENUACTION_CHANGEMENU,		"FET_DIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS,
-		MENUACTION_CHANGEMENU,		"FET_LAN", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS,
-		MENUACTION_PLAYERSETUP,		"FET_PSU", SAVESLOT_NONE, MENUPAGE_SKIN_SELECT,
-		MENUACTION_CHANGEMENU,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_EXIT = 42
-   { "FET_QG", 1, MENUPAGE_NONE, MENUPAGE_NONE, 2, 5,
-	   MENUACTION_LABEL,		"FEQ_SRE",	SAVESLOT_NONE, MENUPAGE_NONE,
-	   MENUACTION_DONTCANCEL,	"FEM_NO",	SAVESLOT_NONE, MENUPAGE_NONE,
-	   MENUACTION_CANCELGAME,	"FEM_YES",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_SAVING_IN_PROGRESS = 43
-   { "", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-	   MENUACTION_LABEL,	"FES_WAR",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_SAVE_SUCCESSFUL = 44
-   { "FET_SG", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-	   MENUACTION_LABEL,				"FES_SSC",	SAVESLOT_LABEL,	MENUPAGE_NONE,
-	   MENUACTION_RESUME_FROM_SAVEZONE,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT,
-   },
-
-   // MENUPAGE_DELETING = 45
-   { "FET_DG", 1, MENUPAGE_CHOOSE_DELETE_SLOT, MENUPAGE_CHOOSE_DELETE_SLOT, 0, 0,
-	   MENUACTION_LABEL,	"FED_DLW",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_DELETE_SUCCESS = 46
-   { "FET_DG", 1, MENUPAGE_CHOOSE_DELETE_SLOT, MENUPAGE_CHOOSE_DELETE_SLOT, 0, 0,
-		MENUACTION_LABEL,		"DEL_FNM", SAVESLOT_NONE,	MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEC_OKK", SAVESLOT_NONE,	MENUPAGE_CHOOSE_DELETE_SLOT,
-   },
-
-   // MENUPAGE_SAVE_FAILED = 47
-   { "FET_SG", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-		MENUACTION_LABEL,		"FEC_SVU",	SAVESLOT_NONE,	MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT,
-   },
-
-   // MENUPAGE_LOAD_FAILED = 48
-   { "FET_SG", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-		MENUACTION_LABEL,	"FEC_SVU",	SAVESLOT_NONE,	MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_LOAD_FAILED_2 = 49
-   { "FET_LG", 1, MENUPAGE_CHOOSE_SAVE_SLOT, MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0,
-		MENUACTION_LABEL,		"FEC_LUN",	SAVESLOT_NONE,  MENUPAGE_NONE,
-		MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE,  MENUPAGE_CHOOSE_LOAD_SLOT,
-   },
-
-   // MENUPAGE_FILTER_GAME = 50
-   { "FIL_FLT", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-
-   },
-
-   // MENUPAGE_START_MENU = 51
-   { "FEM_MM", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		 MENUACTION_CHANGEMENU,	"FEN_STA",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME,
-		 MENUACTION_CHANGEMENU,	"FET_OPT",	SAVESLOT_NONE,	MENUPAGE_OPTIONS,
-		 MENUACTION_CHANGEMENU,	"FEM_QT",	SAVESLOT_NONE,	MENUPAGE_EXIT,
-   },
-
-   // MENUPAGE_PAUSE_MENU = 52
-   { "FET_PAU", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-	   MENUACTION_RESUME,		"FEM_RES",	SAVESLOT_NONE, MENUPAGE_NONE,
-	   MENUACTION_CHANGEMENU,	"FEN_STA",	SAVESLOT_NONE, MENUPAGE_NEW_GAME,
-	   MENUACTION_CHANGEMENU,	"FEP_STA",	SAVESLOT_NONE, MENUPAGE_STATS,
-	   MENUACTION_CHANGEMENU,	"FEP_BRI",	SAVESLOT_NONE, MENUPAGE_BRIEFS,
-	   MENUACTION_CHANGEMENU,	"FET_OPT",	SAVESLOT_NONE, MENUPAGE_OPTIONS,
-	   MENUACTION_CHANGEMENU,	"FEM_QT",	SAVESLOT_NONE, MENUPAGE_EXIT,
-   },
-
-   // MENUPAGE_CHOOSE_MODE = 53
-   { "FEN_STA", 1, MENUPAGE_NONE, MENUPAGE_NONE, 0, 1,
-	   MENUACTION_CHANGEMENU,	"FET_SP",	SAVESLOT_NONE, MENUPAGE_NEW_GAME,
-	   MENUACTION_INITMP,		"FET_MP",	SAVESLOT_NONE, MENUPAGE_MULTIPLAYER_MAIN,
-	   MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-
-   // MENUPAGE_SKIN_SELECT = 54
-   { "FET_PSU", 1, MENUPAGE_OPTIONS, MENUPAGE_OPTIONS, 4, 4,
-		MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_MULTIPLAYER_MAIN,
-   },
-
-   // MENUPAGE_KEYBOARD_CONTROLS = 55
-   { "FET_STI", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 1, 1,
-		MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC,
-   },
-
-   // MENUPAGE_MOUSE_CONTROLS = 56
-   { "FET_MTI", 1, MENUPAGE_CONTROLLER_PC, MENUPAGE_CONTROLLER_PC, 2, 2,
-	   MENUACTION_MOUSESENS,	"FEC_MSH",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
-	   MENUACTION_INVVERT,		"FEC_IVV",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
-	   MENUACTION_MOUSESTEER,	"FET_MST",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS,
-	   MENUACTION_CHANGEMENU,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-	// MENUPAGE_MISSION_RETRY = 57
-#ifdef MISSION_REPLAY
-
-   { "M_FAIL", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-	   MENUACTION_LABEL,	    "FESZ_RM",  SAVESLOT_NONE, MENUPAGE_NONE,
-	   MENUACTION_CHANGEMENU,   "FEM_YES",  SAVESLOT_NONE, MENUPAGE_LOADING_IN_PROGRESS,
-	   MENUACTION_REJECT_RETRY, "FEM_NO",   SAVESLOT_NONE, MENUPAGE_NONE
-   },
-#else
-   { "", 0, MENUPAGE_NONE, MENUPAGE_NONE, 0, 0,
-	   // mission failed, wanna restart page in mobile
-   },
-#endif
-
-   // MENUPAGE_58 = 58
-   { "", 0, MENUPAGE_NONE, MENUPAGE_NONE, 0, 0,
-
-   },
-
-#ifdef MENU_MAP
-   // MENUPAGE_MAP = 59
-   { "FEG_MAP", 1, MENUPAGE_NONE, MENUPAGE_NONE, 5, 2,
-		MENUACTION_UNK110,	"", SAVESLOT_NONE, MENUPAGE_NONE, // to prevent cross/enter to go back
-		MENUACTION_CHANGEMENU,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE,
-   },
-#endif
-};
\ No newline at end of file
diff --git a/src/core/MenuScreens.h b/src/core/MenuScreens.h
new file mode 100644
index 00000000..cae65316
--- /dev/null
+++ b/src/core/MenuScreens.h
@@ -0,0 +1,345 @@
+#pragma once
+
+// --MIAMI: Done except commented things
+
+CMenuScreen aScreens[] = {
+	// MENUPAGE_STATS = 0
+	{ "FET_STA", MENUPAGE_NONE, 3,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_NEW_GAME = 1
+	{ "FEP_STG", MENUPAGE_NONE, 1,
+		MENUACTION_CHANGEMENU, "FES_NGA", SAVESLOT_NONE, MENUPAGE_NEW_GAME_RELOAD, 320, 155, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_LOA",  SAVESLOT_NONE, MENUPAGE_CHOOSE_LOAD_SLOT, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU, "FES_DEL", SAVESLOT_NONE, MENUPAGE_CHOOSE_DELETE_SLOT, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_BRIEFS = 2
+	{ "FEH_BRI", MENUPAGE_NONE, 4,
+		MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 190, 320, MENUALIGN_RIGHT,
+	},
+
+	// MENUPAGE_SOUND_SETTINGS = 3
+	{ "FEH_AUD", MENUPAGE_OPTIONS, 1,
+		MENUACTION_MUSICVOLUME,		"FEA_MUS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 40, 76, MENUALIGN_LEFT,
+		MENUACTION_SFXVOLUME,		"FEA_SFX", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_MP3VOLUMEBOOST,	"FEA_MPB", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_AUDIOHW,			"FEA_3DH", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SPEAKERCONF,		"FEA_SPK", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_DYNAMICACOUSTIC,	"FET_DAM", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RADIO,			"FEA_RSS", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESTOREDEF,		"FET_DEF", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 320, 367, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,			"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_GRAPHICS_SETTINGS = 4
+#ifdef LEGACY_MENU_OPTIONS
+	#define Y_OFFSET 50
+#else
+	#define Y_OFFSET 0
+#endif
+
+	{ "FEH_DIS", MENUPAGE_OPTIONS, 2,
+		MENUACTION_BRIGHTNESS,	"FED_BRI", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 78, MENUALIGN_LEFT,
+		MENUACTION_DRAWDIST,	"FEM_LOD", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 103, MENUALIGN_LEFT,
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_FRAMESYNC,	"FEM_VSC", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 128, MENUALIGN_LEFT,
+#endif
+		MENUACTION_FRAMELIMIT,	"FEM_FRM", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 128 + Y_OFFSET/2, MENUALIGN_LEFT,
+#ifdef LEGACY_MENU_OPTIONS
+		MENUACTION_TRAILS,		"FED_TRA", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 178, MENUALIGN_LEFT,
+#endif
+		MENUACTION_SUBTITLES,	"FED_SUB", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 153 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_WIDESCREEN,	"FED_WIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 178 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_LEGENDS,		"MAP_LEG", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 202 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_RADARMODE,	"FED_RDR", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 228 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_HUD,			"FED_HUD", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 253 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_SCREENRES,	"FED_RES", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 278 + Y_OFFSET, MENUALIGN_LEFT,
+#ifdef IMPROVED_VIDEOMODE
+		MENUACTION_SCREENMODE,	"FED_POS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 40, 303 + Y_OFFSET, MENUALIGN_LEFT,
+		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 320, 328 + Y_OFFSET, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 320, 353 + Y_OFFSET, MENUALIGN_CENTER,
+#else
+		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 320, 303 + Y_OFFSET, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 320, 328 + Y_OFFSET, MENUALIGN_CENTER,
+#endif
+	},
+
+#undef Y_OFFSET
+
+	// MENUPAGE_LANGUAGE_SETTINGS = 5
+	{ "FEH_LAN", MENUPAGE_OPTIONS, 3,
+		MENUACTION_LANG_ENG,	"FEL_ENG", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 320, 132, MENUALIGN_CENTER,
+		MENUACTION_LANG_FRE,	"FEL_FRE", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_GER,	"FEL_GER", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_ITA,	"FEL_ITA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_LANG_SPA,    "FEL_SPA", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// TODO(Miami): This is still my implementation
+	// MENUPAGE_MAP = 6
+	{ "FEH_MAP", MENUPAGE_NONE, 2,
+		 MENUACTION_UNK110,	"", SAVESLOT_NONE, 0,  0, 0, 0, // to prevent cross/enter to go back
+		 MENUACTION_GOBACK,	"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_NEW_GAME_RELOAD = 7
+	{ "FES_NGA", MENUPAGE_NEW_GAME, 0,
+		MENUACTION_LABEL,		"FESZ_QR",	SAVESLOT_NONE,	0, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_NEWGAME,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME_RELOAD, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_LOAD_SLOT = 8
+	{ "FET_LG", MENUPAGE_NEW_GAME, 1,
+		MENUACTION_CHECKSAVE,	"FEM_SL1", SAVESLOT_1,		0, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2", SAVESLOT_2,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3", SAVESLOT_3,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4", SAVESLOT_4,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5", SAVESLOT_5,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6", SAVESLOT_6,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7", SAVESLOT_7,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8", SAVESLOT_8,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_DELETE_SLOT = 9
+	{ "FES_DEL", MENUPAGE_NEW_GAME, 2,
+		MENUACTION_CHECKSAVE,	"FEM_SL1",	SAVESLOT_1,		0, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL2",	SAVESLOT_2,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL3",	SAVESLOT_3,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL4",	SAVESLOT_4,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL5",	SAVESLOT_5,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL6",	SAVESLOT_6,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL7",	SAVESLOT_7,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_CHECKSAVE,	"FEM_SL8",	SAVESLOT_8,		0, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOAD_SLOT_CONFIRM = 10
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, 0,
+		 MENUACTION_LABEL,		"FESZ_QL",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_LOAD_SLOT, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_LOADING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_DELETE_SLOT_CONFIRM = 11
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, 0,
+		 MENUACTION_LABEL,		"FESZ_QD",	SAVESLOT_NONE,  MENUPAGE_NONE, 0, 0, 0,
+		 MENUACTION_NO,			"FEM_NO",	SAVESLOT_NONE,  MENUPAGE_CHOOSE_DELETE_SLOT, 320, 200, MENUALIGN_CENTER,
+		 MENUACTION_YES,		"FEM_YES",	SAVESLOT_NONE,	MENUPAGE_DELETING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_LOADING_IN_PROGRESS = 12
+	{ "FET_LG", MENUPAGE_CHOOSE_LOAD_SLOT, 0,
+	},
+
+	// MENUPAGE_DELETING_IN_PROGRESS = 13
+	{ "FES_DEL", MENUPAGE_CHOOSE_DELETE_SLOT, 0,
+	},
+
+	// MENUPAGE_DELETE_SUCCESSFUL = 14
+	{ "FES_DEL", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FES_DSC",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_CHOOSE_SAVE_SLOT = 15
+	{ "FET_SG", MENUPAGE_DISABLED, 0,
+		MENUACTION_SAVEGAME,			"FEM_SL1", SAVESLOT_1,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 40, 90, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL2", SAVESLOT_2,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL3", SAVESLOT_3,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL4", SAVESLOT_4,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL5", SAVESLOT_5,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL6", SAVESLOT_6,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL7", SAVESLOT_7,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_SAVEGAME,			"FEM_SL8", SAVESLOT_8,		MENUPAGE_SAVE_OVERWRITE_CONFIRM, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_RESUME_FROM_SAVEZONE,"FESZ_CA", SAVESLOT_NONE,	0, 320, 345, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_OVERWRITE_CONFIRM = 16
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		MENUACTION_LABEL,		"FESZ_QZ", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_NO,			"FEM_NO", SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_YES,			"FEM_YES",  SAVESLOT_NONE, MENUPAGE_SAVING_IN_PROGRESS, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVING_IN_PROGRESS = 17
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+	},
+
+	// MENUPAGE_SAVE_SUCCESSFUL = 18
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		MENUACTION_LABEL,					"FES_SSC",	SAVESLOT_LABEL,	MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_RESUME_FROM_SAVEZONE,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CUSTOM_WARNING = 19
+	{ "FET_SG", MENUPAGE_NONE, 0,
+		MENUACTION_LABEL,		"",			SAVESLOT_NONE, 0, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SAVE_CHEAT_WARNING = 20
+	{ "FET_SG", MENUPAGE_NEW_GAME, 0,
+		MENUACTION_LABEL,		"FES_CHE",	SAVESLOT_NONE,	MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_CHANGEMENU,	"FEM_OK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_SKIN_SELECT = 21
+	{ "FET_PS", MENUPAGE_OPTIONS, 4,
+		 MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_OPTIONS, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_UNUSED = 22
+	{ "FET_SG", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FED_LWR",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED = 23
+	{ "FET_SG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		 MENUACTION_LABEL,		"FEC_SVU",	SAVESLOT_NONE,	0, 0, 0, 0,
+		 MENUACTION_CHANGEMENU,	"FEC_OKK",	SAVESLOT_NONE,	MENUPAGE_CHOOSE_SAVE_SLOT, 0, 0, 0,
+	},
+
+	// MENUPAGE_SAVE_FAILED_2 = 24
+	{ "FET_LG", MENUPAGE_CHOOSE_SAVE_SLOT, 0,
+		 MENUACTION_LABEL,		"FEC_SVU",	SAVESLOT_NONE,	0, 0, 0, 0,
+	},
+
+	// MENUPAGE_LOAD_FAILED = 25
+	{ "FET_LG", MENUPAGE_NEW_GAME, 0,
+		 MENUACTION_LABEL,		"FEC_LUN",	SAVESLOT_NONE,  0, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE,  MENUPAGE_NEW_GAME, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC = 26
+	{ "FET_CTL", MENUPAGE_OPTIONS, 0,
+		MENUACTION_CTRLMETHOD,	"FET_STI", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 320, 150, MENUALIGN_CENTER,
+		MENUACTION_KEYBOARDCTRLS,"FEC_RED", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEC_MOU", SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_RESTOREDEF,	"FET_DEF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_OPTIONS = 27
+	{ "FET_OPT", MENUPAGE_NONE, 5,
+		 MENUACTION_CHANGEMENU,		"FEO_CON", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 320, 132, MENUALIGN_CENTER,
+		 MENUACTION_LOADRADIO,		"FEO_AUD", SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_CHANGEMENU,		"FEO_DIS", SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_CHANGEMENU,		"FEO_LAN", SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_PLAYERSETUP,	"FET_PS", SAVESLOT_NONE, MENUPAGE_SKIN_SELECT, 0, 0, MENUALIGN_CENTER,
+		 MENUACTION_GOBACK,			"FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_EXIT = 28
+	{ "FET_QG", MENUPAGE_NONE, 6,
+		MENUACTION_LABEL,		"FEQ_SRE",	SAVESLOT_NONE, 0, 0, 0, 0,
+		MENUACTION_DONTCANCEL,	"FEM_NO",	SAVESLOT_NONE, MENUPAGE_NONE, 320, 200, MENUALIGN_CENTER,
+		MENUACTION_CANCELGAME,	"FEM_YES",	SAVESLOT_NONE, MENUPAGE_NONE, 320, 225, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_START_MENU = 29
+	{ "FEM_MM", MENUPAGE_DISABLED, 0,
+		  MENUACTION_CHANGEMENU,	"FEP_STG",	SAVESLOT_NONE,	MENUPAGE_NEW_GAME, 320, 170, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_OPT",	SAVESLOT_NONE,	MENUPAGE_OPTIONS, 0, 0, MENUALIGN_CENTER,
+		  MENUACTION_CHANGEMENU,	"FEP_QUI",	SAVESLOT_NONE,	MENUPAGE_EXIT, 0, 0, MENUALIGN_CENTER,
+	},
+	
+	// TODO(Miami)
+	// MENUPAGE_KEYBOARD_CONTROLS = 30
+	{ "FET_STI", MENUPAGE_CONTROLLER_PC, 1,
+		 MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 0, 0, 0,
+	},
+
+	// MENUPAGE_MOUSE_CONTROLS = 31
+	{ "FEC_MOU", MENUPAGE_CONTROLLER_PC, 2,
+		MENUACTION_MOUSESENS,	"FEC_MSH",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 40, 170, MENUALIGN_LEFT,
+		MENUACTION_INVVERT,		"FEC_IVV",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_MOUSESTEER,	"FET_MST",	SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_LEFT,
+		MENUACTION_GOBACK,		"FEDS_TB",	SAVESLOT_NONE, 0, 320, 260, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_PAUSE_MENU = 32
+	{ "FET_PAU", MENUPAGE_DISABLED, 0,
+		MENUACTION_RESUME,		"FEP_RES",	SAVESLOT_NONE, 0, 320, 120, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_SGA",	SAVESLOT_NONE, MENUPAGE_NEW_GAME, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_MAP",	SAVESLOT_NONE, MENUPAGE_MAP, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_STA",	SAVESLOT_NONE, MENUPAGE_STATS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEH_BRI",	SAVESLOT_NONE, MENUPAGE_BRIEFS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FET_OPT",	SAVESLOT_NONE, MENUPAGE_OPTIONS, 0, 0, MENUALIGN_CENTER,
+		MENUACTION_CHANGEMENU,	"FEP_QUI",	SAVESLOT_NONE, MENUPAGE_EXIT, 0, 0, MENUALIGN_CENTER,
+	},
+
+	// MENUPAGE_NONE = 33
+	{ "", 0, 0, },
+
+	// MENUPAGE_OUTRO = 34
+	{ "", 0, 0, },
+
+#ifdef LEGACY_MENU_OPTIONS
+	// MENUPAGE_CONTROLLER_SETTINGS = 4
+	{ "FET_CON", MENUPAGE_OPTIONS, 0,
+		MENUACTION_CTRLCONFIG,		"FEC_CCF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS, 0, 0, 0,
+		MENUACTION_CTRLVIBRATION,	"FEC_VIB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_SETTINGS, 0, 0, 0,
+		MENUACTION_GOBACK,			"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_DEBUG_MENU = 18
+	{ "FED_DBG", MENUPAGE_NONE, 0,
+		MENUACTION_RELOADIDE,	"FED_RID", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_SETDBGFLAG,	"FED_DFL", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,	"FED_DLS", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_COLLISIONPOLYS,	"FED_SCP", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_PARSEHEAP,	"FED_PAH", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_DEBUGSTREAM,	"FED_DSR", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+	
+	// MENUPAGE_CONTROLLER_PC_OLD1 = 36
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 0,
+		MENUACTION_GETKEY,	"FEC_PLB", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CWR", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_LKT", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PJP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_PSP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TLF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_TRG", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GETKEY,	"FEC_CCM", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD1, 0, 0, 0,
+		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD2 = 37
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 1,
+
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD3 = 38
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 2,
+		 MENUACTION_GETKEY,	"FEC_LUP", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_LDN", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_SHOWHEADBOB,	"FEC_GSL", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC_OLD3, 0, 0, 0,
+		 MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+
+	// MENUPAGE_CONTROLLER_PC_OLD4 = 39
+	{ "FET_CTL", MENUPAGE_CONTROLLER_PC, 3,
+
+	},
+
+	// MENUPAGE_CONTROLLER_DEBUG = 40
+	{ "FEC_DBG", MENUPAGE_CONTROLLER_PC, 3,
+		 MENUACTION_GETKEY,	"FEC_TGD",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TDO",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_TSS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GETKEY,	"FEC_SMS",	SAVESLOT_NONE, MENUPAGE_CONTROLLER_DEBUG, 0, 0, 0,
+		 MENUACTION_GOBACK,	"FEDS_TB",	SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
+	},
+#endif
+};
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index a0fd0535..204d9a18 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -35,6 +35,7 @@
 #include "Streaming.h"
 #include "PathFind.h"
 #include "Wanted.h"
+#include "WaterLevel.h"
 #include "General.h"
 
 CPad Pads[MAX_PADS];
@@ -49,7 +50,7 @@ CKeyboardState CPad::OldKeyState;
 CKeyboardState CPad::NewKeyState;
 CKeyboardState CPad::TempKeyState;
 
-char CPad::KeyBoardCheatString[20];
+char CPad::KeyBoardCheatString[30];
 
 CMouseControllerState CPad::OldMouseControllerState;
 CMouseControllerState CPad::NewMouseControllerState;
@@ -62,26 +63,116 @@ bool CPad::IsAffectedByController = false;
 _TODO("gbFastTime");
 extern bool gbFastTime;
 
-void WeaponCheat()
+void WeaponCheat1()
 {
 	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BASEBALLBAT, 0);
+
+	CStreaming::RequestModel(MI_BRASS_KNUCKLES, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_BASEBALL_BAT, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MOLOTOV, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_COLT45, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_TEC9, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_RUGER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SNIPERRIFLE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_FLAMETHROWER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BRASSKNUCKLE, 1);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_BASEBALLBAT, 1);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MOLOTOV, 10);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_COLT45, 100);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_UZI, 100);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SHOTGUN, 20);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_AK47, 200);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_M16, 200);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SNIPERRIFLE, 5);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_ROCKETLAUNCHER, 5);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MOLOTOV, 5);
-	FindPlayerPed()->GiveWeapon(WEAPONTYPE_GRENADE, 5);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SHOTGUN, 50);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_TEC9, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_RUGER, 120);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SNIPERRIFLE, 25);
 	FindPlayerPed()->GiveWeapon(WEAPONTYPE_FLAMETHROWER, 200);
+
+	CStreaming::SetModelIsDeletable(MI_BRASS_KNUCKLES);
+	CStreaming::SetModelIsDeletable(MI_BASEBALL_BAT);
+	CStreaming::SetModelIsDeletable(MI_MOLOTOV);
+	CStreaming::SetModelIsDeletable(MI_COLT45);
+	CStreaming::SetModelIsDeletable(MI_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_TEC9);
+	CStreaming::SetModelIsDeletable(MI_RUGER);
+	CStreaming::SetModelIsDeletable(MI_SNIPERRIFLE);
+	CStreaming::SetModelIsDeletable(MI_FLAMETHROWER);
+}
+
+void WeaponCheat2()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
+
+	CStreaming::RequestModel(MI_KATANA, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_GRENADE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_BOMB, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_PYTHON, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_STUBBY_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SILENCEDINGRAM, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_M4, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_LASERSCOPE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_ROCKETLAUNCHER, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_KATANA, 0);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_DETONATOR_GRENADE, 10);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_PYTHON, 40);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_STUBBY_SHOTGUN, 25);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SILENCED_INGRAM, 100);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_M4, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_LASERSCOPE, 21);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_ROCKETLAUNCHER, 5);
+
+	CStreaming::SetModelIsDeletable(MI_KATANA);
+	CStreaming::SetModelIsDeletable(MI_GRENADE);
+	CStreaming::SetModelIsDeletable(MI_BOMB);
+	CStreaming::SetModelIsDeletable(MI_PYTHON);
+	CStreaming::SetModelIsDeletable(MI_STUBBY_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_SILENCEDINGRAM);
+	CStreaming::SetModelIsDeletable(MI_M4);
+	CStreaming::SetModelIsDeletable(MI_LASERSCOPE);
+	CStreaming::SetModelIsDeletable(MI_ROCKETLAUNCHER);
+}
+
+void WeaponCheat3()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT2"), true);
+
+	CStreaming::RequestModel(MI_CHAINSAW, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_GRENADE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_PYTHON, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_SPAS12_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MP5, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_M4, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_LASERSCOPE, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MINIGUN, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MINIGUN2, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::LoadAllRequestedModels(false);
+
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_CHAINSAW, 0);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_GRENADE, 10);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_PYTHON, 40);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_SPAS12_SHOTGUN, 30);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MP5, 100);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_M4, 150);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_LASERSCOPE, 21);
+	FindPlayerPed()->GiveWeapon(WEAPONTYPE_MINIGUN, 500);
+
+	CStreaming::SetModelIsDeletable(MI_CHAINSAW);
+	CStreaming::SetModelIsDeletable(MI_GRENADE);
+	CStreaming::SetModelIsDeletable(MI_PYTHON);
+	CStreaming::SetModelIsDeletable(MI_SPAS12_SHOTGUN);
+	CStreaming::SetModelIsDeletable(MI_MP5);
+	CStreaming::SetModelIsDeletable(MI_M4);
+	CStreaming::SetModelIsDeletable(MI_LASERSCOPE);
+	CStreaming::SetModelIsDeletable(MI_MINIGUN);
+	CStreaming::SetModelIsDeletable(MI_MINIGUN2);
 }
 
 void HealthCheat()
 {
 	CHud::SetHelpMessage(TheText.Get("CHEAT3"), true);
-	FindPlayerPed()->m_fHealth = 100.0f;
+	FindPlayerPed()->m_fHealth = CWorld::Players[0].m_nMaxHealth;
 	if (FindPlayerVehicle()) {
 		FindPlayerVehicle()->m_fHealth = 1000.0f;
 		if (FindPlayerVehicle()->m_vehType == VEHICLE_TYPE_CAR)
@@ -89,31 +180,31 @@ void HealthCheat()
 	}
 }
 
-void TankCheat()
+void VehicleCheat(bool something, int model)
 {
 	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
-	CStreaming::RequestModel(MI_RHINO, 0);
-	CStreaming::LoadAllRequestedModels(false);
-	if (CStreaming::ms_aInfoForModel[MI_RHINO].m_loadState == STREAMSTATE_LOADED) {
+	CStreaming::RequestModel(model, 0);
+	CStreaming::LoadAllRequestedModels(something);
+	if (CStreaming::ms_aInfoForModel[model].m_loadState == STREAMSTATE_LOADED) {
 		CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
 		int32 node = ThePaths.FindNodeClosestToCoors(FindPlayerCoors(), PATH_CAR, 100.0f);
 
 		if (node < 0) return;
-		
+
 #ifdef FIX_BUGS
-		CAutomobile* tank = new CAutomobile(MI_RHINO, RANDOM_VEHICLE);
+		CAutomobile* vehicle = new CAutomobile(model, RANDOM_VEHICLE);
 #else
-		CAutomobile *tank = new CAutomobile(MI_RHINO, MISSION_VEHICLE);
+		CAutomobile* vehicle = new CAutomobile(MI_RHINO, MISSION_VEHICLE);
 #endif
-		if (tank != nil) {
+		if (vehicle != nil) {
 			CVector pos = ThePaths.m_pathNodes[node].GetPosition();
 			pos.z += 4.0f;
-			tank->SetPosition(pos);
-			tank->SetOrientation(0.0f, 0.0f, DEGTORAD(200.0f));
+			vehicle->SetPosition(pos);
+			vehicle->SetOrientation(0.0f, 0.0f, DEGTORAD(200.0f));
 
-			tank->SetStatus(STATUS_ABANDONED);
-			tank->m_nDoorLock = CARLOCK_UNLOCKED;
-			CWorld::Add(tank);
+			vehicle->SetStatus(STATUS_ABANDONED);
+			vehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+			CWorld::Add(vehicle);
 		}
 	}
 }
@@ -140,9 +231,9 @@ void ChangePlayerCheat()
 		do
 		{
 			do
-				modelId = CGeneral::GetRandomNumberInRange(0, MI_CAS_WOM+1);
+				modelId = CGeneral::GetRandomNumberInRange(0, MI_WFYG2+1);
 			while (!CModelInfo::GetModelInfo(modelId));
-		} while (modelId >= MI_SPECIAL01 && modelId <= MI_SPECIAL04 || modelId == MI_TAXI_D);
+		} while (modelId == MI_TAXI_D);
 
 		uint8 flags = CStreaming::ms_aInfoForModel[modelId].m_flags;
 		ped->DeleteRwObject();
@@ -205,7 +296,7 @@ void MoneyCheat()
 void ArmourCheat()
 {
 	CHud::SetHelpMessage(TheText.Get("CHEAT4"), true);
-	FindPlayerPed()->m_fArmour = 100.0f;
+	FindPlayerPed()->m_fArmour = CWorld::Players[0].m_nMaxArmour;
 }
 
 void WantedLevelUpCheat()
@@ -232,6 +323,12 @@ void CloudyWeatherCheat()
 	CWeather::ForceWeatherNow(WEATHER_CLOUDY);
 }
 
+void StormyWeatherCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
+	CWeather::ForceWeatherNow(WEATHER_HURRICANE);
+}
+
 void RainyWeatherCheat()
 {
 	CHud::SetHelpMessage(TheText.Get("CHEAT7"), true);
@@ -273,6 +370,41 @@ void NastyLimbsCheat()
 {
 	CPed::bNastyLimbsCheat = !CPed::bNastyLimbsCheat;
 }
+
+void BlackCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	gbBlackCars = true;
+	gbPinkCars = false;
+}
+
+void PinkCarsCheat()
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	gbBlackCars = false;
+	gbPinkCars = true;
+}
+
+void NoSeaBedCheat(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CWaterLevel::m_bRenderSeaBed = !CWaterLevel::m_bRenderSeaBed;
+}
+
+void RenderWaterLayersCheat(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	if ( ++CWaterLevel::m_nRenderWaterLayers > 5 )
+			CWaterLevel::m_nRenderWaterLayers = 0;
+}
+
+void BackToTheFuture(void)
+{
+	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
+	CVehicle::bHoverCheat = !CVehicle::bHoverCheat;
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 
 #ifdef KANGAROO_CHEAT
@@ -329,15 +461,13 @@ void AltDodoCheat(void)
 }
 #endif
 
-#ifdef DETECT_PAD_INPUT_SWITCH
 bool
-CControllerState::IsAnyButtonPressed(void)
+CControllerState::CheckForInput(void)
 {
 	return !!LeftStickX || !!LeftStickY || !!RightStickX || !!RightStickY || !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2 ||
-	       !!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight || !!Start || !!Select || !!Square || !!Triangle || !!Cross || !!Circle || !!LeftShock ||
-	       !!RightShock || !!NetworkTalk;
+		!!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight || !!Start || !!Select || !!Square || !!Triangle || !!Cross || !!Circle || !!LeftShock ||
+		!!RightShock;
 }
-#endif
 
 void
 CControllerState::Clear(void)
@@ -435,6 +565,11 @@ void CPad::Clear(bool bResetPlayerControls)
 	AverageEntries = 0;
 }
 
+uint32 CPad::InputHowLongAgo()
+{
+	return CTimer::GetTimeInMilliseconds() - LastTimeTouched;
+}
+
 void CPad::ClearMouseHistory()
 {
 	PCTempMouseControllerState.Clear();
@@ -668,7 +803,7 @@ CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &Stat
 
 void CPad::StartShake(int16 nDur, uint8 nFreq)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
@@ -690,7 +825,7 @@ void CPad::StartShake(int16 nDur, uint8 nFreq)
 
 void CPad::StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, float fZ)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
@@ -717,7 +852,7 @@ void CPad::StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, floa
 
 void CPad::StartShake_Train(float fX, float fY)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
@@ -751,7 +886,7 @@ void CPad::AddToCheatString(char c)
 #define _CHEATCMP(str)  strncmp(str, CheatString, sizeof(str)-1)
 	// "4414LDRULDRU"	-	R2 R2 L1 R2 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
 	if ( !_CHEATCMP("URDLURDL4144") )
-		WeaponCheat();
+		WeaponCheat1();
 
 	// "4411LDRULDRU"	-	R2 R2 L1 L1 LEFT DOWN RIGHT UP LEFT DOWN RIGHT UP
 	else if ( !_CHEATCMP("URDLURDL1144") )
@@ -791,7 +926,7 @@ void CPad::AddToCheatString(char c)
 	
 	// "CCCCCC321TCT"	-	CIRCLE CIRCLE CIRCLE CIRCLE CIRCLE CIRCLE R1 L2 L1 TRIANGLE CIRCLE TRIANGLE
 	else if ( !_CHEATCMP("TCT123CCCCCC") )
-		TankCheat();
+		VehicleCheat(true, MI_RHINO);
 	
 	// "CCCSSSSS1TCT"	-	CIRCLE CIRCLE CIRCLE SQUARE SQUARE SQUARE SQUARE SQUARE L1 TRIANGLE CIRCLE TRIANGLE
 	else if ( !_CHEATCMP("TCT1SSSSSCCC") )
@@ -844,113 +979,192 @@ void CPad::AddToCheatString(char c)
 }
 #endif
 
+int Cheat_strncmp(char* sourceStr, char* origCheatStr)
+{
+	char cheatCodeVals[] = { 3,5,7,1,13,27,3,7,1,11,13,8,7,32,13,6,28,19,10,3,3,5,7,1,13,27,3,7 };
+
+	for (int32 i = 0; i < strlen(origCheatStr); i++) {
+		if ((sourceStr[i] != origCheatStr[i] - cheatCodeVals[i]) || i >= ARRAY_SIZE(cheatCodeVals)) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
 void CPad::AddToPCCheatString(char c)
 {
-	for ( int32 i = ARRAY_SIZE(KeyBoardCheatString) - 2; i >= 0; i-- )
+	for (int32 i = ARRAY_SIZE(KeyBoardCheatString) - 2; i >= 0; i--)
 		KeyBoardCheatString[i + 1] = KeyBoardCheatString[i];
-	
+
 	KeyBoardCheatString[0] = c;
-	
-	#define _CHEATCMP(str) strncmp(str, KeyBoardCheatString, sizeof(str)-1)
-	
-	// "GUNSGUNSGUNS"
-	if ( !_CHEATCMP("SNUGSNUGSNUG") )
-		WeaponCheat();
 
-	// "IFIWEREARICHMAN"
-	if ( !_CHEATCMP("NAMHCIRAEREWIFI") )
-		MoneyCheat();
-	
-	// "GESUNDHEIT"
-	if ( !_CHEATCMP("TIEHDNUSEG") )
+#define _CHEATCMP(str) strncmp(str, KeyBoardCheatString, sizeof(str)-1)
+
+	// "THUGSTOOLS"
+	if (!Cheat_strncmp(KeyBoardCheatString, "VQVPanJ\\I_")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat1();
+	}
+	// "PROFESSIONALTOOLS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VQVPagDUPT`[Lf\\Xl")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat2();
+	}
+	// "NUTTERTOOLS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VQVPamH[U`[")) {
+		KeyBoardCheatString[0] = ' ';
+		WeaponCheat3();
+	}
+	// "PRECIOUSPROTECTION"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "QTPUP`WVS[`]ViPKnc")) {
+		KeyBoardCheatString[0] = ' ';
+		ArmourCheat();
+	}
+	// "ASPIRINE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HSPSVkVH")) {
+		KeyBoardCheatString[0] = ' ';
 		HealthCheat();
-	
-	// "MOREPOLICEPLEASE"
-	if ( !_CHEATCMP("ESAELPECILOPEROM") )
+	}
+	// "YOUWONTTAKEMEALIVE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "H[PMN`PLLLa\\Uod[kl")) {
+		KeyBoardCheatString[0] = ' ';
 		WantedLevelUpCheat();
-	
-	// "NOPOLICEPLEASE"
-	if ( !_CHEATCMP("ESAELPECILOPON") )
+	}
+	// "LEAVEMEALONE"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HSVMN`PLWLRT")) {
+		KeyBoardCheatString[0] = ' ';
 		WantedLevelDownCheat();
-	
-	// "GIVEUSATANK"
-	if ( !_CHEATCMP("KNATASUEVIG") )
-		TankCheat();
-	
-	// "BANGBANGBANG"
-	if ( !_CHEATCMP("GNABGNABGNAB") )
+	}
+	// "APLEASANTDAY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\FKU[\\VHFW]I")) {
+		KeyBoardCheatString[0] = ' ';
+		CloudyWeatherCheat();
+	}
+	// "ALOVELYDAY"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "\\FKZY`YVML")) {
+		KeyBoardCheatString[0] = ' ';
+		SunnyWeatherCheat();
+	}
+	// "ABITDRIEG"
+
+	// "CATSANDDOGS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VLVEQiDZULP")) {
+		KeyBoardCheatString[0] = ' ';
+		StormyWeatherCheat();
+	}
+	// "CANTSEEATHING"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSPIa\\HLT_[IJ")) {
+		KeyBoardCheatString[0] = ' ';
+		FoggyWeatherCheat();
+	}
+	// "PANZER"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "UJaONk")) {
+		KeyBoardCheatString[0] = ' ';
+		VehicleCheat(true, MI_RHINO);
+	}
+	// "LIFEISPASSINGMEBY"
+
+	// "BIGBANG"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "JSHCTdE")) {
+		KeyBoardCheatString[0] = ' ';
 		BlowUpCarsCheat();
-	
-	// "ILIKEDRESSINGUP"
-	if ( !_CHEATCMP("PUGNISSERDEKILI") )
+	}
+	// "STILLLIKEDRESSINGUP"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "SZNOVnVLSORSPlYReg]")) {
+		KeyBoardCheatString[0] = ' ';
 		ChangePlayerCheat();
-	
-	// "ITSALLGOINGMAAAD"
-	if ( !_CHEATCMP("DAAAMGNIOGLLASTI") )
+	}
+	// "FIGHTFIGHTFIGHT"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "WMNJSoKNJQaPNiS")) {
+		KeyBoardCheatString[0] = ' ';
 		MayhemCheat();
-	
+	}
 	// "NOBODYLIKESME"
-	if ( !_CHEATCMP("EMSEKILYDOBON") )
+	else if (!Cheat_strncmp(KeyBoardCheatString, "HRZFXdO`EZOWU")) {
+		KeyBoardCheatString[0] = ' ';
 		EverybodyAttacksPlayerCheat();
-	
-	// "WEAPONSFORALL"
-	if ( !_CHEATCMP("LLAROFSNOPAEW") )
+	}
+	// "OURGODGIVENRIGHTTOBEARARMS"
+	else if (!Cheat_strncmp(KeyBoardCheatString, "VRYB_\\HIP_aPNi_TaiSJGTNSbj")) {
+		KeyBoardCheatString[0] = ' ';
 		WeaponsForAllCheat();
-	
+	}
+	// "TRAVELINSTYLE"
+	if (!_CHEATCMP("ELYTSNILEVART"))
+		VehicleCheat(true, MI_BLOODRA);
+
+	// "GETTHEREQUICKLY"
+	if (!_CHEATCMP("YLKCIUQEREHTTEG"))
+		VehicleCheat(true, MI_BLOODRB);
+
+	// "GETTHEREFAST"
+	if (!_CHEATCMP("TSAFEREHTTEG"))
+		VehicleCheat(true, MI_SABRETUR);
+
+	// "GETTHEREVERYFASTINDEED"
+	if (!_CHEATCMP("DEEDNITSAFYREVEREHTTEG"))
+		VehicleCheat(true, MI_HOTRINA);
+
+	// "GETTHEREAMAZINGLYFAST"
+	if (!_CHEATCMP("TSAFYLGNIZAMAEREHTTEG"))
+		VehicleCheat(true, MI_HOTRINB);
+
+	// "THELASTRIDE"
+	if (!_CHEATCMP("EDIRTSALEHT"))
+		VehicleCheat(true, MI_ROMERO);
+
+	// "ROCKANDROLLCAR"
+	if (!_CHEATCMP("RACLLORDNAKCOR"))
+		VehicleCheat(true, MI_LOVEFIST);
+
+	// "RUBBISHCAR"
+	if (!_CHEATCMP("RACHSIBBUR"))
+		VehicleCheat(true, MI_TRASH);
+
+	// "BETTERTHANWALKING"
+	if (!_CHEATCMP("GNIKLAWNAHTRETTEB"))
+		VehicleCheat(true, MI_CADDY);
+
 	// "TIMEFLIESWHENYOU"
-	if ( !_CHEATCMP("UOYNEHWSEILFEMIT") )
+	if (!_CHEATCMP("UOYNEHWSEILFEMIT"))
 		FastTimeCheat();
-	
+
 	// "BOOOOORING"
-	if ( !_CHEATCMP("GNIROOOOOB") )
+	if (!_CHEATCMP("GNIROOOOOB"))
 		SlowTimeCheat();
-	
-#ifndef GTA3_1_1_PATCH
-	// "TURTOISE"
-	if ( !_CHEATCMP("ESIOTRUT") )
-		ArmourCheat();
-#else	
-	// "TORTOISE"
-	if ( !_CHEATCMP("ESIOTROT") )
-		ArmourCheat();
-#endif
-	
-	// "SKINCANCERFORME"
-	if ( !_CHEATCMP("EMROFRECNACNIKS") )
-		SunnyWeatherCheat();
-	
-	// "ILIKESCOTLAND"
-	if ( !_CHEATCMP("DNALTOCSEKILI") )
-		CloudyWeatherCheat();
-	
+
 	// "ILOVESCOTLAND"
-	if ( !_CHEATCMP("DNALTOCSEVOLI") )
+	if (!_CHEATCMP("DNALTOCSEVOLI"))
 		RainyWeatherCheat();
-	
-	// "PEASOUP"
-	if ( !_CHEATCMP("PUOSAEP") )
-		FoggyWeatherCheat();
-	
+
 	// "MADWEATHER"
-	if ( !_CHEATCMP("REHTAEWDAM") )
+	if (!_CHEATCMP("REHTAEWDAM"))
 		FastWeatherCheat();
-	
+
 	// "ANICESETOFWHEELS"
-	if ( !_CHEATCMP("SLEEHWFOTESECINA") )
+	if (!_CHEATCMP("SLEEHWFOTESECINA"))
 		OnlyRenderWheelsCheat();
-	
+
 	// "CHITTYCHITTYBB"
-	if ( !_CHEATCMP("BBYTTIHCYTTIHC") )
+	if (!_CHEATCMP("BBYTTIHCYTTIHC"))
 		ChittyChittyBangBangCheat();
-	
+
 	// "CORNERSLIKEMAD"
-	if ( !_CHEATCMP("DAMEKILSRENROC") )
+	if (!_CHEATCMP("DAMEKILSRENROC"))
 		StrongGripCheat();
-	
+
 	// "NASTYLIMBSCHEAT"
-	if ( !_CHEATCMP("TAEHCSBMILYTSAN") )
+	if (!_CHEATCMP("TAEHCSBMILYTSAN"))
 		NastyLimbsCheat();
 
+	// "IWANTITPAINTEDBLACK"
+	if (!_CHEATCMP("KCALBDETNIAPTITNAWI"))
+		BlackCarsCheat();
+
+	// "AHAIRDRESSERSCAR"
+	if (!_CHEATCMP("RACSRESSERDRIAHA"))
+		PinkCarsCheat();
+
 #ifdef KANGAROO_CHEAT
 	// "KANGAROO"
 	if (!_CHEATCMP("OORAGNAK"))
@@ -974,8 +1188,22 @@ void CPad::AddToPCCheatString(char c)
 	if (!_CHEATCMP("ODODRETSAMOTTNAWI"))
 		AltDodoCheat();
 #endif
-	
-	#undef _CHEATCMP
+
+#if !defined(PC_WATER) && defined(WATER_CHEATS)
+	// SEABEDCHEAT
+	if (!_CHEATCMP("TAEHCDEBAESON"))
+		NoSeaBedCheat();
+
+	// WATERLAYERSCHEAT
+	if (!_CHEATCMP("TAEHCSREYALRETAW"))
+		RenderWaterLayersCheat();
+#endif
+
+	// SEAWAYS
+	if (!_CHEATCMP("SYAWAES"))
+		BackToTheFuture();
+
+#undef _CHEATCMP
 }
 
 #ifdef XINPUT
@@ -1052,7 +1280,7 @@ void CPad::UpdatePads(void)
 	CapturePad(0);
 #endif
 #ifdef DETECT_PAD_INPUT_SWITCH
-	if (GetPad(0)->PCTempJoyState.IsAnyButtonPressed())
+	if (GetPad(0)->PCTempJoyState.CheckForInput())
 		IsAffectedByController = true;
 	else {
 #endif
@@ -1062,11 +1290,11 @@ void CPad::UpdatePads(void)
 
 #ifdef DETECT_PAD_INPUT_SWITCH
 	}
-	if (IsAffectedByController && (GetPad(0)->PCTempKeyState.IsAnyButtonPressed() || GetPad(0)->PCTempMouseState.IsAnyButtonPressed()))
+	if (IsAffectedByController && (GetPad(0)->PCTempKeyState.CheckForInput() || GetPad(0)->PCTempMouseState.CheckForInput()))
 		IsAffectedByController = false;
 #endif
 	
-	if ( CReplay::IsPlayingBackFromFile() )
+	if ( CReplay::IsPlayingBackFromFile() && !FrontEndMenuManager.m_bMenuActive )
 		bUpdate = false;
 	
 	if ( bUpdate )
@@ -1106,6 +1334,9 @@ void CPad::Update(int16 unk)
 	PCTempMouseState.Clear();
 	
 	ProcessPCSpecificStuff();
+
+	if (NewState.CheckForInput())
+		LastTimeTouched = CTimer::GetTimeInMilliseconds();
 	
 	if ( ++iCurrHornHistory >= HORNHISTORY_SIZE )
 		iCurrHornHistory = 0;
@@ -2336,6 +2567,8 @@ void CPad::ResetCheats(void)
 	CVehicle::bCheat3 = false;
 	CVehicle::bCheat4 = false;
 	CVehicle::bCheat5 = false;
+	gbBlackCars = false;
+	gbPinkCars = false;
 	
 	gbFastTime = false;
 	CTimer::SetTimeScale(1.0f);
diff --git a/src/core/Pad.h b/src/core/Pad.h
index ea771f81..a1461575 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -10,6 +10,7 @@ enum {
 	PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
 	PLAYERCONTROL_DISABLED_40 = 64, // used on phone calls
 	PLAYERCONTROL_DISABLED_80 = 128,// used on cutscenes
+	PLAYERCONTROL_SHORTCUT_TAXI = 256,
 };
 
 class CControllerState
@@ -29,9 +30,7 @@ public:
 	float GetRightStickX(void) { return RightStickX/32767.0f; };
 	float GetRightStickY(void) { return RightStickY/32767.0f; };
 
-#ifdef DETECT_PAD_INPUT_SWITCH
-	bool IsAnyButtonPressed();
-#endif
+	bool CheckForInput();
 	void Clear(void);
 };
 VALIDATE_SIZE(CControllerState, 0x2A);
@@ -152,10 +151,10 @@ public:
 	int16 Phase;
 	int16 Mode;
 	int16 ShakeDur;
+	uint16 DisablePlayerControls;
 	uint8 ShakeFreq;
 	bool bHornHistory[HORNHISTORY_SIZE];
 	uint8 iCurrHornHistory;
-	uint8 DisablePlayerControls;
 	int8 bApplyBrakes;
 	char CheatString[12];
 	int32 LastTimeTouched;
@@ -176,7 +175,7 @@ public:
 	static CKeyboardState OldKeyState;
 	static CKeyboardState NewKeyState;
 	static CKeyboardState TempKeyState;
-	static char KeyBoardCheatString[20];
+	static char KeyBoardCheatString[30];
 	static CMouseControllerState OldMouseControllerState;
 	static CMouseControllerState NewMouseControllerState;
 	static CMouseControllerState PCTempMouseControllerState;
@@ -260,6 +259,7 @@ public:
 	static void ResetCheats(void);
 	static char *EditString(char *pStr, int32 nSize);
 	static int32 *EditCodesForControls(int32 *pRsKeys, int32 nSize);
+	uint32 InputHowLongAgo(void);
 
 #ifdef XINPUT
 	void AffectFromXinput(uint32 pad);
@@ -450,9 +450,9 @@ public:
 	int16 GetRightStickY(void)    { return NewState.RightStickY; }
 
 	bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
-	void SetDisablePlayerControls(uint8 who) { DisablePlayerControls |= who; }
-	void SetEnablePlayerControls(uint8 who) { DisablePlayerControls &= ~who; }
-	bool IsPlayerControlsDisabledBy(uint8 who) { return DisablePlayerControls & who; }
+	void SetDisablePlayerControls(uint16 who) { DisablePlayerControls |= who; }
+	void SetEnablePlayerControls(uint16 who) { DisablePlayerControls &= ~who; }
+	bool IsPlayerControlsDisabledBy(uint16 who) { return DisablePlayerControls & who; }
 };
 
 VALIDATE_SIZE(CPad, 0xFC);
diff --git a/src/core/Placeable.cpp b/src/core/Placeable.cpp
index 69b3d3ea..6efc1540 100644
--- a/src/core/Placeable.cpp
+++ b/src/core/Placeable.cpp
@@ -7,8 +7,6 @@ CPlaceable::CPlaceable(void)
 	m_matrix.SetScale(1.0f);
 }
 
-CPlaceable::~CPlaceable(void) = default;
-
 void
 CPlaceable::SetHeading(float angle)
 {
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
index 970c0d48..22f7583c 100644
--- a/src/core/Placeable.h
+++ b/src/core/Placeable.h
@@ -9,7 +9,6 @@ public:
 	CMatrix m_matrix;
 
 	CPlaceable(void);
-	virtual ~CPlaceable(void);
 	const CVector &GetPosition(void) { return m_matrix.GetPosition(); }
 	void SetPosition(float x, float y, float z) {
 		m_matrix.GetPosition().x = x;
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index c3cc0960..0be5f73e 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -140,20 +140,25 @@ CPlayerInfo::Clear(void)
 	m_nUpsideDownCounter = 0;
 	m_bInfiniteSprint = false;
 	m_bFastReload = false;
+	m_nMaxHealth = m_nMaxArmour = 100;
 	m_bGetOutOfJailFree = false;
 	m_bGetOutOfHospitalFree = false;
+	m_bDriveByAllowed = true;
 	m_nPreviousTimeRewardedForExplosion = 0;
 	m_nExplosionsSinceLastReward = 0;
+	m_nCurrentBustedAudio = 1;
+	m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
 }
 
 void
-CPlayerInfo::BlowUpRCBuggy(void)
+CPlayerInfo::BlowUpRCBuggy(bool actually)
 {
 	if (!m_pRemoteVehicle || m_pRemoteVehicle->bRemoveFromWorld)
 		return;
 
 	CRemote::TakeRemoteControlledCarFromPlayer();
-	m_pRemoteVehicle->BlowUpCar(FindPlayerPed());
+	if (actually)
+		m_pRemoteVehicle->BlowUpCar(FindPlayerPed());
 }
 
 void
@@ -171,7 +176,6 @@ void
 CPlayerInfo::MakePlayerSafe(bool toggle)
 {
 	if (toggle) {
-		CTheScripts::ResetCountdownToMakePlayerUnsafe();
 		m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
 		CWorld::StopAllLawEnforcersInTheirTracks();
 		CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;
@@ -192,7 +196,8 @@ CPlayerInfo::MakePlayerSafe(bool toggle)
 		CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);
 		CReplay::DisableReplays();
 
-	} else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {
+	}
+	else {
 		m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
 		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;
 		m_pPed->bBulletProof = false;
@@ -348,7 +353,7 @@ CPlayerInfo::Process(void)
 	bool startTaxiTimer = true;
 	if (m_bUnusedTaxiThing && m_pPed->bInVehicle) {
 		CVehicle *veh = m_pPed->m_pMyVehicle;
-		if ((veh->GetModelIndex() == MI_TAXI || veh->GetModelIndex() == MI_CABBIE || veh->GetModelIndex() == MI_BORGNINE)
+		if (veh->IsTaxi()
 			&& veh->pDriver == m_pPed && veh->m_nNumPassengers != 0) {
 			for (uint32 timePassed = CTimer::GetTimeInMilliseconds() - m_nUnusedTaxiTimer; timePassed >= 1000; m_nUnusedTaxiTimer += 1000) {
 				timePassed -= 1000;
diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h
index 94410753..11f51ac0 100644
--- a/src/core/PlayerInfo.h
+++ b/src/core/PlayerInfo.h
@@ -10,6 +10,13 @@ enum eWastedBustedState
 	WBSTATE_FAILED_CRITICAL_MISSION,
 };
 
+enum eBustedAudioState : uint8
+{
+	BUSTEDAUDIO_NONE,
+	BUSTEDAUDIO_LOADING,
+	BUSTEDAUDIO_DONE
+};
+
 class CEntity;
 class CPed;
 class CVehicle;
@@ -42,6 +49,7 @@ public:
 	uint32 m_nTimeLastHealthLoss;
 	uint32 m_nTimeLastArmourLoss;
 	uint32 m_nTimeTankShotGun;
+	int32 m_nTimeNotFullyOnGround;
 	int32 m_nUpsideDownCounter;
 	int32 field_248;
 	int16 m_nTrafficMultiplier;
@@ -50,10 +58,18 @@ public:
 	int32 m_nExplosionsSinceLastReward;
 	int32 field_268;
 	int32 field_272;
+	uint32 m_nHavocLevel;
+	float m_fMediaAttention;
 	bool m_bInfiniteSprint;
 	bool m_bFastReload;
+	bool m_bFireproof;
+	uint8 m_nMaxHealth;
+	uint8 m_nMaxArmour;
 	bool m_bGetOutOfJailFree;
 	bool m_bGetOutOfHospitalFree;
+	bool m_bDriveByAllowed;
+	eBustedAudioState m_nBustedAudioStatus;
+	int16 m_nCurrentBustedAudio;
 	char m_aSkinName[32];
 	RwTexture *m_pSkinTexture;
 
@@ -69,7 +85,7 @@ public:
 	bool IsPlayerInRemoteMode(void);
 	void PlayerFailedCriticalMission(void);
 	void Clear(void);
-	void BlowUpRCBuggy(void);
+	void BlowUpRCBuggy(bool);
 	void CancelPlayerEnteringCars(CVehicle*);
 	bool IsRestartingAfterDeath(void);
 	bool IsRestartingAfterArrest(void);
@@ -80,5 +96,3 @@ public:
 
 	~CPlayerInfo() { };
 };
-
-VALIDATE_SIZE(CPlayerInfo, 0x13C);
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index bd0814d0..6e3799f4 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -542,8 +542,20 @@ INITSAVEBUF
 		pPed->CharCreatedBy = pBufferPlayer->CharCreatedBy;
 		pPed->m_currentWeapon = 0;
 		pPed->m_maxWeaponTypeAllowed = pBufferPlayer->m_maxWeaponTypeAllowed;
-		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++)
-			pPed->m_weapons[i] = pBufferPlayer->m_weapons[i];
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+			if (pBufferPlayer->HasWeaponSlot(i)) {
+				int modelId = CWeaponInfo::GetWeaponInfo(pBufferPlayer->GetWeapon(i).m_eWeaponType)->m_nModelId;
+				if (modelId != -1) {
+					CStreaming::RequestModel(modelId, STREAMFLAGS_DEPENDENCY);
+					int modelId2 = CWeaponInfo::GetWeaponInfo(pBufferPlayer->GetWeapon(i).m_eWeaponType)->m_nModel2Id;
+					if (modelId2 != -1)
+						CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+					CStreaming::LoadAllRequestedModels(false);
+				}
+				pPed->GiveWeapon(pBufferPlayer->GetWeapon(i).m_eWeaponType, pBufferPlayer->GetWeapon(i).m_nAmmoTotal);
+			}
+		}
 
 		if (pedtype == PEDTYPE_PLAYER1) {
 			pPed->m_wepAccuracy = 100;
diff --git a/src/core/Pools.h b/src/core/Pools.h
index b0ba6598..2f0537ff 100644
--- a/src/core/Pools.h
+++ b/src/core/Pools.h
@@ -4,7 +4,7 @@
 #include "Lists.h"
 #include "Treadable.h"
 #include "Object.h"
-#include "CutsceneHead.h"
+#include "CutsceneObject.h"
 #include "PlayerPed.h"
 #include "Automobile.h"
 #include "DummyPed.h"
@@ -16,7 +16,7 @@ typedef CPool<CPed,CPlayerPed> CPedPool;
 typedef CPool<CVehicle,CAutomobile> CVehiclePool;
 typedef CPool<CBuilding> CBuildingPool;
 typedef CPool<CTreadable> CTreadablePool;
-typedef CPool<CObject, CCutsceneHead> CObjectPool;
+typedef CPool<CObject, CCutsceneObject> CObjectPool;
 typedef CPool<CDummy, CDummyPed> CDummyPool;
 typedef CPool<cAudioScriptObject> CAudioScriptObjectPool;
 
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 9406f1bd..475ca4d3 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -21,49 +21,87 @@ sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS];
 CVector2D vec2DRadarOrigin;
 int32 gRadarTxdIds[64];
 
-CSprite2d CRadar::AsukaSprite;
-CSprite2d CRadar::BombSprite;
-CSprite2d CRadar::CatSprite;
 CSprite2d CRadar::CentreSprite;
-CSprite2d CRadar::CopcarSprite;
-CSprite2d CRadar::DonSprite;
-CSprite2d CRadar::EightSprite;
-CSprite2d CRadar::ElSprite;
-CSprite2d CRadar::IceSprite;
-CSprite2d CRadar::JoeySprite;
-CSprite2d CRadar::KenjiSprite;
-CSprite2d CRadar::LizSprite;
-CSprite2d CRadar::LuigiSprite;
+CSprite2d CRadar::MapHereSprite;
 CSprite2d CRadar::NorthSprite;
-CSprite2d CRadar::RaySprite;
-CSprite2d CRadar::SalSprite;
-CSprite2d CRadar::SaveSprite;
+CSprite2d CRadar::AverySprite;
+CSprite2d CRadar::BikerSprite;
+CSprite2d CRadar::CortezSprite;
+CSprite2d CRadar::DiazSprite;
+CSprite2d CRadar::KentSprite;
+CSprite2d CRadar::LawyerSprite;
+CSprite2d CRadar::PhilSprite;
+CSprite2d CRadar::BikersSprite;
+CSprite2d CRadar::BoatyardSprite;
+CSprite2d CRadar::MalibuClubSprite;
+CSprite2d CRadar::CubansSprite;
+CSprite2d CRadar::FilmSprite;
+CSprite2d CRadar::GunSprite;
+CSprite2d CRadar::HaitiansSprite;
+CSprite2d CRadar::HardwareSprite;
+CSprite2d CRadar::SaveHouseSprite;
+CSprite2d CRadar::StripSprite;
+CSprite2d CRadar::IceSprite;
+CSprite2d CRadar::KCabsSprite;
+CSprite2d CRadar::LovefistSprite;
+CSprite2d CRadar::PrintworksSprite;
+CSprite2d CRadar::PropertySprite;
+CSprite2d CRadar::SunYardSprite;
 CSprite2d CRadar::SpraySprite;
-CSprite2d CRadar::TonySprite;
-CSprite2d CRadar::WeaponSprite;
+CSprite2d CRadar::TShirtSprite;
+CSprite2d CRadar::TommySprite;
+CSprite2d CRadar::PhoneSprite;
+CSprite2d CRadar::RadioWildstyleSprite;
+CSprite2d CRadar::RadioFlashSprite;
+CSprite2d CRadar::RadioKChatSprite;
+CSprite2d CRadar::RadioFeverSprite;
+CSprite2d CRadar::RadioVRockSprite;
+CSprite2d CRadar::RadioVCPRSprite;
+CSprite2d CRadar::RadioEspantosoSprite;
+CSprite2d CRadar::RadioEmotionSprite;
+CSprite2d CRadar::RadioWaveSprite;
 
 CSprite2d *CRadar::RadarSprites[RADAR_SPRITE_COUNT] = { 
 	nil,
-	&AsukaSprite,
-	&BombSprite,
-	&CatSprite,
 	&CentreSprite,
-	&CopcarSprite,
-	&DonSprite,
-	&EightSprite,
-	&ElSprite,
-	&IceSprite,
-	&JoeySprite,
-	&KenjiSprite,
-	&LizSprite,
-	&LuigiSprite,
+	&MapHereSprite,
 	&NorthSprite,
-	&RaySprite,
-	&SalSprite,
-	&SaveSprite,
+	&AverySprite,
+	&BikerSprite,
+	&CortezSprite,
+	&DiazSprite,
+	&KentSprite,
+	&LawyerSprite,
+	&PhilSprite,
+	&BikersSprite,
+	&BoatyardSprite,
+	&MalibuClubSprite,
+	&CubansSprite,
+	&FilmSprite,
+	&GunSprite,
+	&HaitiansSprite,
+	&HardwareSprite,
+	&SaveHouseSprite,
+	&StripSprite,
+	&IceSprite,
+	&KCabsSprite,
+	&LovefistSprite,
+	&PrintworksSprite,
+	&PropertySprite,
+	&SunYardSprite,
 	&SpraySprite,
-	&TonySprite,
-	&WeaponSprite
+	&TShirtSprite,
+	&TommySprite,
+	&PhoneSprite,
+	&RadioWildstyleSprite,
+	&RadioFlashSprite,
+	&RadioKChatSprite,
+	&RadioFeverSprite,
+	&RadioVRockSprite,
+	&RadioVCPRSprite,
+	&RadioEspantosoSprite,
+	&RadioEmotionSprite,
+	&RadioWaveSprite
 };
 
 // Why this doesn't coincide with world coordinates i don't know
@@ -87,12 +125,11 @@ static_assert(RADAR_TILE_SIZE == (RADAR_SIZE_Y / RADAR_NUM_TILES), "CRadar: not
 CRGBA CRadar::ArrowBlipColour1;
 CRGBA CRadar::ArrowBlipColour2;
 uint16 CRadar::MapLegendCounter;
-uint16 CRadar::MapLegendList[NUM_MAP_LEGENDS];
+int16 CRadar::MapLegendList[NUM_MAP_LEGENDS];
 int CRadar::TargetMarkerId = -1;
 CVector CRadar::TargetMarkerPos;
 #endif
 
-// taken from VC
 float CRadar::cachedCos;
 float CRadar::cachedSin;
 
@@ -227,7 +264,7 @@ int LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &
 uint8 CRadar::CalculateBlipAlpha(float dist)
 {
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive)
+	if (FrontEndMenuManager.m_bMenuMapActive)
 		return 255;
 #endif
 	if (dist <= 1.0f)
@@ -273,12 +310,9 @@ void CRadar::ClearBlip(int32 i)
 	if (index != -1) {
 		SetRadarMarkerState(index, false);
 		ms_RadarTrace[index].m_bInUse = false;
-#ifndef MENU_MAP
-		// Ssshhh
 		ms_RadarTrace[index].m_eBlipType = BLIP_NONE;
 		ms_RadarTrace[index].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
 		ms_RadarTrace[index].m_eRadarSprite = RADAR_SPRITE_NONE;
-#endif
 	}
 }
 
@@ -378,9 +412,8 @@ int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)
 bool CRadar::DisplayThisBlip(int32 counter)
 {
 	switch (ms_RadarTrace[counter].m_eRadarSprite) {
-	case RADAR_SPRITE_BOMB:
 	case RADAR_SPRITE_SPRAY:
-	case RADAR_SPRITE_WEAPON:
+	case RADAR_SPRITE_GUN:
 		return true;
 	default:
 		return false;
@@ -398,7 +431,7 @@ void CRadar::Draw3dMarkers()
 				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
 					CVector pos = entity->GetPosition();
 					pos.z += 1.2f * CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 2.5f;
-					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 2.5f, 0, 128, 255, 255, 1024, 0.2f, 5);
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 2.5f, CARBLIP_MARKER_COLOR_R, CARBLIP_MARKER_COLOR_G, CARBLIP_MARKER_COLOR_B, CARBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
 				}
 				break;
 			}
@@ -412,7 +445,7 @@ void CRadar::Draw3dMarkers()
 				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
 					CVector pos = entity->GetPosition();
 					pos.z += 3.0f;
-					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.5f, 0, 128, 255, 255, 1024, 0.2f, 5);
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.5f, CHARBLIP_MARKER_COLOR_R, CHARBLIP_MARKER_COLOR_G, CHARBLIP_MARKER_COLOR_B, CHARBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
 				}
 				break;
 			}
@@ -422,7 +455,7 @@ void CRadar::Draw3dMarkers()
 				if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY) {
 					CVector pos = entity->GetPosition();
 					pos.z += CModelInfo::GetModelInfo(entity->GetModelIndex())->GetColModel()->boundingBox.max.z + 1.0f + 1.0f;
-					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.0f, 0, 128, 255, 255, 1024, 0.2f, 5);
+					C3dMarkers::PlaceMarker(i | (ms_RadarTrace[i].m_BlipIndex << 16), 1, pos, 1.0f, OBJECTBLIP_MARKER_COLOR_R, OBJECTBLIP_MARKER_COLOR_G, OBJECTBLIP_MARKER_COLOR_B, OBJECTBLIP_MARKER_COLOR_A, 1024, 0.2f, 5);
 				}
 				break;
 			}
@@ -431,7 +464,7 @@ void CRadar::Draw3dMarkers()
 			case BLIP_CONTACT_POINT:
 				if (!CTheScripts::IsPlayerOnAMission()) {
 					if (ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_BOTH || ms_RadarTrace[i].m_eBlipDisplay == BLIP_DISPLAY_MARKER_ONLY)
-						C3dMarkers::PlaceMarkerSet(i | (ms_RadarTrace[i].m_BlipIndex << 16), 4, ms_RadarTrace[i].m_vecPos, 2.0f, 0, 128, 255, 128, 2048, 0.2f, 0);
+						C3dMarkers::PlaceMarkerSet(i | (ms_RadarTrace[i].m_BlipIndex << 16), 4, ms_RadarTrace[i].m_vecPos, 2.0f, COORDBLIP_MARKER_COLOR_R, COORDBLIP_MARKER_COLOR_G, COORDBLIP_MARKER_COLOR_B, COORDBLIP_MARKER_COLOR_A, 2048, 0.2f, 0);
 				}
 				break;
 			}
@@ -454,7 +487,7 @@ void CRadar::DrawBlips()
 		TransformRadarPointToScreenSpace(out, in);
 
 #ifdef MENU_MAP
-		if (!CMenuManager::bMenuMapActive) {
+		if (!FrontEndMenuManager.m_bMenuMapActive) {
 #endif
 			float angle;
 			if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN)
@@ -481,11 +514,6 @@ void CRadar::DrawBlips()
 
 		CEntity *blipEntity = nil;
 		for(int blipId = 0; blipId < NUMRADARBLIPS; blipId++) {
-#ifdef MENU_MAP
-			// A little hack to reuse cleared blips in menu map. hehe
-			if (!CMenuManager::bMenuMapActive || ms_RadarTrace[blipId].m_eBlipType == BLIP_CAR ||
-				ms_RadarTrace[blipId].m_eBlipType == BLIP_CHAR || ms_RadarTrace[blipId].m_eBlipType == BLIP_OBJECT)
-#endif
 			if (!ms_RadarTrace[blipId].m_bInUse)
 				continue;
 
@@ -493,8 +521,8 @@ void CRadar::DrawBlips()
 				case BLIP_CAR:
 				case BLIP_CHAR:
 				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_WEAPON) {
+					if (ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SAVE
+						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_GUN) {
 
 						switch (ms_RadarTrace[blipId].m_eBlipType) {
 							case BLIP_CAR:
@@ -527,21 +555,24 @@ void CRadar::DrawBlips()
 								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
 								float dist = LimitRadarPoint(in);
 								TransformRadarPointToScreenSpace(out, in);
-								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
-									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-								} else {
-#ifdef TRIANGULAR_BLIPS
-								    const CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-									const CVector &blipPos = blipEntity->GetPosition();
-									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
-									if (blipPos.z - pos.z <= 2.0f) {
-										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
-										else mode = BLIP_MODE_SQUARE;
+								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 									}
-									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
+									else {
+#ifdef TRIANGULAR_BLIPS
+										const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+										const CVector& blipPos = blipEntity->GetPosition();
+										uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+										if (blipPos.z - pos.z <= 2.0f) {
+											if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+											else mode = BLIP_MODE_SQUARE;
+										}
+										ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
 #else
-									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+										ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
 #endif
+									}
 								}
 							}
 						}
@@ -549,8 +580,8 @@ void CRadar::DrawBlips()
 					break;
 				case BLIP_COORD:
 				case BLIP_CONTACT_POINT:
-					if ((ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_BOMB || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SAVE
-						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_WEAPON)
+					if ((ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SAVE
+						|| ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_SPRAY || ms_RadarTrace[blipId].m_eRadarSprite == RADAR_SPRITE_GUN)
 						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {
 
 						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
@@ -566,21 +597,24 @@ void CRadar::DrawBlips()
 							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
 							float dist = LimitRadarPoint(in);
 							TransformRadarPointToScreenSpace(out, in);
-							if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
-								DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-							} else {
-#ifdef TRIANGULAR_BLIPS
-							    const CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-							    const CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;
-								uint8 mode = BLIP_MODE_TRIANGULAR_UP;
-								if (blipPos.z - pos.z <= 2.0f) {
-									if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
-									else mode = BLIP_MODE_SQUARE;
+							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
+									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 								}
-								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
+								else {
+#ifdef TRIANGULAR_BLIPS
+									const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+									const CVector& blipPos = ms_RadarTrace[blipId].m_vecPos;
+									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+									if (blipPos.z - pos.z <= 2.0f) {
+										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+										else mode = BLIP_MODE_SQUARE;
+									}
+									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
 #else
-								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
 #endif
+								}
 							}
 						}
 					}
@@ -597,8 +631,8 @@ void CRadar::DrawBlips()
 				case BLIP_CAR:
 				case BLIP_CHAR:
 				case BLIP_OBJECT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_WEAPON) {
+					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN) {
 
 						switch (ms_RadarTrace[blipId].m_eBlipType) {
 							case BLIP_CAR:
@@ -632,23 +666,25 @@ void CRadar::DrawBlips()
 								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
 								float dist = LimitRadarPoint(in);
 								TransformRadarPointToScreenSpace(out, in);
-								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
-									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-								else
+								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
+										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+									else
 #ifdef TRIANGULAR_BLIPS
-								{
-								    const CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-									const CVector &blipPos = blipEntity->GetPosition();
-									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
-									if (blipPos.z - pos.z <= 2.0f) {
-										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
-										else mode = BLIP_MODE_SQUARE;
+									{
+										const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+										const CVector& blipPos = blipEntity->GetPosition();
+										uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+										if (blipPos.z - pos.z <= 2.0f) {
+											if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+											else mode = BLIP_MODE_SQUARE;
+										}
+										ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
 									}
-									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-								}
 #else
-									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+										ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
 #endif
+								}
 							}
 						}
 					}
@@ -664,8 +700,8 @@ void CRadar::DrawBlips()
 			switch (ms_RadarTrace[blipId].m_eBlipType) {
 				case BLIP_COORD:
 				case BLIP_CONTACT_POINT:
-					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_BOMB && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
-						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_WEAPON
+					if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SAVE
+						&& ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_SPRAY && ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_GUN
 						&& (ms_RadarTrace[blipId].m_eBlipType != BLIP_CONTACT_POINT || !CTheScripts::IsPlayerOnAMission())) {
 
 						uint32 color = GetRadarTraceColour(ms_RadarTrace[blipId].m_nColor, ms_RadarTrace[blipId].m_bDim);
@@ -681,23 +717,25 @@ void CRadar::DrawBlips()
 							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
 							float dist = LimitRadarPoint(in);
 							TransformRadarPointToScreenSpace(out, in);
-							if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
-								DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
-							else
+							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
+								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
+									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
+								else
 #ifdef TRIANGULAR_BLIPS
-							{
-							    const CVector &pos = FindPlayerCentreOfWorld_NoSniperShift();
-							    const CVector &blipPos = ms_RadarTrace[blipId].m_vecPos;
-								uint8 mode = BLIP_MODE_TRIANGULAR_UP;
-								if (blipPos.z - pos.z <= 2.0f) {
-									if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
-									else mode = BLIP_MODE_SQUARE;
+								{
+									const CVector& pos = FindPlayerCentreOfWorld_NoSniperShift();
+									const CVector& blipPos = ms_RadarTrace[blipId].m_vecPos;
+									uint8 mode = BLIP_MODE_TRIANGULAR_UP;
+									if (blipPos.z - pos.z <= 2.0f) {
+										if (blipPos.z - pos.z < -4.0f) mode = BLIP_MODE_TRIANGULAR_DOWN;
+										else mode = BLIP_MODE_SQUARE;
+									}
+									ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
 								}
-								ShowRadarTraceWithHeight(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255, mode);
-							}
 #else
-								ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
+									ShowRadarTrace(out.x, out.y, ms_RadarTrace[blipId].m_wScale, (uint8)(color >> 24), (uint8)(color >> 16), (uint8)(color >> 8), 255);
 #endif
+							}
 						}
 					}
 					break;
@@ -706,7 +744,7 @@ void CRadar::DrawBlips()
 			}
 		}
 #ifdef MENU_MAP
-		if (CMenuManager::bMenuMapActive) {
+		if (FrontEndMenuManager.m_bMenuMapActive) {
 			CVector2D in, out;
 			TransformRealWorldPointToRadarSpace(in, FindPlayerCentreOfWorld_NoSniperShift());
 			TransformRadarPointToScreenSpace(out, in);
@@ -861,7 +899,7 @@ void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)
 {
 	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive) {
+	if (FrontEndMenuManager.m_bMenuMapActive) {
 		bool alreadyThere = false;
 		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
 			if (MapLegendList[i] == sprite)
@@ -992,6 +1030,7 @@ CRadar::Initialise()
 		ms_RadarTrace[i].m_BlipIndex = 1;
 		SetRadarMarkerState(i, false);
 		ms_RadarTrace[i].m_bInUse = false;
+		ms_RadarTrace[i].m_bShortRange = false;
 		ms_RadarTrace[i].m_eBlipType = BLIP_NONE;
 		ms_RadarTrace[i].m_eBlipDisplay = BLIP_DISPLAY_NEITHER;
 		ms_RadarTrace[i].m_eRadarSprite = RADAR_SPRITE_NONE;
@@ -1008,7 +1047,7 @@ float CRadar::LimitRadarPoint(CVector2D &point)
 
 	dist = point.Magnitude();
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive)
+	if (FrontEndMenuManager.m_bMenuMapActive)
 		return dist;
 #endif
 	if (dist > 1.0f) {
@@ -1036,26 +1075,45 @@ CRadar::LoadTextures()
 {
 	CTxdStore::PushCurrentTxd();
 	CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("hud"));
-	AsukaSprite.SetTexture("radar_asuka");
-	BombSprite.SetTexture("radar_bomb");
-	CatSprite.SetTexture("radar_cat");
 	CentreSprite.SetTexture("radar_centre");
-	CopcarSprite.SetTexture("radar_copcar");
-	DonSprite.SetTexture("radar_don");
-	EightSprite.SetTexture("radar_eight");
-	ElSprite.SetTexture("radar_el");
-	IceSprite.SetTexture("radar_ice");
-	JoeySprite.SetTexture("radar_joey");
-	KenjiSprite.SetTexture("radar_kenji");
-	LizSprite.SetTexture("radar_liz");
-	LuigiSprite.SetTexture("radar_luigi");
+	MapHereSprite.SetTexture("arrow");
 	NorthSprite.SetTexture("radar_north");
-	RaySprite.SetTexture("radar_ray");
-	SalSprite.SetTexture("radar_sal");
-	SaveSprite.SetTexture("radar_save");
-	SpraySprite.SetTexture("radar_spray");
-	TonySprite.SetTexture("radar_tony");
-	WeaponSprite.SetTexture("radar_weapon");
+	AverySprite.SetTexture("radar_avery");
+	BikerSprite.SetTexture("radar_biker");
+	CortezSprite.SetTexture("radar_cortez");
+	DiazSprite.SetTexture("radar_diaz");
+	KentSprite.SetTexture("radar_kent");
+	LawyerSprite.SetTexture("radar_lawyer");
+	PhilSprite.SetTexture("radar_phil");
+	BikersSprite.SetTexture("bikers");
+	BoatyardSprite.SetTexture("boatyard");
+	MalibuClubSprite.SetTexture("club");
+	CubansSprite.SetTexture("cubans");
+	FilmSprite.SetTexture("filmstudio");
+	GunSprite.SetTexture("gun");
+	HaitiansSprite.SetTexture("haitians");
+	HardwareSprite.SetTexture("hardware");
+	SaveHouseSprite.SetTexture("radar_save");
+	StripSprite.SetTexture("radar_strip");
+	IceSprite.SetTexture("icecream");
+	KCabsSprite.SetTexture("kcabs");
+	LovefistSprite.SetTexture("lovefist");
+	PrintworksSprite.SetTexture("printworks");
+	PropertySprite.SetTexture("property");
+	SunYardSprite.SetTexture("SunYard");
+	SpraySprite.SetTexture("spray");
+	TShirtSprite.SetTexture("tshirt");
+	TommySprite.SetTexture("tommy");
+	PhoneSprite.SetTexture("phone");
+	RadioWildstyleSprite.SetTexture("RWildstyle");
+	RadioFlashSprite.SetTexture("RFlash");
+	RadioKChatSprite.SetTexture("RKchat");
+	RadioFeverSprite.SetTexture("RFever");
+	RadioVRockSprite.SetTexture("RVRock");
+	RadioVCPRSprite.SetTexture("RVCPR");
+	RadioEspantosoSprite.SetTexture("REspantoso");
+	RadioEmotionSprite.SetTexture("REmotion");
+	RadioWaveSprite.SetTexture("RWave");
 	CTxdStore::PopCurrentTxd();
 }
 
@@ -1102,8 +1160,9 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 	}
 	ms_RadarTrace[nextBlip].m_eBlipType = type;
 	ms_RadarTrace[nextBlip].m_nColor = color;
-	ms_RadarTrace[nextBlip].m_bDim = 1;
-	ms_RadarTrace[nextBlip].m_bInUse = 1;
+	ms_RadarTrace[nextBlip].m_bDim = true;
+	ms_RadarTrace[nextBlip].m_bInUse = true;
+	ms_RadarTrace[nextBlip].m_bShortRange = false;
 	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
 	ms_RadarTrace[nextBlip].m_vec2DPos = pos;
 	ms_RadarTrace[nextBlip].m_vecPos = pos;
@@ -1114,6 +1173,15 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 	return CRadar::GetNewUniqueBlipIndex(nextBlip);
 }
 
+int CRadar::SetShortRangeCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)
+{
+	int index = SetCoordBlip(type, pos, color, display);
+	if (index == -1)
+		return -1;
+	ms_RadarTrace[GetActualBlipArrayIndex(index)].m_bShortRange = true;
+	return index;
+}
+
 int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)
 {
 	int nextBlip;
@@ -1123,8 +1191,9 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla
 	}
 	ms_RadarTrace[nextBlip].m_eBlipType = type;
 	ms_RadarTrace[nextBlip].m_nColor = color;
-	ms_RadarTrace[nextBlip].m_bDim = 1;
-	ms_RadarTrace[nextBlip].m_bInUse = 1;
+	ms_RadarTrace[nextBlip].m_bDim = true;
+	ms_RadarTrace[nextBlip].m_bInUse = true;
+	ms_RadarTrace[nextBlip].m_bShortRange = false;
 	ms_RadarTrace[nextBlip].m_Radius = 1.0f;
 	ms_RadarTrace[nextBlip].m_nEntityHandle = handle;
 	ms_RadarTrace[nextBlip].m_wScale = 1;
@@ -1209,7 +1278,7 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 	}
 #ifdef MENU_MAP
 	// VC uses -1 for coords and -2 for entities but meh, I don't want to edit DrawBlips
-	if (CMenuManager::bMenuMapActive) {
+	if (FrontEndMenuManager.m_bMenuMapActive) {
 		bool alreadyThere = false;
 		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
 			if (MapLegendList[i] == -1)
@@ -1226,26 +1295,45 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 
 void CRadar::Shutdown()
 {
-	AsukaSprite.Delete();
-	BombSprite.Delete();
-	CatSprite.Delete();
 	CentreSprite.Delete();
-	CopcarSprite.Delete();
-	DonSprite.Delete();
-	EightSprite.Delete();
-	ElSprite.Delete();
-	IceSprite.Delete();
-	JoeySprite.Delete();
-	KenjiSprite.Delete();
-	LizSprite.Delete();
-	LuigiSprite.Delete();
+	MapHereSprite.Delete();
 	NorthSprite.Delete();
-	RaySprite.Delete();
-	SalSprite.Delete();
-	SaveSprite.Delete();
+	AverySprite.Delete();
+	BikerSprite.Delete();
+	CortezSprite.Delete();
+	DiazSprite.Delete();
+	KentSprite.Delete();
+	LawyerSprite.Delete();
+	PhilSprite.Delete();
+	BikersSprite.Delete();
+	BoatyardSprite.Delete();
+	MalibuClubSprite.Delete();
+	CubansSprite.Delete();
+	FilmSprite.Delete();
+	GunSprite.Delete();
+	HaitiansSprite.Delete();
+	HardwareSprite.Delete();
+	SaveHouseSprite.Delete();
+	StripSprite.Delete();
+	IceSprite.Delete();
+	KCabsSprite.Delete();
+	LovefistSprite.Delete();
+	PrintworksSprite.Delete();
+	PropertySprite.Delete();
+	SunYardSprite.Delete();
 	SpraySprite.Delete();
-	TonySprite.Delete();
-	WeaponSprite.Delete();
+	TShirtSprite.Delete();
+	TommySprite.Delete();
+	PhoneSprite.Delete();
+	RadioWildstyleSprite.Delete();
+	RadioFlashSprite.Delete();
+	RadioKChatSprite.Delete();
+	RadioFeverSprite.Delete();
+	RadioVRockSprite.Delete();
+	RadioVCPRSprite.Delete();
+	RadioEspantosoSprite.Delete();
+	RadioEmotionSprite.Delete();
+	RadioWaveSprite.Delete();
 	RemoveRadarSections();
 }
 
@@ -1315,10 +1403,9 @@ void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D
 void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)
 {
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive) {
-		// fMapSize is actually half map size. Radar range is 1000, so if x is -2000, in.x + 2.0f is 0.
-		out.x = (CMenuManager::fMapCenterX - CMenuManager::fMapSize) + (in.x + 2.0f) * CMenuManager::fMapSize * 2.0f / 4.0f;
-		out.y = (CMenuManager::fMapCenterY - CMenuManager::fMapSize) + (2.0f - in.y) * CMenuManager::fMapSize * 2.0f / 4.0f;
+	if (FrontEndMenuManager.m_bMenuMapActive) {
+		out.x = (FrontEndMenuManager.m_fMapCenterX - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 + MENU_MAP_LEFT_OFFSET + in.x) * FrontEndMenuManager.m_fMapSize * MENU_MAP_WIDTH_SCALE * 2.0f / MENU_MAP_LENGTH;
+		out.y = (FrontEndMenuManager.m_fMapCenterY - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 - MENU_MAP_TOP_OFFSET - in.y) * FrontEndMenuManager.m_fMapSize * MENU_MAP_HEIGHT_SCALE * 2.0f / MENU_MAP_LENGTH;
 	} else
 #endif
 	{
@@ -1376,7 +1463,7 @@ CRadar::CalculateCachedSinCos()
 {
 	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED
 #ifdef MENU_MAP
-		|| CMenuManager::bMenuMapActive
+		|| FrontEndMenuManager.m_bMenuMapActive
 #endif
 		) {
 		cachedSin = 0.0f;
@@ -1406,7 +1493,7 @@ CRadar::InitFrontEndMap()
 	CalculateCachedSinCos();
 	vec2DRadarOrigin.x = 0.0f;
 	vec2DRadarOrigin.y = 0.0f;
-	m_radarRange = 1000.0f; // doesn't mean anything, just affects the calculation in TransformRadarPointToScreenSpace
+	m_radarRange = MENU_MAP_LENGTH_UNIT; // just affects the multiplier in TransformRadarPointToScreenSpace
 	for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
 		MapLegendList[i] = RADAR_SPRITE_NONE;
 	}
diff --git a/src/core/Radar.h b/src/core/Radar.h
index ec2bacd0..95b74b84 100644
--- a/src/core/Radar.h
+++ b/src/core/Radar.h
@@ -1,6 +1,33 @@
 #pragma once
 #include "Sprite2d.h"
 
+#define CARBLIP_MARKER_COLOR_R 252
+#define CARBLIP_MARKER_COLOR_G 138
+#define CARBLIP_MARKER_COLOR_B 242
+#define CARBLIP_MARKER_COLOR_A 255
+
+#define CHARBLIP_MARKER_COLOR_R 252
+#define CHARBLIP_MARKER_COLOR_G 138
+#define CHARBLIP_MARKER_COLOR_B 242
+#define CHARBLIP_MARKER_COLOR_A 255
+
+#define OBJECTBLIP_MARKER_COLOR_R 252
+#define OBJECTBLIP_MARKER_COLOR_G 138
+#define OBJECTBLIP_MARKER_COLOR_B 242
+#define OBJECTBLIP_MARKER_COLOR_A 255
+
+#define COORDBLIP_MARKER_COLOR_R 252
+#define COORDBLIP_MARKER_COLOR_G 138
+#define COORDBLIP_MARKER_COLOR_B 242
+#define COORDBLIP_MARKER_COLOR_A 255
+
+#define MENU_MAP_LENGTH_UNIT 1190.0f // in game unit
+#define MENU_MAP_WIDTH_SCALE 1.112f // in game unit (originally 1.112494151260504f)
+#define MENU_MAP_HEIGHT_SCALE 1.119f // in game unit (originally 1.118714268907563f)
+#define MENU_MAP_TOP_OFFSET 0.28f // in length unit defined above - ~333 game unit
+#define MENU_MAP_LEFT_OFFSET 0.185f // in length unit defined above - ~220 game unit
+#define MENU_MAP_LENGTH (4000.f / MENU_MAP_LENGTH_UNIT)
+
 enum eBlipType
 {
 	BLIP_NONE,
@@ -26,26 +53,46 @@ enum eRadarSprite
 	RADAR_SPRITE_COORD_BLIP = -1,
 #endif
 	RADAR_SPRITE_NONE = 0,
-	RADAR_SPRITE_ASUKA,
-	RADAR_SPRITE_BOMB,
-	RADAR_SPRITE_CAT,
 	RADAR_SPRITE_CENTRE,
-	RADAR_SPRITE_COPCAR,
-	RADAR_SPRITE_DON,
-	RADAR_SPRITE_EIGHT,
-	RADAR_SPRITE_EL,
-	RADAR_SPRITE_ICE,
-	RADAR_SPRITE_JOEY,
-	RADAR_SPRITE_KENJI,
-	RADAR_SPRITE_LIZ,
-	RADAR_SPRITE_LUIGI,
+	RADAR_SPRITE_MAP_HERE,
 	RADAR_SPRITE_NORTH,
-	RADAR_SPRITE_RAY,
-	RADAR_SPRITE_SAL,
+	RADAR_SPRITE_AVERY,
+	RADAR_SPRITE_BIKER,
+	RADAR_SPRITE_CORTEZ,
+	RADAR_SPRITE_DIAZ,
+	RADAR_SPRITE_KENT,
+	RADAR_SPRITE_LAWYER,
+	RADAR_SPRITE_PHIL,
+	RADAR_SPRITE_BIKERS,
+	RADAR_SPRITE_BOATYARD,
+	RADAR_SPRITE_MALIBU_CLUB,
+	RADAR_SPRITE_CUBANS,
+	RADAR_SPRITE_FILM,
+	RADAR_SPRITE_GUN,
+	RADAR_SPRITE_HAITIANS,
+	RADAR_SPRITE_HARDWARE,
 	RADAR_SPRITE_SAVE,
+	RADAR_SPRITE_STRIP,
+	RADAR_SPRITE_ICE,
+	RADAR_SPRITE_KCABS,
+	RADAR_SPRITE_LOVEFIST,
+	RADAR_SPRITE_PRINTWORKS,
+	RADAR_SPRITE_PROPERTY,
+	RADAR_SPRITE_SUNYARD,
 	RADAR_SPRITE_SPRAY,
-	RADAR_SPRITE_TONY,
-	RADAR_SPRITE_WEAPON,
+	RADAR_SPRITE_TSHIRT,
+	RADAR_SPRITE_TOMMY,
+	RADAR_SPRITE_PHONE,
+	RADAR_SPRITE_RADIO_WILDSTYLE,
+	RADAR_SPRITE_RADIO_FLASH,
+	RADAR_SPRITE_RADIO_KCHAT,
+	RADAR_SPRITE_RADIO_FEVER,
+	RADAR_SPRITE_RADIO_VROCK,
+	RADAR_SPRITE_RADIO_VCPR,
+	RADAR_SPRITE_RADIO_ESPANTOSO,
+	RADAR_SPRITE_RADIO_EMOTION,
+	RADAR_SPRITE_RADIO_WAVE,
+
 	RADAR_SPRITE_COUNT
 };
 
@@ -66,16 +113,16 @@ struct sRadarTrace
 	uint16 m_BlipIndex;
 	bool m_bDim;
 	bool m_bInUse;
+	bool m_bShortRange;
 	float m_Radius;
 	int16 m_wScale;
 	uint16 m_eBlipDisplay; // eBlipDisplay
 	uint16 m_eRadarSprite; // eRadarSprite
 };
-VALIDATE_SIZE(sRadarTrace, 0x30);
 
 // Values for screen space
 #define RADAR_LEFT (40.0f)
-#define RADAR_BOTTOM (47.0f)
+#define RADAR_BOTTOM (40.0f)
 #define RADAR_WIDTH (94.0f)
 #define RADAR_HEIGHT (76.0f)
 
@@ -84,26 +131,45 @@ class CRadar
 public:
 	static float m_radarRange;
 	static sRadarTrace ms_RadarTrace[NUMRADARBLIPS];
-	static CSprite2d AsukaSprite;
-	static CSprite2d BombSprite;
-	static CSprite2d CatSprite;
 	static CSprite2d CentreSprite;
-	static CSprite2d CopcarSprite;
-	static CSprite2d DonSprite;
-	static CSprite2d EightSprite;
-	static CSprite2d ElSprite;
-	static CSprite2d IceSprite;
-	static CSprite2d JoeySprite;
-	static CSprite2d KenjiSprite;
-	static CSprite2d LizSprite;
-	static CSprite2d LuigiSprite;
+	static CSprite2d MapHereSprite;
 	static CSprite2d NorthSprite;
-	static CSprite2d RaySprite;
-	static CSprite2d SalSprite;
-	static CSprite2d SaveSprite;
+	static CSprite2d AverySprite;
+	static CSprite2d BikerSprite;
+	static CSprite2d CortezSprite;
+	static CSprite2d DiazSprite;
+	static CSprite2d KentSprite;
+	static CSprite2d LawyerSprite;
+	static CSprite2d PhilSprite;
+	static CSprite2d BikersSprite;
+	static CSprite2d BoatyardSprite;
+	static CSprite2d MalibuClubSprite;
+	static CSprite2d CubansSprite;
+	static CSprite2d FilmSprite;
+	static CSprite2d GunSprite;
+	static CSprite2d HaitiansSprite;
+	static CSprite2d HardwareSprite;
+	static CSprite2d SaveHouseSprite;
+	static CSprite2d StripSprite;
+	static CSprite2d IceSprite;
+	static CSprite2d KCabsSprite;
+	static CSprite2d LovefistSprite;
+	static CSprite2d PrintworksSprite;
+	static CSprite2d PropertySprite;
+	static CSprite2d SunYardSprite;
 	static CSprite2d SpraySprite;
-	static CSprite2d TonySprite;
-	static CSprite2d WeaponSprite;
+	static CSprite2d TShirtSprite;
+	static CSprite2d TommySprite;
+	static CSprite2d PhoneSprite;
+	static CSprite2d RadioWildstyleSprite;
+	static CSprite2d RadioFlashSprite;
+	static CSprite2d RadioKChatSprite;
+	static CSprite2d RadioFeverSprite;
+	static CSprite2d RadioVRockSprite;
+	static CSprite2d RadioVCPRSprite;
+	static CSprite2d RadioEspantosoSprite;
+	static CSprite2d RadioEmotionSprite;
+	static CSprite2d RadioWaveSprite;
 	static CSprite2d *RadarSprites[RADAR_SPRITE_COUNT];
 	static float cachedCos;
 	static float cachedSin;
@@ -111,7 +177,7 @@ public:
 #define NUM_MAP_LEGENDS 75
 	static CRGBA ArrowBlipColour1;
 	static CRGBA ArrowBlipColour2;
-	static uint16 MapLegendList[NUM_MAP_LEGENDS];
+	static int16 MapLegendList[NUM_MAP_LEGENDS];
 	static uint16 MapLegendCounter;
 	static int TargetMarkerId;
 	static CVector TargetMarkerPos;
@@ -149,6 +215,7 @@ public:
 	static void SetBlipSprite(int32 i, int32 icon);
 	static int32 SetCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay);
 	static int32 SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay);
+	static int32 SetShortRangeCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay);
 	static void SetRadarMarkerState(int32 i, bool flag);
 	static void ShowRadarMarker(CVector pos, uint32 color, float radius);
 	static void ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha);
diff --git a/src/core/Stats.cpp b/src/core/Stats.cpp
index 99274e04..91f583bd 100644
--- a/src/core/Stats.cpp
+++ b/src/core/Stats.cpp
@@ -4,6 +4,9 @@
 #include "Text.h"
 #include "World.h"
 
+//TODO
+int32 CStats::SeagullsKilled;
+
 int32 CStats::DaysPassed;
 int32 CStats::HeadsPopped;
 int32 CStats::CommercialPassed;
@@ -57,6 +60,14 @@ int32 CStats::mmRain;
 int32 CStats::CarsCrushed;
 int32 CStats::FastestTimes[CStats::TOTAL_FASTEST_TIMES];
 int32 CStats::HighestScores[CStats::TOTAL_HIGHEST_SCORES];
+int32 CStats::PropertyDestroyed;
+
+int32 CStats::Sprayings;
+float CStats::AutoPaintingBudget;
+int32 CStats::NoMoreHurricanes;
+float CStats::FashionBudget;
+int32 CStats::SafeHouseVisits;
+int32 CStats::TyresPopped;
 
 void CStats::Init()
 {
@@ -113,6 +124,11 @@ void CStats::Init()
 	IndustrialPassed = 0;
 	CommercialPassed = 0;
 	SuburbanPassed = 0;
+
+	Sprayings = 0;
+	AutoPaintingBudget = 0.0f;
+	NoMoreHurricanes = 0;
+	SafeHouseVisits = 0;
 }
 
 void CStats::RegisterFastestTime(int32 index, int32 time)
@@ -241,6 +257,19 @@ int32 CStats::FindCriminalRatingNumber()
 	return rating;
 }
 
+float CStats::GetPercentageProgress()
+{
+	float percentCompleted = (CStats::TotalProgressInGame == 0 ? 0 :
+		CStats::ProgressMade * 100.0f / (CGame::nastyGame ? CStats::TotalProgressInGame : CStats::TotalProgressInGame - 1.0f));
+
+	return Min(percentCompleted, 100.0f);
+}
+
+void CStats::MoneySpentOnFashion(int32 money)
+{
+	FashionBudget += money;
+}
+
 void CStats::SaveStats(uint8 *buf, uint32 *size)
 {
 	CheckPointReachedSuccessfully();
diff --git a/src/core/Stats.h b/src/core/Stats.h
index ae3c0cb4..33d4ef72 100644
--- a/src/core/Stats.h
+++ b/src/core/Stats.h
@@ -9,6 +9,9 @@ public:
 		TOTAL_FASTEST_TIMES = 16,
 		TOTAL_HIGHEST_SCORES = 16
 	};
+	//TODO
+	static int32 SeagullsKilled;
+	
 	static int32 DaysPassed;
 	static int32 HeadsPopped;
 	static int32 CommercialPassed;
@@ -62,6 +65,13 @@ public:
 	static int32 CarsCrushed;
 	static int32 FastestTimes[TOTAL_FASTEST_TIMES];
 	static int32 HighestScores[TOTAL_HIGHEST_SCORES];
+	static int32 PropertyDestroyed;
+	static int32 Sprayings;
+	static float AutoPaintingBudget;
+	static int32 NoMoreHurricanes;
+	static float FashionBudget;
+	static int32 SafeHouseVisits;
+	static int32 TyresPopped;
 
 public:
 	static void Init(void);
@@ -87,4 +97,7 @@ public:
 	static int32 FindCriminalRatingNumber();
 	static void SaveStats(uint8 *buf, uint32 *size);
 	static void LoadStats(uint8 *buf, uint32 size);
+	static float GetPercentageProgress();
+
+	static void MoneySpentOnFashion(int32);
 };
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index c961f53d..985b28c9 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -18,7 +18,6 @@
 #include "FileMgr.h"
 #include "FileLoader.h"
 #include "Zones.h"
-#include "ZoneCull.h"
 #include "Radar.h"
 #include "Camera.h"
 #include "Record.h"
@@ -28,10 +27,10 @@
 #include "CutsceneMgr.h"
 #include "CdStream.h"
 #include "Streaming.h"
-#ifdef FIX_BUGS
 #include "Replay.h"
-#endif
 #include "main.h"
+#include "ColStore.h"
+#include "DMAudio.h"
 
 bool CStreaming::ms_disableStreaming;
 bool CStreaming::ms_bLoadingBigModel;
@@ -51,9 +50,9 @@ int32 CStreaming::ms_channelError;
 int32 CStreaming::ms_numVehiclesLoaded;
 int32 CStreaming::ms_vehiclesLoaded[MAXVEHICLESLOADED];
 int32 CStreaming::ms_lastVehicleDeleted;
+bool CStreaming::ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP];
 CDirectory *CStreaming::ms_pExtraObjectsDir;
 int32 CStreaming::ms_numPriorityRequests;
-bool CStreaming::ms_hasLoadedLODs;
 int32 CStreaming::ms_currentPedGrp;
 int32 CStreaming::ms_currentPedLoading;
 int32 CStreaming::ms_lastCullZone;
@@ -66,17 +65,12 @@ uint32 CStreaming::ms_memoryAvailable;
 
 int32 desiredNumVehiclesLoaded = 12;
 
-CEntity *pIslandLODindustEntity;
-CEntity *pIslandLODcomIndEntity;
-CEntity *pIslandLODcomSubEntity;
-CEntity *pIslandLODsubIndEntity;
-CEntity *pIslandLODsubComEntity;
-int32 islandLODindust;
-int32 islandLODcomInd;
-int32 islandLODcomSub;
-int32 islandLODsubInd;
-int32 islandLODsubCom;
+CEntity *pIslandLODmainlandEntity;
+CEntity *pIslandLODbeachEntity;
+int32 islandLODmainland;
+int32 islandLODbeach;
 
+//--MIAMI: done
 bool
 CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)
 {
@@ -87,6 +81,7 @@ CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)
 	return true;
 }
 
+//--MIAMI: done
 void
 CStreamingInfo::SetCdPosnAndSize(uint32 posn, uint32 size)
 {
@@ -94,6 +89,7 @@ CStreamingInfo::SetCdPosnAndSize(uint32 posn, uint32 size)
 	m_size = size;
 }
 
+//--MIAMI: done
 void
 CStreamingInfo::AddToList(CStreamingInfo *link)
 {
@@ -104,6 +100,7 @@ CStreamingInfo::AddToList(CStreamingInfo *link)
 	m_next->m_prev = this;
 }
 
+//--MIAMI: done
 void
 CStreamingInfo::RemoveFromList(void)
 {
@@ -113,6 +110,7 @@ CStreamingInfo::RemoveFromList(void)
 	m_prev = nil;
 }
 
+//--MIAMI: done
 void
 CStreaming::Init2(void)
 {
@@ -182,13 +180,15 @@ CStreaming::Init2(void)
 		ms_vehiclesLoaded[i] = -1;
 	ms_numVehiclesLoaded = 0;
 
+	for(i = 0; i < ARRAY_SIZE(ms_bIsPedFromPedGroupLoaded); i++)
+		ms_bIsPedFromPedGroupLoaded[i] = false;
+
 	ms_pExtraObjectsDir = new CDirectory(EXTRADIRSIZE);
 	ms_numPriorityRequests = 0;
-	ms_hasLoadedLODs = true;
 	ms_currentPedGrp = -1;
 	ms_lastCullZone = -1;		// unused because RemoveModelsNotVisibleFromCullzone is gone
 	ms_loadedGangs = 0;
-	ms_currentPedLoading = 8;	// unused, whatever it is
+	ms_currentPedLoading = NUMMODELSPERPEDGROUP;	// unused, whatever it is
 
 	LoadCdDirectory();
 
@@ -199,48 +199,20 @@ CStreaming::Init2(void)
 	ms_pStreamingBuffer[1] = ms_pStreamingBuffer[0] + ms_streamingBufferSize*CDSTREAM_SECTOR_SIZE;
 	debug("Streaming buffer size is %d sectors", ms_streamingBufferSize);
 
-	// PC only, figure out how much memory we got
-#ifdef GTA_PC
 #define MB (1024*1024)
-	extern unsigned long _dwMemAvailPhys;
-	ms_memoryAvailable = (_dwMemAvailPhys - 10*MB)/2;
-	if(ms_memoryAvailable < 50*MB)
-		ms_memoryAvailable = 50*MB;
-	desiredNumVehiclesLoaded = (ms_memoryAvailable/MB - 50)/3 + 12;
-	if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
-		desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
+	ms_memoryAvailable = 65*MB;
+	desiredNumVehiclesLoaded = 25;
 	debug("Memory allocated to Streaming is %dMB", ms_memoryAvailable/MB);
 #undef MB
-#endif
 
 	// find island LODs
 
-	pIslandLODindustEntity = nil;
-	pIslandLODcomIndEntity = nil;
-	pIslandLODcomSubEntity = nil;
-	pIslandLODsubIndEntity = nil;
-	pIslandLODsubComEntity = nil;
-	islandLODindust = -1;
-	islandLODcomInd = -1;
-	islandLODcomSub = -1;
-	islandLODsubInd = -1;
-	islandLODsubCom = -1;
-        CModelInfo::GetModelInfo("IslandLODInd", &islandLODindust);
-        CModelInfo::GetModelInfo("IslandLODcomIND", &islandLODcomInd);
-        CModelInfo::GetModelInfo("IslandLODcomSUB", &islandLODcomSub);
-        CModelInfo::GetModelInfo("IslandLODsubIND", &islandLODsubInd);
-        CModelInfo::GetModelInfo("IslandLODsubCOM", &islandLODsubCom);
-
-	for(i = CPools::GetBuildingPool()->GetSize()-1; i >= 0; i--){
-		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
-		if(building == nil)
-			continue;
-		if(building->GetModelIndex() == islandLODindust) pIslandLODindustEntity = building;
-		if(building->GetModelIndex() == islandLODcomInd) pIslandLODcomIndEntity = building;
-		if(building->GetModelIndex() == islandLODcomSub) pIslandLODcomSubEntity = building;
-		if(building->GetModelIndex() == islandLODsubInd) pIslandLODsubIndEntity = building;
-		if(building->GetModelIndex() == islandLODsubCom) pIslandLODsubComEntity = building;
-	}
+	pIslandLODmainlandEntity = nil;
+	pIslandLODbeachEntity = nil;
+	islandLODmainland = -1;
+	islandLODbeach = -1;
+        CModelInfo::GetModelInfo("IslandLODmainland", &islandLODmainland);
+        CModelInfo::GetModelInfo("IslandLODbeach", &islandLODbeach);
 }
 
 void
@@ -266,6 +238,7 @@ CStreaming::Init(void)
 #endif
 }
 
+//--MIAMI: done
 void
 CStreaming::Shutdown(void)
 {
@@ -275,10 +248,10 @@ CStreaming::Shutdown(void)
 		delete ms_pExtraObjectsDir;
 }
 
+//--MIAMI: done
 void
 CStreaming::Update(void)
 {
-	CEntity *train;
 	CStreamingInfo *si, *prev;
 	bool requestedSubway = false;
 
@@ -292,31 +265,32 @@ CStreaming::Update(void)
 	if(CTimer::GetIsPaused())
 		return;
 
-	train = FindPlayerTrain();
-	if(train && train->GetPosition().z < 0.0f){
-		RequestSubway();
-		requestedSubway = true;
-	}else if(!ms_disableStreaming)
+	LoadBigBuildingsWhenNeeded();
+	if(!ms_disableStreaming && TheCamera.GetPosition().z < 55.0f)
 		AddModelsToRequestList(TheCamera.GetPosition());
 
 	DeleteFarAwayRwObjects(TheCamera.GetPosition());
 
 	if(!ms_disableStreaming &&
-	   !CCutsceneMgr::IsRunning() &&
-	   !requestedSubway &&
-	   !CGame::playingIntro &&
+	   !CCutsceneMgr::IsCutsceneProcessing() &&
 	   ms_numModelsRequested < 5 &&
-	   !CRenderer::m_loadingPriority
-#ifdef FIX_BUGS
-		&& !CReplay::IsPlayingBack()
-#endif
-		){
+	   !CRenderer::m_loadingPriority &&
+	   CGame::currArea == AREA_MAIN_MAP &&
+	   !CReplay::IsPlayingBack()){
 		StreamVehiclesAndPeds();
 		StreamZoneModels(FindPlayerCoors());
 	}
 
 	LoadRequestedModels();
 
+	if(CWorld::Players[0].m_pRemoteVehicle){
+		CColStore::AddCollisionNeededAtPosn(FindPlayerCoors());
+		CColStore::LoadCollision(CWorld::Players[0].m_pRemoteVehicle->GetPosition());
+		CColStore::EnsureCollisionIsInMemory(CWorld::Players[0].m_pRemoteVehicle->GetPosition());
+	}else{
+		CColStore::LoadCollision(FindPlayerCoors());
+		CColStore::EnsureCollisionIsInMemory(FindPlayerCoors());
+	}
 
 	for(si = ms_endRequestedList.m_prev; si != &ms_startRequestedList; si = prev){
 		prev = si->m_prev;
@@ -325,6 +299,7 @@ CStreaming::Update(void)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::LoadCdDirectory(void)
 {
@@ -338,12 +313,6 @@ CStreaming::LoadCdDirectory(void)
 	ms_imageOffsets[3] = -1;
 	ms_imageOffsets[4] = -1;
 	ms_imageOffsets[5] = -1;
-	ms_imageOffsets[6] = -1;
-	ms_imageOffsets[7] = -1;
-	ms_imageOffsets[8] = -1;
-	ms_imageOffsets[9] = -1;
-	ms_imageOffsets[10] = -1;
-	ms_imageOffsets[11] = -1;
 	ms_imageSize = GetGTA3ImgSize();
 	// PS2 uses CFileMgr::GetCdFile on all IMG files to fill the array
 #endif
@@ -359,12 +328,12 @@ CStreaming::LoadCdDirectory(void)
 	ms_imageSize /= CDSTREAM_SECTOR_SIZE;
 }
 
+//--MIAMI: done
 void
 CStreaming::LoadCdDirectory(const char *dirname, int n)
 {
 	int fd, lastID, imgSelector;
-	int modelId, txdId;
-	uint32 posn, size;
+	int modelId;
 	CDirectory::DirectoryInfo direntry;
 	char *dot;
 
@@ -375,23 +344,23 @@ CStreaming::LoadCdDirectory(const char *dirname, int n)
 	imgSelector = n<<24;
 	assert(sizeof(direntry) == 32);
 	while(CFileMgr::Read(fd, (char*)&direntry, sizeof(direntry))){
-		dot = strchr(direntry.name, '.');
-		if(dot) *dot = '\0';
+		bool bAddToStreaming = false;
+
 		if(direntry.size > (uint32)ms_streamingBufferSize)
 			ms_streamingBufferSize = direntry.size;
+		direntry.name[23] = '\0';
+		dot = strchr(direntry.name, '.');
+		if(dot == nil || dot-direntry.name > 20){
+			debug("%s is too long\n", direntry.name);
+			lastID = -1;
+			continue;
+		}
+
+		*dot = '\0';
 
-		if(!CGeneral::faststrcmp(dot+1, "DFF") || !CGeneral::faststrcmp(dot+1, "dff")){
+		if(strncasecmp(dot+1, "DFF", 3) == 0){
 			if(CModelInfo::GetModelInfo(direntry.name, &modelId)){
-				if(ms_aInfoForModel[modelId].GetCdPosnAndSize(posn, size)){
-					debug("%s appears more than once in %s\n", direntry.name, dirname);
-					lastID = -1;
-				}else{
-					direntry.offset |= imgSelector;
-					ms_aInfoForModel[modelId].SetCdPosnAndSize(direntry.offset, direntry.size);
-					if(lastID != -1)
-						ms_aInfoForModel[lastID].m_nextID = modelId;
-					lastID = modelId;
-				}
+				bAddToStreaming = true;
 			}else{
 #ifdef FIX_BUGS
 				// remember which cdimage this came from
@@ -401,27 +370,63 @@ CStreaming::LoadCdDirectory(const char *dirname, int n)
 #endif
 				lastID = -1;
 			}
-		}else if(!CGeneral::faststrcmp(dot+1, "TXD") || !CGeneral::faststrcmp(dot+1, "txd")){
-			txdId = CTxdStore::FindTxdSlot(direntry.name);
-			if(txdId == -1)
-				txdId = CTxdStore::AddTxdSlot(direntry.name);
-			if(ms_aInfoForModel[txdId + STREAM_OFFSET_TXD].GetCdPosnAndSize(posn, size)){
-				debug("%s appears more than once in %s\n", direntry.name, dirname);
+		}else if(strncasecmp(dot+1, "TXD", 3) == 0){
+			modelId = CTxdStore::FindTxdSlot(direntry.name);
+			if(modelId == -1)
+				modelId = CTxdStore::AddTxdSlot(direntry.name);
+			modelId += STREAM_OFFSET_TXD;
+			bAddToStreaming = true;
+		}else if(strncasecmp(dot+1, "COL", 3) == 0){
+			modelId = CColStore::FindColSlot(direntry.name);
+			if(modelId == -1)
+				modelId = CColStore::AddColSlot(direntry.name);
+			modelId += STREAM_OFFSET_COL;
+			bAddToStreaming = true;
+		}else if(strncasecmp(dot+1, "IFP", 3) == 0){
+			modelId = CAnimManager::RegisterAnimBlock(direntry.name);
+			modelId += STREAM_OFFSET_ANIM;
+			bAddToStreaming = true;
+		}else{
+			*dot = '.';
+			lastID = -1;
+		}
+
+		if(bAddToStreaming){
+			if(ms_aInfoForModel[modelId].GetCdSize()){
+				debug("%s.%s appears more than once in %s\n", direntry.name, dot+1, dirname);
 				lastID = -1;
 			}else{
 				direntry.offset |= imgSelector;
-				ms_aInfoForModel[txdId + STREAM_OFFSET_TXD].SetCdPosnAndSize(direntry.offset, direntry.size);
+				ms_aInfoForModel[modelId].SetCdPosnAndSize(direntry.offset, direntry.size);
 				if(lastID != -1)
-					ms_aInfoForModel[lastID].m_nextID = txdId + STREAM_OFFSET_TXD;
-				lastID = txdId + STREAM_OFFSET_TXD;
+					ms_aInfoForModel[lastID].m_nextID = modelId;
+				lastID = modelId;
 			}
-		}else
-			lastID = -1;
+		}
 	}
 
 	CFileMgr::CloseFile(fd);
 }
 
+static char*
+GetObjectName(int streamId)
+{
+	static char objname[32];
+	if(streamId < STREAM_OFFSET_TXD)
+		sprintf(objname, "%s.dff", CModelInfo::GetModelInfo(streamId)->GetName());
+	else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL)
+		sprintf(objname, "%s.txd", CTxdStore::GetTxdName(streamId-STREAM_OFFSET_TXD));
+	else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM)
+		sprintf(objname, "%s.col", CColStore::GetColName(streamId-STREAM_OFFSET_COL));
+	else{
+		assert(streamId < NUMSTREAMINFO);
+		sprintf(objname, "%s.ifp", CAnimManager::GetAnimationBlock(streamId-STREAM_OFFSET_ANIM)->name);
+	}
+	return objname;
+}
+
+
+//--MIAMI: done
 bool
 CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 {
@@ -443,22 +448,25 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 		// Model
 		mi = CModelInfo::GetModelInfo(streamId);
 
-		// Txd has to be loaded
-		if(CTxdStore::GetSlot(mi->GetTxdSlot())->texDict == nil){
-			debug("failed to load %s because TXD %s is not in memory\n", mi->GetName(), CTxdStore::GetTxdName(mi->GetTxdSlot()));
+		// Txd and anim have to be loaded
+		int animId = mi->GetAnimFileIndex();
+		if(CTxdStore::GetSlot(mi->GetTxdSlot())->texDict == nil ||
+		   animId != -1 && !CAnimManager::GetAnimationBlock(animId)->isLoaded){
 			RemoveModel(streamId);
-			RemoveTxd(mi->GetTxdSlot());
 			ReRequestModel(streamId);
 			RwStreamClose(stream, &mem);
 			return false;
 		}
 
-		// Set Txd to use
+		// Set Txd and anims to use
 		CTxdStore::AddRef(mi->GetTxdSlot());
+		if(animId != -1)
+			CAnimManager::AddAnimBlockRef(animId);
 		CTxdStore::SetCurrentTxd(mi->GetTxdSlot());
 
 		if(mi->IsSimple()){
 			success = CFileLoader::LoadAtomicFile(stream, streamId);
+			// TODO(MIAMI)? complain if file is not pre-instanced. we hardly are interested in that
 		} else if (mi->GetModelType() == MITYPE_VEHICLE) {
 			// load vehicles in two parts
 			CModelInfo::GetModelInfo(streamId)->AddRef();
@@ -470,9 +478,12 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 		}
 		UpdateMemoryUsed();
 
-		// Txd no longer needed unless we only read part of the file
-		if(ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_STARTED)
+		// Txd and anims no longer needed unless we only read part of the file
+		if(ms_aInfoForModel[streamId].m_loadState != STREAMSTATE_STARTED){
 			CTxdStore::RemoveRefWithoutDelete(mi->GetTxdSlot());
+			if(animId != -1)
+				CAnimManager::RemoveAnimBlockRefWithoutDelete(animId);
+		}
 
 		if(!success){
 			debug("Failed to load %s\n", CModelInfo::GetModelInfo(streamId)->GetName());
@@ -481,9 +492,8 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 			RwStreamClose(stream, &mem);
 			return false;
 		}
-	}else{
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
 		// Txd
-		assert(streamId < NUMSTREAMINFO);
 		if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY) == 0 &&
 		   !IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD)){
 			RemoveModel(streamId);
@@ -506,20 +516,28 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 			RwStreamClose(stream, &mem);
 			return false;
 		}
+	}else if(streamId >= STREAM_OFFSET_COL && streamId < STREAM_OFFSET_ANIM){
+		if(!CColStore::LoadCol(streamId-STREAM_OFFSET_COL, mem.start, mem.length)){
+			debug("Failed to load %s.col\n", CColStore::GetColName(streamId - STREAM_OFFSET_COL));
+			RemoveModel(streamId);
+			ReRequestModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+	}else if(streamId >= STREAM_OFFSET_ANIM){
+		assert(streamId < NUMSTREAMINFO);
+		if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY) == 0 &&
+		   !AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM)){
+			RemoveModel(streamId);
+			RwStreamClose(stream, &mem);
+			return false;
+		}
+		CAnimManager::LoadAnimFile(stream, true, nil);
+		CAnimManager::CreateAnimAssocGroups();
 	}
 
 	RwStreamClose(stream, &mem);
 
-	// We shouldn't even end up here unless load was successful
-	if(!success){
-		ReRequestModel(streamId);
-		if(streamId < STREAM_OFFSET_TXD)
-			debug("Failed to load %s.dff\n", mi->GetName());
-		else
-			debug("Failed to load %s.txd\n", CTxdStore::GetTxdName(streamId - STREAM_OFFSET_TXD));
-		return false;
-	}
-
 	if(streamId < STREAM_OFFSET_TXD){
 		// Model
 		// Vehicles and Peds not in loaded list
@@ -534,12 +552,14 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 					smi->m_alpha = 0;
 			}
 
-			if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_CANT_REMOVE) == 0)
+			if(CanRemoveModel(streamId))
 				ms_aInfoForModel[streamId].AddToList(&ms_startLoadedList);
 		}
-	}else{
-		// Txd
-		if((ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_CANT_REMOVE) == 0)
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL ||
+	         streamId >= STREAM_OFFSET_ANIM){
+		assert(streamId < NUMSTREAMINFO);
+		// Txd and anims
+		if(CanRemoveModel(streamId))
 			ms_aInfoForModel[streamId].AddToList(&ms_startLoadedList);
 	}
 
@@ -551,17 +571,13 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 
 	endTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
 	timeDiff = endTime - startTime;
-	if(timeDiff > 5){
-		if(streamId < STREAM_OFFSET_TXD)
-			debug("model %s took %d ms\n", CModelInfo::GetModelInfo(streamId)->GetName(), timeDiff);
-		else
-			debug("txd %s took %d ms\n", CTxdStore::GetTxdName(streamId - STREAM_OFFSET_TXD), timeDiff);
-	}
+	if(timeDiff > 5)
+		debug("%s took %d ms\n", GetObjectName(streamId), timeDiff);
 
 	return true;
 }
 
-
+//--MIAMI: done
 bool
 CStreaming::FinishLoadingLargeFile(int8 *buf, int32 streamId)
 {
@@ -592,11 +608,15 @@ CStreaming::FinishLoadingLargeFile(int8 *buf, int32 streamId)
 			success = AddToLoadedVehiclesList(streamId);
 		mi->RemoveRef();
 		CTxdStore::RemoveRefWithoutDelete(mi->GetTxdSlot());
-	}else{
+		if(mi->GetAnimFileIndex() != -1)
+			CAnimManager::RemoveAnimBlockRefWithoutDelete(mi->GetAnimFileIndex());
+	}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
 		// Txd
 		CTxdStore::AddRef(streamId - STREAM_OFFSET_TXD);
 		success = CTxdStore::FinishLoadTxd(streamId - STREAM_OFFSET_TXD, stream);
 		CTxdStore::RemoveRefWithoutDelete(streamId - STREAM_OFFSET_TXD);
+	}else{
+		assert(0 && "invalid streamId");
 	}
 
 	RwStreamClose(stream, &mem);
@@ -614,16 +634,13 @@ CStreaming::FinishLoadingLargeFile(int8 *buf, int32 streamId)
 
 	endTime = CTimer::GetCurrentTimeInCycles() / CTimer::GetCyclesPerMillisecond();
 	timeDiff = endTime - startTime;
-	if(timeDiff > 5){
-		if(streamId < STREAM_OFFSET_TXD)
-			debug("finish model %s took %d ms\n", CModelInfo::GetModelInfo(streamId)->GetName(), timeDiff);
-		else
-			debug("finish txd %s took %d ms\n", CTxdStore::GetTxdName(streamId - STREAM_OFFSET_TXD), timeDiff);
-	}
+	if(timeDiff > 5)
+		debug("%s took %d ms\n", GetObjectName(streamId), timeDiff);
 
 	return true;
 }
 
+//--MIAMI: done
 void
 CStreaming::RequestModel(int32 id, int32 flags)
 {
@@ -652,15 +669,20 @@ CStreaming::RequestModel(int32 id, int32 flags)
 		// reinsert into list
 		if(ms_aInfoForModel[id].m_next){
 			ms_aInfoForModel[id].RemoveFromList();
-			if((ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0)
+			if(CanRemoveModel(id))
 				ms_aInfoForModel[id].AddToList(&ms_startLoadedList);
 		}
 	}else if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_NOTLOADED ||
 	         ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED){	// how can this be true again?
 
 		if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_NOTLOADED){
-			if(id < STREAM_OFFSET_TXD)
-				RequestTxd(CModelInfo::GetModelInfo(id)->GetTxdSlot(), flags);
+			if(id < STREAM_OFFSET_TXD){
+				mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+				RequestTxd(mi->GetTxdSlot(), flags);
+				int anim = mi->GetAnimFileIndex();
+				if(anim != -1)
+					RequestAnim(anim, STREAMFLAGS_DEPENDENCY);
+			}
 			ms_aInfoForModel[id].AddToList(&ms_startRequestedList);
 			ms_numModelsRequested++;
 			if(flags & STREAMFLAGS_PRIORITY)
@@ -672,52 +694,28 @@ CStreaming::RequestModel(int32 id, int32 flags)
 	}
 }
 
+#define BIGBUILDINGFLAGS STREAMFLAGS_DONT_REMOVE
+
+//--MIAMI: done
 void
-CStreaming::RequestSubway(void)
-{
-	RequestModel(MI_SUBWAY1, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY2, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY3, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY4, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY5, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY6, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY7, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY8, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY9, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY10, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY11, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY12, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY13, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY14, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY15, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY16, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY17, STREAMFLAGS_NOFADE);
-	RequestModel(MI_SUBWAY18, STREAMFLAGS_NOFADE);
-
-	switch(CGame::currLevel){
-	case LEVEL_INDUSTRIAL:
-		RequestModel(MI_SUBPLATFORM_IND, STREAMFLAGS_NOFADE);
-		break;
-	case LEVEL_COMMERCIAL:
-		if(FindPlayerTrain()->GetPosition().y < -700.0f){
-			RequestModel(MI_SUBPLATFORM_COMS, STREAMFLAGS_NOFADE);
-			RequestModel(MI_SUBPLATFORM_COMS2, STREAMFLAGS_NOFADE);
-		}else{
-			RequestModel(MI_SUBPLATFORM_COMN, STREAMFLAGS_NOFADE);
-		}
-		break;
-	case LEVEL_SUBURBAN:
-		RequestModel(MI_SUBPLATFORM_SUB, STREAMFLAGS_NOFADE);
-		RequestModel(MI_SUBPLATFORM_SUB2, STREAMFLAGS_NOFADE);
-		break;
-	default: break;
+CStreaming::RequestBigBuildings(eLevelName level)
+{
+	int i, n;
+	CBuilding *b;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		b = CPools::GetBuildingPool()->GetSlot(i);
+		if(b && b->bIsBIGBuilding && b->m_level == level)
+			if(!b->bStreamBIGBuilding)
+				RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
 	}
+	RequestIslands(level);
 }
 
-#define BIGBUILDINGFLAGS STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_PRIORITY
-
+//--MIAMI: done
 void
-CStreaming::RequestBigBuildings(eLevelName level)
+CStreaming::RequestBigBuildings(eLevelName level, const CVector &pos)
 {
 	int i, n;
 	CBuilding *b;
@@ -726,32 +724,91 @@ CStreaming::RequestBigBuildings(eLevelName level)
 	for(i = n; i >= 0; i--){
 		b = CPools::GetBuildingPool()->GetSlot(i);
 		if(b && b->bIsBIGBuilding && b->m_level == level)
-			RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
+			if(b->bStreamBIGBuilding){
+				if(CRenderer::ShouldModelBeStreamed(b, pos))
+					RequestModel(b->GetModelIndex(), 0);
+			}else
+				RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
 	}
 	RequestIslands(level);
-	ms_hasLoadedLODs = false;
 }
 
+//--MIAMI: done
+void
+CStreaming::InstanceBigBuildings(eLevelName level, const CVector &pos)
+{
+	int i, n;
+	CBuilding *b;
+
+	n = CPools::GetBuildingPool()->GetSize()-1;
+	for(i = n; i >= 0; i--){
+		b = CPools::GetBuildingPool()->GetSlot(i);
+		if(b && b->bIsBIGBuilding && b->m_level == level &&
+		   b->bStreamBIGBuilding && b->m_rwObject == nil)
+			if(CRenderer::ShouldModelBeStreamed(b, pos))
+				b->CreateRwObject();
+	}
+}
+
+//--MIAMI: done
+void
+CStreaming::InstanceLoadedModelsInSectorList(CPtrList &list)
+{
+	CPtrNode *node;
+	CEntity *e;
+	for(node = list.first; node; node = node->next) {
+		e = (CEntity *)node->item;
+		if(IsAreaVisible(e->m_area) && e->m_rwObject == nil)
+			e->CreateRwObject();
+	}
+}
+
+//--MIAMI: done
+void
+CStreaming::InstanceLoadedModels(const CVector &pos)
+{
+	int minX = CWorld::GetSectorIndexX(pos.x - 80.0f);
+	if(minX <= 0) minX = 0;
+
+	int minY = CWorld::GetSectorIndexY(pos.y - 80.0f);
+	if(minY <= 0) minY = 0;
+
+	int maxX = CWorld::GetSectorIndexX(pos.x + 80.0f);
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+
+	int maxY = CWorld::GetSectorIndexY(pos.y + 80.0f);
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+
+	int x, y;
+	for(y = minY; y <= maxY; y++){
+		for(x = minX; x <= maxX; x++){
+			CSector *sector = CWorld::GetSector(x, y);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_BUILDINGS]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_OBJECTS]);
+			InstanceLoadedModelsInSectorList(sector->m_lists[ENTITYLIST_DUMMIES]);
+		}
+	}
+}
+
+//--MIAMI: done
 void
 CStreaming::RequestIslands(eLevelName level)
 {
 	switch(level){
-	case LEVEL_INDUSTRIAL:
-		RequestModel(islandLODcomInd, BIGBUILDINGFLAGS);
-		RequestModel(islandLODsubInd, BIGBUILDINGFLAGS);
-		break;
-	case LEVEL_COMMERCIAL:
-		RequestModel(islandLODindust, BIGBUILDINGFLAGS);
-		RequestModel(islandLODsubCom, BIGBUILDINGFLAGS);
+	case LEVEL_MAINLAND:
+		if(islandLODbeach != -1)
+			RequestModel(islandLODbeach, BIGBUILDINGFLAGS);
 		break;
-	case LEVEL_SUBURBAN:
-		RequestModel(islandLODindust, BIGBUILDINGFLAGS);
-		RequestModel(islandLODcomSub, BIGBUILDINGFLAGS);
+	case LEVEL_BEACH:
+		if(islandLODmainland != -1)
+			RequestModel(islandLODmainland, BIGBUILDINGFLAGS);
 		break;
 	default: break;
 	}
 }
 
+//--MIAMI: TODO
 void
 CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flags)
 {
@@ -793,24 +850,28 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
 	RequestModel(modelId, flags);
 }
 
+//--MIAMI: done
 void
 CStreaming::RequestSpecialChar(int32 charId, const char *modelName, int32 flags)
 {
 	RequestSpecialModel(charId + MI_SPECIAL01, modelName, flags);
 }
 
+//--MIAMI: done
 bool
 CStreaming::HasSpecialCharLoaded(int32 id)
 {
 	return HasModelLoaded(id + MI_SPECIAL01);
 }
 
+//--MIAMI: done
 void
 CStreaming::SetMissionDoesntRequireSpecialChar(int32 id)
 {
 	return SetMissionDoesntRequireModel(id + MI_SPECIAL01);
 }
 
+//--MIAMI: done
 void
 CStreaming::DecrementRef(int32 id)
 {
@@ -821,6 +882,7 @@ CStreaming::DecrementRef(int32 id)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveModel(int32 id)
 {
@@ -832,8 +894,14 @@ CStreaming::RemoveModel(int32 id)
 	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED){
 		if(id < STREAM_OFFSET_TXD)
 			CModelInfo::GetModelInfo(id)->DeleteRwObject();
-		else
+		else if(id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL)
 			CTxdStore::RemoveTxd(id - STREAM_OFFSET_TXD);
+		else if(id >= STREAM_OFFSET_COL && id < STREAM_OFFSET_ANIM)
+			CColStore::RemoveCol(id - STREAM_OFFSET_COL);
+		else if(id >= STREAM_OFFSET_ANIM){
+			assert(id < NUMSTREAMINFO);
+			CAnimManager::RemoveAnimBlock(id - STREAM_OFFSET_ANIM);
+		}
 		ms_memoryUsed -= ms_aInfoForModel[id].GetCdSize()*CDSTREAM_SECTOR_SIZE;
 	}
 
@@ -854,24 +922,30 @@ CStreaming::RemoveModel(int32 id)
 	if(ms_aInfoForModel[id].m_loadState == STREAMSTATE_STARTED){
 		if(id < STREAM_OFFSET_TXD)
 			RpClumpGtaCancelStream();
-		else
+		else if(id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL)
 			CTxdStore::RemoveTxd(id - STREAM_OFFSET_TXD);
+		else if(id >= STREAM_OFFSET_COL && id < STREAM_OFFSET_ANIM)
+			CColStore::RemoveCol(id - STREAM_OFFSET_COL);
+		else if(id >= STREAM_OFFSET_ANIM){
+			assert(id < NUMSTREAMINFO);
+			CAnimManager::RemoveAnimBlock(id - STREAM_OFFSET_ANIM);
+		}
 	}
 
 	ms_aInfoForModel[id].m_loadState = STREAMSTATE_NOTLOADED;
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveUnusedBuildings(eLevelName level)
 {
-	if(level != LEVEL_INDUSTRIAL)
-		RemoveBuildings(LEVEL_INDUSTRIAL);
-	if(level != LEVEL_COMMERCIAL)
-		RemoveBuildings(LEVEL_COMMERCIAL);
-	if(level != LEVEL_SUBURBAN)
-		RemoveBuildings(LEVEL_SUBURBAN);
+	if(level != LEVEL_BEACH)
+		RemoveBuildings(LEVEL_BEACH);
+	if(level != LEVEL_MAINLAND)
+		RemoveBuildings(LEVEL_MAINLAND);
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveBuildings(eLevelName level)
 {
@@ -932,18 +1006,18 @@ CStreaming::RemoveBuildings(eLevelName level)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveUnusedBigBuildings(eLevelName level)
 {
-	if(level != LEVEL_INDUSTRIAL)
-		RemoveBigBuildings(LEVEL_INDUSTRIAL);
-	if(level != LEVEL_COMMERCIAL)
-		RemoveBigBuildings(LEVEL_COMMERCIAL);
-	if(level != LEVEL_SUBURBAN)
-		RemoveBigBuildings(LEVEL_SUBURBAN);
+	if(level != LEVEL_BEACH)
+		RemoveBigBuildings(LEVEL_BEACH);
+	if(level != LEVEL_MAINLAND)
+		RemoveBigBuildings(LEVEL_MAINLAND);
 	RemoveIslandsNotUsed(level);
 }
 
+//--MIAMI: done
 void
 DeleteIsland(CEntity *island)
 {
@@ -957,35 +1031,33 @@ DeleteIsland(CEntity *island)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveIslandsNotUsed(eLevelName level)
 {
+	int i;
+	if(pIslandLODmainlandEntity == nil)
+	for(i = CPools::GetBuildingPool()->GetSize()-1; i >= 0; i--){
+		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
+		if(building == nil)
+			continue;
+		if(building->GetModelIndex() == islandLODmainland)
+			pIslandLODmainlandEntity = building;
+		if(building->GetModelIndex() == islandLODbeach)
+			pIslandLODbeachEntity = building;
+	}
+
 	switch(level){
-	case LEVEL_INDUSTRIAL:
-		DeleteIsland(pIslandLODindustEntity);
-		DeleteIsland(pIslandLODcomSubEntity);
-		DeleteIsland(pIslandLODsubComEntity);
-		break;
-	case LEVEL_COMMERCIAL:
-		DeleteIsland(pIslandLODcomIndEntity);
-		DeleteIsland(pIslandLODcomSubEntity);
-		DeleteIsland(pIslandLODsubIndEntity);
-		break;
-	case LEVEL_SUBURBAN:
-		DeleteIsland(pIslandLODsubIndEntity);
-		DeleteIsland(pIslandLODsubComEntity);
-		DeleteIsland(pIslandLODcomIndEntity);
+	case LEVEL_MAINLAND:
+		DeleteIsland(pIslandLODmainlandEntity);
 		break;
-	default:
-		DeleteIsland(pIslandLODindustEntity);
-		DeleteIsland(pIslandLODcomIndEntity);
-		DeleteIsland(pIslandLODcomSubEntity);
-		DeleteIsland(pIslandLODsubIndEntity);
-		DeleteIsland(pIslandLODsubComEntity);
+	case LEVEL_BEACH:
+		DeleteIsland(pIslandLODbeachEntity);
 		break;
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveBigBuildings(eLevelName level)
 {
@@ -1017,8 +1089,7 @@ CStreaming::RemoveLoadedVehicle(void)
 		if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
 			ms_lastVehicleDeleted = 0;
 		id = ms_vehiclesLoaded[ms_lastVehicleDeleted];
-		if(id != -1 &&
-		   (ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0 && CModelInfo::GetModelInfo(id)->GetNumRefs() == 0 &&
+		if(id != -1 && CanRemoveModel(id) && CModelInfo::GetModelInfo(id)->GetNumRefs() == 0 &&
 		   ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED)
 			goto found;
 	}
@@ -1027,33 +1098,47 @@ found:
 	RemoveModel(ms_vehiclesLoaded[ms_lastVehicleDeleted]);
 	ms_numVehiclesLoaded--;
 	ms_vehiclesLoaded[ms_lastVehicleDeleted] = -1;
+	CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
+	if (pVehicleInfo->m_vehicleClass != -1)
+		CCarCtrl::RemoveFromLoadedVehicleArray(id, pVehicleInfo->m_vehicleClass);
 	return true;
 }
 
+//--MIAMI: done
 bool
-CStreaming::RemoveLeastUsedModel(void)
+CStreaming::RemoveLeastUsedModel(uint32 excludeMask)
 {
 	CStreamingInfo *si;
 	int streamId;
 
 	for(si = ms_endLoadedList.m_prev; si != &ms_startLoadedList; si = si->m_prev){
+		if(si->m_flags & excludeMask)
+			continue;
 		streamId = si - ms_aInfoForModel;
 		if(streamId < STREAM_OFFSET_TXD){
 			if (CModelInfo::GetModelInfo(streamId)->GetNumRefs() == 0) {
 				RemoveModel(streamId);
 				return true;
 			}
-		}else{
+		}else if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
 			if(CTxdStore::GetNumRefs(streamId - STREAM_OFFSET_TXD) == 0 &&
 			   !IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD)){
 				RemoveModel(streamId);
 				return true;
 			}
+		}else if(streamId >= STREAM_OFFSET_ANIM){
+			assert(streamId < NUMSTREAMINFO);
+			if(CAnimManager::GetNumRefsToAnimBlock(streamId - STREAM_OFFSET_ANIM) == 0 &&
+			   !AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM)){
+				RemoveModel(streamId);
+				return true;
+			}
 		}
 	}
-	return ms_numVehiclesLoaded > 7 && RemoveLoadedVehicle();
+	return (ms_numVehiclesLoaded > 7 || CGame::currArea != AREA_MAIN_MAP && ms_numVehiclesLoaded > 4) && RemoveLoadedVehicle();
 }
 
+//--MIAMI: done
 void
 CStreaming::RemoveAllUnusedModels(void)
 {
@@ -1064,7 +1149,6 @@ CStreaming::RemoveAllUnusedModels(void)
 
 	for(i = NUM_DEFAULT_MODELS; i < MODELINFOSIZE; i++){
 		if(ms_aInfoForModel[i].m_loadState == STREAMSTATE_LOADED &&
-		   ms_aInfoForModel[i].m_flags & STREAMFLAGS_DONT_REMOVE &&
 		    CModelInfo::GetModelInfo(i)->GetNumRefs() == 0) {
 			RemoveModel(i);
 			ms_aInfoForModel[i].m_loadState = STREAMSTATE_NOTLOADED;
@@ -1072,30 +1156,14 @@ CStreaming::RemoveAllUnusedModels(void)
 	}
 }
 
-bool
-CStreaming::RemoveReferencedTxds(int32 mem)
-{
-	CStreamingInfo *si;
-	int streamId;
-
-	for(si = ms_endLoadedList.m_prev; si != &ms_startLoadedList; si = si->m_prev){
-		streamId = si - ms_aInfoForModel;
-		if(streamId >= STREAM_OFFSET_TXD &&
-		   CTxdStore::GetNumRefs(streamId-STREAM_OFFSET_TXD) == 0){
-			RemoveModel(streamId);
-			if(ms_memoryUsed < mem)
-				return true;
-		}
-	}
-	return false;
-}
-
+//--MIAMI: done
 void
 CStreaming::RemoveUnusedModelsInLoadedList(void)
 {
 	// empty
 }
 
+//--MIAMI: done
 bool
 CStreaming::IsTxdUsedByRequestedModels(int32 txdId)
 {
@@ -1124,6 +1192,34 @@ CStreaming::IsTxdUsedByRequestedModels(int32 txdId)
 	return false;
 }
 
+bool
+CStreaming::AreAnimsUsedByRequestedModels(int32 animId)
+{
+	CStreamingInfo *si;
+	int streamId;
+	int i;
+
+	for(si = ms_startRequestedList.m_next; si != &ms_endRequestedList; si = si->m_next){
+		streamId = si - ms_aInfoForModel;
+		if(streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+	}
+
+	for(i = 0; i < 4; i++){
+		streamId = ms_channel[0].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+		streamId = ms_channel[1].streamIds[i];
+		if(streamId != -1 && streamId < STREAM_OFFSET_TXD &&
+		   CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex() == animId)
+			return true;
+	}
+
+	return false;
+}
+
 int32
 CStreaming::GetAvailableVehicleSlot(void)
 {
@@ -1155,8 +1251,8 @@ CStreaming::AddToLoadedVehiclesList(int32 modelId)
 		// find vehicle we can remove
 		for(i = 0; i < MAXVEHICLESLOADED; i++){
 			id = ms_vehiclesLoaded[ms_lastVehicleDeleted];
-			if(id != -1 &&
-			   (ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0 && CModelInfo::GetModelInfo(id)->GetNumRefs() == 0)
+			if(id != -1 && CanRemoveModel(id) &&
+			   CModelInfo::GetModelInfo(id)->GetNumRefs() == 0)
 				goto found;
 			ms_lastVehicleDeleted++;
 			if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
@@ -1172,13 +1268,21 @@ found:
 			ms_lastVehicleDeleted = id;
 			// this is more that we wanted actually
 			ms_numVehiclesLoaded++;
-		}else
+		}
+		else{
 			RemoveModel(id);
+			CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
+			if (pVehicleInfo->m_vehicleClass != -1)
+				CCarCtrl::RemoveFromLoadedVehicleArray(id, pVehicleInfo->m_vehicleClass);
+		}
 	}
 
 	ms_vehiclesLoaded[ms_lastVehicleDeleted++] = modelId;
 	if(ms_lastVehicleDeleted == MAXVEHICLESLOADED)
 		ms_lastVehicleDeleted = 0;
+	CVehicleModelInfo* pVehicleInfo = (CVehicleModelInfo*)CModelInfo::GetModelInfo(modelId);
+	if (pVehicleInfo->m_vehicleClass != -1)
+		CCarCtrl::AddToLoadedVehicleArray(modelId, pVehicleInfo->m_vehicleClass, pVehicleInfo->m_frequency);
 	return true;
 }
 
@@ -1190,41 +1294,6 @@ CStreaming::IsObjectInCdImage(int32 id)
 }
 
 void
-CStreaming::HaveAllBigBuildingsLoaded(eLevelName level)
-{
-	int i, n;
-	CEntity *e;
-
-	if(ms_hasLoadedLODs)
-		return;
-
-	if(level == LEVEL_INDUSTRIAL){
-		if(ms_aInfoForModel[islandLODcomInd].m_loadState != STREAMSTATE_LOADED ||
-		   ms_aInfoForModel[islandLODsubInd].m_loadState != STREAMSTATE_LOADED)
-			return;
-	}else if(level == LEVEL_COMMERCIAL){
-		if(ms_aInfoForModel[islandLODindust].m_loadState != STREAMSTATE_LOADED ||
-		   ms_aInfoForModel[islandLODsubCom].m_loadState != STREAMSTATE_LOADED)
-			return;
-	}else if(level == LEVEL_SUBURBAN){
-		if(ms_aInfoForModel[islandLODindust].m_loadState != STREAMSTATE_LOADED ||
-		   ms_aInfoForModel[islandLODcomSub].m_loadState != STREAMSTATE_LOADED)
-			return;
-	}
-
-	n = CPools::GetBuildingPool()->GetSize()-1;
-	for(i = n; i >= 0; i--){
-		e = CPools::GetBuildingPool()->GetSlot(i);
-		if(e && e->bIsBIGBuilding && e->m_level == level &&
-		   ms_aInfoForModel[e->GetModelIndex()].m_loadState != STREAMSTATE_LOADED)
-			return;
-	}
-
-	RemoveUnusedBigBuildings(level);
-	ms_hasLoadedLODs = true;
-}
-
-void
 CStreaming::SetModelIsDeletable(int32 id)
 {
 	ms_aInfoForModel[id].m_flags &= ~STREAMFLAGS_DONT_REMOVE;
@@ -1243,6 +1312,7 @@ CStreaming::SetModelTxdIsDeletable(int32 id)
 	SetModelIsDeletable(CModelInfo::GetModelInfo(id)->GetTxdSlot() + STREAM_OFFSET_TXD);
 }
 
+//--MIAMI: done
 void
 CStreaming::SetMissionDoesntRequireModel(int32 id)
 {
@@ -1265,6 +1335,13 @@ CStreaming::LoadInitialPeds(void)
 }
 
 void
+CStreaming::LoadInitialWeapons(void)
+{
+	CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE);
+	CStreaming::RequestModel(MI_MISSILE, STREAMFLAGS_DONT_REMOVE);
+}
+
+void
 CStreaming::LoadInitialVehicles(void)
 {
 	int id;
@@ -1327,28 +1404,73 @@ CStreaming::StreamVehiclesAndPeds(void)
 	else
 		SetModelIsDeletable(MI_CHOPPER);
 
+	if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired()) {
+		SetModelIsDeletable(MI_VICE1);
+		SetModelIsDeletable(MI_VICE2);
+		SetModelIsDeletable(MI_VICE3);
+		SetModelIsDeletable(MI_VICE4);
+		SetModelIsDeletable(MI_VICE5);
+		SetModelIsDeletable(MI_VICE6);
+		SetModelIsDeletable(MI_VICE7);
+		SetModelIsDeletable(MI_VICE8);
+		switch (CCarCtrl::MiamiViceCycle) {
+		case 0:
+			RequestModel(MI_VICE1, STREAMFLAGS_DONT_REMOVE);
+			RequestModel(MI_VICE2, STREAMFLAGS_DONT_REMOVE);
+			break;
+		case 1:
+			RequestModel(MI_VICE3, STREAMFLAGS_DONT_REMOVE);
+			RequestModel(MI_VICE4, STREAMFLAGS_DONT_REMOVE);
+			break;
+		case 2:
+			RequestModel(MI_VICE5, STREAMFLAGS_DONT_REMOVE);
+			RequestModel(MI_VICE6, STREAMFLAGS_DONT_REMOVE);
+			break;
+		case 3:
+			RequestModel(MI_VICE7, STREAMFLAGS_DONT_REMOVE);
+			RequestModel(MI_VICE8, STREAMFLAGS_DONT_REMOVE);
+			break;
+		}
+		RequestModel(MI_VICECHEE, STREAMFLAGS_DONT_REMOVE);
+	}
+	else {
+		SetModelIsDeletable(MI_VICECHEE);
+		SetModelIsDeletable(MI_VICE1);
+		SetModelIsDeletable(MI_VICE2);
+		SetModelIsDeletable(MI_VICE3);
+		SetModelIsDeletable(MI_VICE4);
+		SetModelIsDeletable(MI_VICE5);
+		SetModelIsDeletable(MI_VICE6);
+		SetModelIsDeletable(MI_VICE7);
+		SetModelIsDeletable(MI_VICE8);
+	}
+
 	if(timeBeforeNextLoad >= 0)
 		timeBeforeNextLoad--;
 	else if(ms_numVehiclesLoaded <= desiredNumVehiclesLoaded){
-		for(i = 1; i <= 10; i++){
-			model =  CCarCtrl::ChooseCarModel(modelQualityClass);
-			modelQualityClass++;
-			if(modelQualityClass >= CCarCtrl::TOTAL_CUSTOM_CLASSES)
-				modelQualityClass = 0;
-
-			// check if we want to load this model
-			if(ms_aInfoForModel[model].m_loadState == STREAMSTATE_NOTLOADED &&
-			   ((CVehicleModelInfo*)CModelInfo::GetModelInfo(model))->m_level & (1 << (CGame::currLevel-1)))
-				break;
+		CZoneInfo zone;
+		CVector coors = FindPlayerCoors();
+		CTheZones::GetZoneInfoForTimeOfDay(&coors, &zone);
+		int32 maxReq = -1;
+		int32 mostRequestedRating = 0;
+		for(i = 0; i < CCarCtrl::TOTAL_CUSTOM_CLASSES; i++){
+			if(CCarCtrl::NumRequestsOfCarRating[i] > maxReq &&
+				((i == 0 && zone.carThreshold[0] != 0) ||
+				(i != 0 && zone.carThreshold[i] != zone.carThreshold[i-1]))) {
+				maxReq = CCarCtrl::NumRequestsOfCarRating[i];
+				mostRequestedRating = i;
+			}
 		}
-
-		if(i <= 10){
+		model = CCarCtrl::ChooseCarModelToLoad(mostRequestedRating);
+		if(!HasModelLoaded(model)){
 			RequestModel(model, STREAMFLAGS_DEPENDENCY);
-			timeBeforeNextLoad = 500;
+			timeBeforeNextLoad = 350;
 		}
+		CCarCtrl::NumRequestsOfCarRating[mostRequestedRating] = 0;
 	}
 }
 
+//--MIAMI: TODO
 void
 CStreaming::StreamZoneModels(const CVector &pos)
 {
@@ -1374,58 +1496,54 @@ CStreaming::StreamZoneModels(const CVector &pos)
 		for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
 			if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] == -1)
 				break;
-			RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i], STREAMFLAGS_DONT_REMOVE);
+			RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i], STREAMFLAGS_DEPENDENCY);
 		}
 	}
 	RequestModel(MI_MALE01, STREAMFLAGS_DONT_REMOVE);
+	//RequestModel(MI_HMOCA, STREAMFLAGS_DONT_REMOVE);
 
 	gangsToLoad = 0;
 	gangCarsToLoad = 0;
-	if(info.gangDensity[0] != 0) gangsToLoad |= 1<<0;
-	if(info.gangDensity[1] != 0) gangsToLoad |= 1<<1;
-	if(info.gangDensity[2] != 0) gangsToLoad |= 1<<2;
-	if(info.gangDensity[3] != 0) gangsToLoad |= 1<<3;
-	if(info.gangDensity[4] != 0) gangsToLoad |= 1<<4;
-	if(info.gangDensity[5] != 0) gangsToLoad |= 1<<5;
-	if(info.gangDensity[6] != 0) gangsToLoad |= 1<<6;
-	if(info.gangDensity[7] != 0) gangsToLoad |= 1<<7;
-	if(info.gangDensity[8] != 0) gangsToLoad |= 1<<8;
-	if(info.gangThreshold[0] != info.copDensity) gangCarsToLoad |= 1<<0;
-	if(info.gangThreshold[1] != info.gangThreshold[0]) gangCarsToLoad |= 1<<1;
-	if(info.gangThreshold[2] != info.gangThreshold[1]) gangCarsToLoad |= 1<<2;
-	if(info.gangThreshold[3] != info.gangThreshold[2]) gangCarsToLoad |= 1<<3;
-	if(info.gangThreshold[4] != info.gangThreshold[3]) gangCarsToLoad |= 1<<4;
-	if(info.gangThreshold[5] != info.gangThreshold[4]) gangCarsToLoad |= 1<<5;
-	if(info.gangThreshold[6] != info.gangThreshold[5]) gangCarsToLoad |= 1<<6;
-	if(info.gangThreshold[7] != info.gangThreshold[6]) gangCarsToLoad |= 1<<7;
-	if(info.gangThreshold[8] != info.gangThreshold[7]) gangCarsToLoad |= 1<<8;
+	if(info.gangPedThreshold[0] != info.copPedThreshold)
+		gangsToLoad = 1;
+	for(i = 1; i < NUM_GANGS; i++)
+		if(info.gangPedThreshold[i] != info.gangPedThreshold[i-1])
+			gangsToLoad |= 1<<i;
+	if(info.gangThreshold[0] != info.copThreshold)
+		gangCarsToLoad = 1;
+	for(i = 1; i < NUM_GANGS; i++)
+		if(info.gangThreshold[i] != info.gangThreshold[i-1])
+			gangCarsToLoad |= 1<<i;
 
 	if(gangsToLoad == ms_loadedGangs && gangCarsToLoad == ms_loadedGangCars)
 		return;
 
-	// This makes things simpler than the game does it
 	gangsToLoad |= gangCarsToLoad;
 
 	for(i = 0; i < NUM_GANGS; i++){
 		bit = 1<<i;
 
 		if(gangsToLoad & bit && (ms_loadedGangs & bit) == 0){
-			RequestModel(MI_GANG01 + i*2, STREAMFLAGS_DONT_REMOVE);
-			RequestModel(MI_GANG01 + i*2 + 1, STREAMFLAGS_DONT_REMOVE);
+			RequestModel(CGangs::GetGangPedModel1(i), STREAMFLAGS_DEPENDENCY);
+			RequestModel(CGangs::GetGangPedModel2(i), STREAMFLAGS_DEPENDENCY);
 			ms_loadedGangs |= bit;
 		}else if((gangsToLoad & bit) == 0 && ms_loadedGangs & bit){
-			SetModelIsDeletable(MI_GANG01 + i*2);
-			SetModelIsDeletable(MI_GANG01 + i*2 + 1);
-			SetModelTxdIsDeletable(MI_GANG01 + i*2);
-			SetModelTxdIsDeletable(MI_GANG01 + i*2 + 1);
+			SetModelIsDeletable(CGangs::GetGangPedModel1(i));
+			SetModelIsDeletable(CGangs::GetGangPedModel2(i));
+			SetModelTxdIsDeletable(CGangs::GetGangPedModel1(i));
+			SetModelTxdIsDeletable(CGangs::GetGangPedModel2(i));
 			ms_loadedGangs &= ~bit;
 		}
 
-		if(gangCarsToLoad & bit && (ms_loadedGangCars & bit) == 0){
-			RequestModel(CGangs::GetGangInfo(i)->m_nVehicleMI, STREAMFLAGS_DONT_REMOVE);
+		// TODO(MIAMI): check this
+		if(CGangs::GetGangVehicleModel(i) < 0)
+			continue;
+
+		if((gangCarsToLoad & bit) && (ms_loadedGangCars & bit) == 0){
+			RequestModel(CGangs::GetGangVehicleModel(i), STREAMFLAGS_DEPENDENCY);
 		}else if((gangCarsToLoad & bit) == 0 && ms_loadedGangCars & bit){
-			SetModelIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI);
-			SetModelTxdIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI);
+			SetModelIsDeletable(CGangs::GetGangVehicleModel(i));
+			SetModelTxdIsDeletable(CGangs::GetGangVehicleModel(i));
 		}
 	}
 	ms_loadedGangCars = gangCarsToLoad;
@@ -1437,7 +1555,7 @@ CStreaming::RemoveCurrentZonesModels(void)
 	int i;
 
 	if(ms_currentPedGrp != -1)
-		for(i = 0; i < 8; i++){
+		for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
 			if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] == -1)
 				break;
 			if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] != MI_MALE01)
@@ -1445,10 +1563,10 @@ CStreaming::RemoveCurrentZonesModels(void)
 		}
 
 	for(i = 0; i < NUM_GANGS; i++){
-		SetModelIsDeletable(MI_GANG01 + i*2);
-		SetModelIsDeletable(MI_GANG01 + i*2 + 1);
-		if(CGangs::GetGangInfo(i)->m_nVehicleMI != -1)
-			SetModelIsDeletable(CGangs::GetGangInfo(i)->m_nVehicleMI);
+		SetModelIsDeletable(CGangs::GetGangPedModel1(i));
+		SetModelIsDeletable(CGangs::GetGangPedModel2(i));
+		if(CGangs::GetGangVehicleModel(i) != -1)
+			SetModelIsDeletable(CGangs::GetGangVehicleModel(i));
 	}
 
 	ms_currentPedGrp = -1;
@@ -1456,6 +1574,42 @@ CStreaming::RemoveCurrentZonesModels(void)
 	ms_loadedGangCars = 0;
 }
 
+void
+CStreaming::LoadBigBuildingsWhenNeeded(void)
+{
+	// Very much like CCollision::Update and CCollision::LoadCollisionWhenINeedIt
+	if(CCutsceneMgr::IsCutsceneProcessing())
+		return;
+
+	if(CTheZones::m_CurrLevel == LEVEL_NONE || 
+	   CTheZones::m_CurrLevel == CGame::currLevel)
+		return;
+
+	CTimer::Suspend();
+	CGame::currLevel = CTheZones::m_CurrLevel;
+	DMAudio.SetEffectsFadeVol(0);
+	CPad::StopPadsShaking();
+	CCollision::LoadCollisionScreen(CGame::currLevel);
+	DMAudio.Service();
+
+	// CPopulation::DealWithZoneChange is unused in VC
+	RemoveUnusedBigBuildings(CGame::currLevel);
+	RemoveUnusedBuildings(CGame::currLevel);
+	RemoveUnusedModelsInLoadedList();
+	CGame::TidyUpMemory(true, true);
+
+	CReplay::EmptyReplayBuffer();
+	if(CGame::currLevel != LEVEL_NONE)
+		LoadSplash(GetLevelSplashScreen(CGame::currLevel));
+
+	CStreaming::RequestBigBuildings(CGame::currLevel, TheCamera.GetPosition());
+	CStreaming::LoadAllRequestedModels(true);
+
+	CGame::TidyUpMemory(true, true);
+	CTimer::Resume();
+	DMAudio.SetEffectsFadeVol(127);
+}
+
 
 // Find starting offset of the cdimage we next want to read
 // Not useful at all on PC...
@@ -1502,6 +1656,7 @@ ModelNotLoaded(int32 modelId)
 }
 
 inline bool TxdNotLoaded(int32 txdId) { return ModelNotLoaded(txdId + STREAM_OFFSET_TXD); }
+inline bool AnimNotLoaded(int32 animId) { return animId != -1 && ModelNotLoaded(animId + STREAM_OFFSET_ANIM); }
 
 // Find stream id of next requested file in cdimage
 int32
@@ -1526,14 +1681,20 @@ CStreaming::GetNextFileOnCd(int32 lastPosn, bool priority)
 		if(priority && ms_numPriorityRequests != 0 && !si->IsPriority())
 			continue;
 
-		// request Txd if necessary
+		// request Txds or anims if necessary
 		if(streamId < STREAM_OFFSET_TXD){
 			int txdId = CModelInfo::GetModelInfo(streamId)->GetTxdSlot();
 			if(TxdNotLoaded(txdId)){
 				ReRequestTxd(txdId);
 				continue;
 			}
-		}
+			int animId = CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex();
+			if(AnimNotLoaded(animId)){
+				ReRequestAnim(animId);
+				continue;
+			}
+		}else if(streamId >= STREAM_OFFSET_ANIM && CCutsceneMgr::IsCutsceneProcessing())
+			continue;
 
 		if(ms_aInfoForModel[streamId].GetCdPosnAndSize(posn, size)){
 			if(posn < posnFirst){
@@ -1576,6 +1737,7 @@ CStreaming::GetNextFileOnCd(int32 lastPosn, bool priority)
  * TODO: two-part files
  */
 
+//--MIAMI: done
 // Make channel read from disc
 void
 CStreaming::RequestModelStream(int32 ch)
@@ -1590,13 +1752,18 @@ CStreaming::RequestModelStream(int32 ch)
 	imgOffset = GetCdImageOffset(lastPosn);
 	streamId = GetNextFileOnCd(lastPosn - imgOffset, true);
 
-	if(streamId == -1)
-		return;
-
-	// remove Txds that aren't requested anymore
-	while(streamId >= STREAM_OFFSET_TXD){
-		if(ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY ||
-		   IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD))
+	// remove Txds and Anims that aren't requested anymore
+	while(streamId != -1){
+		if(ms_aInfoForModel[streamId].m_flags & STREAMFLAGS_KEEP_IN_MEMORY)
+			break;
+		if(streamId >= STREAM_OFFSET_TXD && streamId < STREAM_OFFSET_COL){
+			if(IsTxdUsedByRequestedModels(streamId - STREAM_OFFSET_TXD))
+				break;
+		}else if(streamId >= STREAM_OFFSET_ANIM){
+			assert(streamId < NUMSTREAMINFO);
+			if(AreAnimsUsedByRequestedModels(streamId - STREAM_OFFSET_ANIM))
+				break;
+		}else
 			break;
 		RemoveModel(streamId);
 		// so try next file
@@ -1633,7 +1800,8 @@ CStreaming::RequestModelStream(int32 ch)
 		if(streamId < STREAM_OFFSET_TXD){
 			if (havePed && CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_PED ||
 			    haveBigFile && CModelInfo::GetModelInfo(streamId)->GetModelType() == MITYPE_VEHICLE ||
-			    TxdNotLoaded(CModelInfo::GetModelInfo(streamId)->GetTxdSlot()))
+			    TxdNotLoaded(CModelInfo::GetModelInfo(streamId)->GetTxdSlot()) ||
+			    AnimNotLoaded(CModelInfo::GetModelInfo(streamId)->GetAnimFileIndex()))
 				break;
 		}else{
 			if(haveBigFile && size > 200)
@@ -1680,6 +1848,7 @@ CStreaming::RequestModelStream(int32 ch)
 	ms_channel[ch].numTries = 0;
 }
 
+//--MIAMI: done
 // Load data previously read from disc
 bool
 CStreaming::ProcessLoadingChannel(int32 ch)
@@ -1714,10 +1883,10 @@ CStreaming::ProcessLoadingChannel(int32 ch)
 			if(id < STREAM_OFFSET_TXD && CModelInfo::GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
 			   ms_numVehiclesLoaded >= desiredNumVehiclesLoaded &&
 			   !RemoveLoadedVehicle() &&
-			   ((ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0 || GetAvailableVehicleSlot() == -1)){
+			   (CanRemoveModel(id) || GetAvailableVehicleSlot() == -1)){
 				// can't load vehicle
 				RemoveModel(id);
-				if(ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE)
+				if(!CanRemoveModel(id))
 					ReRequestModel(id);
 				else if(CTxdStore::GetNumRefs(CModelInfo::GetModelInfo(id)->GetTxdSlot()) == 0)
 					RemoveTxd(CModelInfo::GetModelInfo(id)->GetTxdSlot());
@@ -1749,6 +1918,7 @@ CStreaming::ProcessLoadingChannel(int32 ch)
 	return true;
 }
 
+//--MIAMI: done
 void
 CStreaming::RetryLoadFile(int32 ch)
 {
@@ -1785,6 +1955,7 @@ CStreaming::RetryLoadFile(int32 ch)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::LoadRequestedModels(void)
 {
@@ -1809,6 +1980,7 @@ CStreaming::LoadRequestedModels(void)
 	}
 }
 
+//--MIAMI: done
 void
 CStreaming::LoadAllRequestedModels(bool priority)
 {
@@ -1862,6 +2034,7 @@ CStreaming::LoadAllRequestedModels(bool priority)
 	bInsideLoadAll = false;
 }
 
+//--MIAMI: done
 void
 CStreaming::FlushChannels(void)
 {
@@ -1883,6 +2056,7 @@ CStreaming::FlushChannels(void)
 		ProcessLoadingChannel(1);
 }
 
+//--MIAMI: done
 void
 CStreaming::FlushRequestList(void)
 {
@@ -1991,8 +2165,7 @@ CStreaming::ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float
 				if(xmin < pos.x && pos.x < xmax &&
 				   ymin < pos.y && pos.y < ymax &&
 				   (CVector2D(x, y) - pos).MagnitudeSqr() < lodDistSq)
-					if(CRenderer::IsEntityCullZoneVisible(e))
-						RequestModel(e->GetModelIndex(), 0);
+					RequestModel(e->GetModelIndex(), 0);
 			}
 		}
 	}
@@ -2015,8 +2188,7 @@ CStreaming::ProcessEntitiesInSectorList(CPtrList &list)
 		   (!e->IsObject() || ((CObject*)e)->ObjectCreatedBy != TEMP_OBJECT)){
 			CTimeModelInfo *mi = (CTimeModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex());
 			if (mi->GetModelType() != MITYPE_TIME || CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff()))
-				if(CRenderer::IsEntityCullZoneVisible(e))
-					RequestModel(e->GetModelIndex(), 0);
+				RequestModel(e->GetModelIndex(), 0);
 		}
 	}
 }
@@ -2254,9 +2426,6 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 			}
 		}
 
-		if(RemoveReferencedTxds(mem))
-			return;
-
 		// As last resort, delete objects from the last step more aggressively
 		for(y = ymin; y <= ymax; y++){
 			for(x = xmax; x != xmin; x -= inc){
@@ -2318,9 +2487,6 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 			}
 		}
 
-		if(RemoveReferencedTxds(mem))
-			return;
-
 		// As last resort, delete objects from the last step more aggressively
 		for(x = xmin; x <= xmax; x++){
 			for(y = ymax; y != ymin; y -= inc){
@@ -2419,12 +2585,13 @@ CStreaming::MakeSpaceFor(int32 size)
 	// but it's not nice....
 
 	while((uint32)ms_memoryUsed >= ms_memoryAvailable - size)
-		if(!RemoveLeastUsedModel()){
+		if(!RemoveLeastUsedModel(STREAMFLAGS_20)){
 			DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
 			return;
 		}
 }
 
+//--MIAMI: done
 void
 CStreaming::LoadScene(const CVector &pos)
 {
@@ -2439,16 +2606,44 @@ CStreaming::LoadScene(const CVector &pos)
 			RemoveModel(si - ms_aInfoForModel);
 	}
 	CRenderer::m_loadingPriority = false;
-	CCullZones::ForceCullZoneCoors(pos);
 	DeleteAllRwObjects();
+	if(level == LEVEL_NONE)
+		level = CGame::currLevel;
+	CGame::currLevel = level;
+	RemoveUnusedBigBuildings(level);
+	RequestBigBuildings(level, pos);
+	RequestBigBuildings(LEVEL_NONE, pos);
+	RemoveIslandsNotUsed(level);
+	LoadAllRequestedModels(false);
+	InstanceBigBuildings(level, pos);
+	InstanceBigBuildings(LEVEL_NONE, pos);
 	AddModelsToRequestList(pos);
 	CRadar::StreamRadarSections(pos);
-	RemoveUnusedBigBuildings(level);
-	RequestBigBuildings(level);
+
+	if (!CGame::IsInInterior()) {
+		for (int i = 0; i < 5; i++) {
+			CZoneInfo zone;
+			CTheZones::GetZoneInfoForTimeOfDay(&pos, &zone);
+			int32 model = CCarCtrl::ChooseCarModelToLoad(CCarCtrl::ChooseCarRating(&zone));
+			CStreaming::RequestModel(model, STREAMFLAGS_DEPENDENCY);
+		}
+	}
 	LoadAllRequestedModels(false);
+	InstanceLoadedModels(pos);
+
+	for(int i = 0; i < NUMSTREAMINFO; i++)
+		ms_aInfoForModel[i].m_flags &= ~STREAMFLAGS_20;
 	debug("End load scene\n");
 }
 
+//--MIAMI: done
+void
+CStreaming::LoadSceneCollision(const CVector &pos)
+{
+	CColStore::LoadCollision(pos);
+	CStreaming::LoadAllRequestedModels(false);
+}
+
 void
 CStreaming::MemoryCardSave(uint8 *buf, uint32 *size)
 {
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index 84434769..8a92266f 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -4,7 +4,9 @@
 
 enum {
 	STREAM_OFFSET_TXD = MODELINFOSIZE,
-	NUMSTREAMINFO = STREAM_OFFSET_TXD+TXDSTORESIZE
+	STREAM_OFFSET_COL = STREAM_OFFSET_TXD+TXDSTORESIZE,
+	STREAM_OFFSET_ANIM = STREAM_OFFSET_COL+COLSTORESIZE,
+	NUMSTREAMINFO = STREAM_OFFSET_ANIM+NUMANIMBLOCKS
 };
 
 enum StreamFlags
@@ -14,6 +16,7 @@ enum StreamFlags
 	STREAMFLAGS_DEPENDENCY  = 0x04,	// Is this right?
 	STREAMFLAGS_PRIORITY    = 0x08,
 	STREAMFLAGS_NOFADE      = 0x10,
+	STREAMFLAGS_20          = 0x20,	// TODO(MIAMI): what's this
 
 	STREAMFLAGS_CANT_REMOVE = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED,
 	STREAMFLAGS_KEEP_IN_MEMORY = STREAMFLAGS_DONT_REMOVE|STREAMFLAGS_SCRIPTOWNED|STREAMFLAGS_DEPENDENCY,
@@ -92,9 +95,9 @@ public:
 	static int32 ms_numVehiclesLoaded;
 	static int32 ms_vehiclesLoaded[MAXVEHICLESLOADED];
 	static int32 ms_lastVehicleDeleted;
+	static bool ms_bIsPedFromPedGroupLoaded[NUMMODELSPERPEDGROUP];
 	static CDirectory *ms_pExtraObjectsDir;
 	static int32 ms_numPriorityRequests;
-	static bool ms_hasLoadedLODs;
 	static int32 ms_currentPedGrp;
 	static int32 ms_lastCullZone;
 	static uint16 ms_loadedGangs;
@@ -115,14 +118,25 @@ public:
 	static bool FinishLoadingLargeFile(int8 *buf, int32 streamId);
 	static bool HasModelLoaded(int32 id) { return ms_aInfoForModel[id].m_loadState == STREAMSTATE_LOADED; }
 	static bool HasTxdLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_TXD); }
+	static bool HasColLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_COL); }
+	static bool HasAnimLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_ANIM); }
 	static bool CanRemoveModel(int32 id) { return (ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0; }
 	static bool CanRemoveTxd(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_TXD); }
+	static bool CanRemoveCol(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_COL); }
+	static bool CanRemoveAnim(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_ANIM); }
 	static void RequestModel(int32 model, int32 flags);
 	static void ReRequestModel(int32 model) { RequestModel(model, ms_aInfoForModel[model].m_flags); }
 	static void RequestTxd(int32 txd, int32 flags) { RequestModel(txd + STREAM_OFFSET_TXD, flags); }
 	static void ReRequestTxd(int32 txd) { ReRequestModel(txd + STREAM_OFFSET_TXD); }
-	static void RequestSubway(void);
+	static void RequestCol(int32 col, int32 flags) { RequestModel(col + STREAM_OFFSET_COL, flags); }
+	static void ReRequestCol(int32 col) { ReRequestModel(col + STREAM_OFFSET_COL); }
+	static void RequestAnim(int32 col, int32 flags) { RequestModel(col + STREAM_OFFSET_ANIM, flags); }
+	static void ReRequestAnim(int32 col) { ReRequestModel(col + STREAM_OFFSET_ANIM); }
 	static void RequestBigBuildings(eLevelName level);
+	static void RequestBigBuildings(eLevelName level, const CVector &pos);
+	static void InstanceBigBuildings(eLevelName level, const CVector &pos);
+	static void InstanceLoadedModelsInSectorList(CPtrList &list);
+	static void InstanceLoadedModels(const CVector &pos);
 	static void RequestIslands(eLevelName level);
 	static void RequestSpecialModel(int32 modelId, const char *modelName, int32 flags);
 	static void RequestSpecialChar(int32 charId, const char *modelName, int32 flags);
@@ -131,29 +145,32 @@ public:
 	static void DecrementRef(int32 id);
 	static void RemoveModel(int32 id);
 	static void RemoveTxd(int32 id) { RemoveModel(id + STREAM_OFFSET_TXD); }
+	static void RemoveCol(int32 id) { RemoveModel(id + STREAM_OFFSET_COL); }
+	static void RemoveAnim(int32 id) { RemoveModel(id + STREAM_OFFSET_ANIM); }
 	static void RemoveUnusedBuildings(eLevelName level);
 	static void RemoveBuildings(eLevelName level);
 	static void RemoveUnusedBigBuildings(eLevelName level);
 	static void RemoveIslandsNotUsed(eLevelName level);
 	static void RemoveBigBuildings(eLevelName level);
 	static bool RemoveLoadedVehicle(void);
-	static bool RemoveLeastUsedModel(void);
+	static bool RemoveLeastUsedModel(uint32 excludeMask);
 	static void RemoveAllUnusedModels(void);
 	static void RemoveUnusedModelsInLoadedList(void);
-	static bool RemoveReferencedTxds(int32 mem);
 	static int32 GetAvailableVehicleSlot(void);
 	static bool IsTxdUsedByRequestedModels(int32 txdId);
+	static bool AreAnimsUsedByRequestedModels(int32 animId);
 	static bool AddToLoadedVehiclesList(int32 modelId);
 	static bool IsObjectInCdImage(int32 id);
-	static void HaveAllBigBuildingsLoaded(eLevelName level);
 	static void SetModelIsDeletable(int32 id);
 	static void SetModelTxdIsDeletable(int32 id);
 	static void SetMissionDoesntRequireModel(int32 id);
 	static void LoadInitialPeds(void);
+	static void LoadInitialWeapons(void);
 	static void LoadInitialVehicles(void);
 	static void StreamVehiclesAndPeds(void);
 	static void StreamZoneModels(const CVector &pos);
 	static void RemoveCurrentZonesModels(void);
+	static void LoadBigBuildingsWhenNeeded(void);
 
 	static int32 GetCdImageOffset(int32 lastPosn);
 	static int32 GetNextFileOnCd(int32 position, bool priority);
@@ -183,6 +200,7 @@ public:
 	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, int32 mem);
 
 	static void LoadScene(const CVector &pos);
+	static void LoadSceneCollision(const CVector &pos);
 
 	static void MemoryCardSave(uint8 *buffer, uint32 *length);
 	static void MemoryCardLoad(uint8 *buffer, uint32 length);
diff --git a/src/core/SurfaceTable.cpp b/src/core/SurfaceTable.cpp
index b1bcceb6..9076a9a6 100644
--- a/src/core/SurfaceTable.cpp
+++ b/src/core/SurfaceTable.cpp
@@ -74,7 +74,7 @@ CSurfaceTable::GetAdhesionGroup(uint8 surfaceType)
 	case SURFACE_GIRDER:		return ADHESIVE_HARD;
 	case SURFACE_METAL_CHAIN_FENCE:	return ADHESIVE_HARD;
 	case SURFACE_PED:		return ADHESIVE_RUBBER;
-	case SURFACE_SAND:		return ADHESIVE_LOOSE;
+	case SURFACE_SAND:		return ADHESIVE_SAND;
 	case SURFACE_WATER:		return ADHESIVE_WET;
 	case SURFACE_WOOD_CRATES:	return ADHESIVE_ROAD;
 	case SURFACE_WOOD_BENCH:	return ADHESIVE_ROAD;
@@ -89,6 +89,8 @@ CSurfaceTable::GetAdhesionGroup(uint8 surfaceType)
 	case SURFACE_CARDBOARDBOX:	return ADHESIVE_LOOSE;
 	case SURFACE_TRANSPARENT_STONE:	return ADHESIVE_HARD;
 	case SURFACE_METAL_GATE:	return ADHESIVE_HARD;
+	case SURFACE_SAND_BEACH:	return ADHESIVE_SAND;
+	case SURFACE_CONCRETE_BEACH:	return ADHESIVE_ROAD;
 	default:			return ADHESIVE_ROAD;
 	}
 }
@@ -108,6 +110,7 @@ CSurfaceTable::GetWetMultiplier(uint8 surfaceType)
 	case SURFACE_HEDGE:
 	case SURFACE_CARDBOARDBOX:
 	case SURFACE_TRANSPARENT_STONE:
+	case SURFACE_CONCRETE_BEACH:
 		return 1.0f - CWeather::WetRoads*0.25f;
 
 	case SURFACE_GRASS:
@@ -131,6 +134,10 @@ CSurfaceTable::GetWetMultiplier(uint8 surfaceType)
 	case SURFACE_METAL_GATE:
 		return 1.0f - CWeather::WetRoads*0.4f;
 
+	case SURFACE_SAND:
+	case SURFACE_SAND_BEACH:
+		return 1.0f - CWeather::WetRoads*0.5f;
+
 	default:
 		return 1.0f;
 	}
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 25b5e57d..d8f9be3d 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -35,8 +35,6 @@ enum eSurfaceType
 	SURFACE_CARDBOARDBOX,
 	SURFACE_TRANSPARENT_STONE,
 	SURFACE_METAL_GATE,
-
-	// These are illegal
 	SURFACE_SAND_BEACH,
 	SURFACE_CONCRETE_BEACH,
 };
@@ -47,6 +45,7 @@ enum
 	ADHESIVE_HARD,
 	ADHESIVE_ROAD,
 	ADHESIVE_LOOSE,
+	ADHESIVE_SAND,
 	ADHESIVE_WET,
 
 	NUMADHESIVEGROUPS
diff --git a/src/core/TempColModels.cpp b/src/core/TempColModels.cpp
index 1252e2c7..c6a9d368 100644
--- a/src/core/TempColModels.cpp
+++ b/src/core/TempColModels.cpp
@@ -16,6 +16,7 @@ CColModel CTempColModels::ms_colModelPedGroundHit;
 CColModel CTempColModels::ms_colModelBoot1;
 CColModel CTempColModels::ms_colModelDoor1;
 CColModel CTempColModels::ms_colModelBonnet1;
+CColModel CTempColModels::ms_colModelWeapon;
 
 
 CColSphere s_aPedSpheres[3];
@@ -41,13 +42,13 @@ CTempColModels::Initialise(void)
 
 	int i;
 
-	ms_colModelBBox.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBBox.boundingBox.Set(CVector(-2.0f, -2.0f, -2.0f), CVector(2.0f, 2.0f, 2.0f), SURFACE_DEFAULT, 0);
+	ms_colModelBBox.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelBBox.boundingBox.Set(CVector(-2.0f, -2.0f, -2.0f), CVector(2.0f, 2.0f, 2.0f));
 	ms_colModelBBox.level = LEVEL_NONE;
 
 	for (i = 0; i < ARRAY_SIZE(ms_colModelCutObj); i++) {
-		ms_colModelCutObj[i].boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-		ms_colModelCutObj[i].boundingBox.Set(CVector(-2.0f, -2.0f, -2.0f), CVector(2.0f, 2.0f, 2.0f), SURFACE_DEFAULT, 0);
+		ms_colModelCutObj[i].boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f));
+		ms_colModelCutObj[i].boundingBox.Set(CVector(-2.0f, -2.0f, -2.0f), CVector(2.0f, 2.0f, 2.0f));
 		ms_colModelCutObj[i].level = LEVEL_NONE;
 	}
 
@@ -69,8 +70,8 @@ CTempColModels::Initialise(void)
 		s_aPedSpheres[i].piece = 0;
 	}
 
-	ms_colModelPed1.boundingSphere.Set(1.25f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelPed1.boundingBox.Set(CVector(-0.35f, -0.35f, -1.0f), CVector(0.35f, 0.35f, 0.9f), SURFACE_DEFAULT, 0);
+	ms_colModelPed1.boundingSphere.Set(1.25f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelPed1.boundingBox.Set(CVector(-0.35f, -0.35f, -1.0f), CVector(0.35f, 0.35f, 0.9f));
 	SET_COLMODEL_SPHERES(ms_colModelPed1, s_aPedSpheres);
 
 	// Ped 2 Spheres
@@ -88,8 +89,8 @@ CTempColModels::Initialise(void)
 		s_aPed2Spheres[i].piece = 0;
 	}
 
-	ms_colModelPed2.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelPed2.boundingBox.Set(CVector(-0.7f, -0.7f, -1.2f), CVector(0.7f, 0.7f, 0.0f), SURFACE_DEFAULT, 0);
+	ms_colModelPed2.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelPed2.boundingBox.Set(CVector(-0.7f, -0.7f, -1.2f), CVector(0.7f, 0.7f, 0.0f));
 
 	SET_COLMODEL_SPHERES(ms_colModelPed2, s_aPed2Spheres);
 
@@ -114,8 +115,8 @@ CTempColModels::Initialise(void)
 	s_aPedGSpheres[2].piece = 0;
 	s_aPedGSpheres[3].piece = 6;
 
-	ms_colModelPedGroundHit.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelPedGroundHit.boundingBox.Set(CVector(-0.4f, -1.0f, -1.25f), CVector(0.4f, 1.2f, -0.5f), SURFACE_DEFAULT, 0);
+	ms_colModelPedGroundHit.boundingSphere.Set(2.0f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelPedGroundHit.boundingBox.Set(CVector(-0.4f, -1.0f, -1.25f), CVector(0.4f, 1.2f, -0.5f));
 
 	SET_COLMODEL_SPHERES(ms_colModelPedGroundHit, s_aPedGSpheres);
 
@@ -134,8 +135,8 @@ CTempColModels::Initialise(void)
 		s_aDoorSpheres[i].piece = 0;
 	}
 
-	ms_colModelDoor1.boundingSphere.Set(1.5f, CVector(0.0f, -0.6f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelDoor1.boundingBox.Set(CVector(-0.3f, 0.0f, -0.6f), CVector(0.3f, -1.2f, 0.6f), SURFACE_DEFAULT, 0);
+	ms_colModelDoor1.boundingSphere.Set(1.5f, CVector(0.0f, -0.6f, 0.0f));
+	ms_colModelDoor1.boundingBox.Set(CVector(-0.3f, 0.0f, -0.6f), CVector(0.3f, -1.2f, 0.6f));
 
 	SET_COLMODEL_SPHERES(ms_colModelDoor1, s_aDoorSpheres);
 
@@ -154,8 +155,8 @@ CTempColModels::Initialise(void)
 		s_aBumperSpheres[i].piece = 0;
 	}
 
-	ms_colModelBumper1.boundingSphere.Set(2.2f, CVector(0.0f, -0.6f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, 0.2f), SURFACE_DEFAULT, 0);
+	ms_colModelBumper1.boundingSphere.Set(2.2f, CVector(0.0f, -0.6f, 0.0f));
+	ms_colModelBumper1.boundingBox.Set(CVector(-1.2f, -0.3f, -0.2f), CVector(1.2f, 0.3f, 0.2f));
 
 	SET_COLMODEL_SPHERES(ms_colModelBumper1, s_aBumperSpheres);
 
@@ -174,8 +175,8 @@ CTempColModels::Initialise(void)
 		s_aPanelSpheres[i].piece = 0;
 	}
 
-	ms_colModelPanel1.boundingSphere.Set(1.4f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelPanel1.boundingBox.Set(CVector(-0.3f, -0.6f, -0.15f), CVector(0.3f, 0.6f, 0.15f), SURFACE_DEFAULT, 0);
+	ms_colModelPanel1.boundingSphere.Set(1.4f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelPanel1.boundingBox.Set(CVector(-0.3f, -0.6f, -0.15f), CVector(0.3f, 0.6f, 0.15f));
 
 	SET_COLMODEL_SPHERES(ms_colModelPanel1, s_aPanelSpheres);
 
@@ -194,8 +195,8 @@ CTempColModels::Initialise(void)
 		s_aBonnetSpheres[i].piece = 0;
 	}
 
-	ms_colModelBonnet1.boundingSphere.Set(1.7f, CVector(0.0f, 0.5f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBonnet1.boundingBox.Set(CVector(-0.7f, -0.2f, -0.3f), CVector(0.7f, 1.2f, 0.3f), SURFACE_DEFAULT, 0);
+	ms_colModelBonnet1.boundingSphere.Set(1.7f, CVector(0.0f, 0.5f, 0.0f));
+	ms_colModelBonnet1.boundingBox.Set(CVector(-0.7f, -0.2f, -0.3f), CVector(0.7f, 1.2f, 0.3f));
 
 	SET_COLMODEL_SPHERES(ms_colModelBonnet1, s_aBonnetSpheres);
 
@@ -214,8 +215,8 @@ CTempColModels::Initialise(void)
 		s_aBootSpheres[i].piece = 0;
 	}
 
-	ms_colModelBoot1.boundingSphere.Set(1.4f, CVector(0.0f, -0.4f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBoot1.boundingBox.Set(CVector(-0.7f, -0.9f, -0.3f), CVector(0.7f, 0.2f, 0.3f), SURFACE_DEFAULT, 0);
+	ms_colModelBoot1.boundingSphere.Set(1.4f, CVector(0.0f, -0.4f, 0.0f));
+	ms_colModelBoot1.boundingBox.Set(CVector(-0.7f, -0.9f, -0.3f), CVector(0.7f, 0.2f, 0.3f));
 
 	SET_COLMODEL_SPHERES(ms_colModelBoot1, s_aBootSpheres);
 
@@ -236,8 +237,8 @@ CTempColModels::Initialise(void)
 		s_aWheelSpheres[i].piece = 0;
 	}
 
-	ms_colModelWheel1.boundingSphere.Set(1.4f, CVector(0.0f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelWheel1.boundingBox.Set(CVector(-0.7f, -0.4f, -0.4f), CVector(0.7f, 0.4f, 0.4f), SURFACE_DEFAULT, 0);
+	ms_colModelWheel1.boundingSphere.Set(1.4f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelWheel1.boundingBox.Set(CVector(-0.7f, -0.4f, -0.4f), CVector(0.7f, 0.4f, 0.4f));
 
 	SET_COLMODEL_SPHERES(ms_colModelWheel1, s_aWheelSpheres);
 
@@ -258,8 +259,8 @@ CTempColModels::Initialise(void)
 		s_aBodyPartSpheres1[i].piece = 0;
 	}
 
-	ms_colModelBodyPart1.boundingSphere.Set(0.7f, CVector(0.4f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBodyPart1.boundingBox.Set(CVector(-0.3f, -0.3f, -0.3f), CVector(1.1f, 0.3f, 0.3f), SURFACE_DEFAULT, 0);
+	ms_colModelBodyPart1.boundingSphere.Set(0.7f, CVector(0.4f, 0.0f, 0.0f));
+	ms_colModelBodyPart1.boundingBox.Set(CVector(-0.3f, -0.3f, -0.3f), CVector(1.1f, 0.3f, 0.3f));
 
 	SET_COLMODEL_SPHERES(ms_colModelBodyPart1, s_aBodyPartSpheres1);
 
@@ -280,10 +281,14 @@ CTempColModels::Initialise(void)
 		s_aBodyPartSpheres2[i].piece = 0;
 	}
 
-	ms_colModelBodyPart2.boundingSphere.Set(0.5f, CVector(0.25f, 0.0f, 0.0f), SURFACE_DEFAULT, 0);
-	ms_colModelBodyPart2.boundingBox.Set(CVector(-0.2f, -0.2f, -0.2f), CVector(0.7f, 0.2f, 0.2f), SURFACE_DEFAULT, 0);
+	ms_colModelBodyPart2.boundingSphere.Set(0.5f, CVector(0.25f, 0.0f, 0.0f));
+	ms_colModelBodyPart2.boundingBox.Set(CVector(-0.2f, -0.2f, -0.2f), CVector(0.7f, 0.2f, 0.2f));
 
 	SET_COLMODEL_SPHERES(ms_colModelBodyPart2, s_aBodyPartSpheres2);
 
+
+	ms_colModelWeapon.boundingSphere.Set(0.25f, CVector(0.0f, 0.0f, 0.0f));
+	ms_colModelWeapon.boundingBox.Set(CVector(-0.25f, -0.25, -0.25f), CVector(0.25f, 0.25, 0.25f));
+
 #undef SET_COLMODEL_SPHERES
 }
diff --git a/src/core/TempColModels.h b/src/core/TempColModels.h
index 3e1dd5e1..0c936d6f 100644
--- a/src/core/TempColModels.h
+++ b/src/core/TempColModels.h
@@ -18,6 +18,7 @@ public:
 	static CColModel ms_colModelBoot1;
 	static CColModel ms_colModelDoor1;
 	static CColModel ms_colModelBonnet1;
+	static CColModel ms_colModelWeapon;
 
 	static void Initialise(void);
 };
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index ed5580fd..f60adf07 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -7,7 +7,8 @@
 #include "Timer.h"
 
 uint32 CTimer::m_snTimeInMilliseconds;
-uint32 CTimer::m_snTimeInMillisecondsPauseMode = 1;
+PauseModeTime CTimer::m_snTimeInMillisecondsPauseMode = 1;
+
 uint32 CTimer::m_snTimeInMillisecondsNonClipped;
 uint32 CTimer::m_snPreviousTimeInMilliseconds;
 uint32 CTimer::m_FrameCounter;
@@ -33,7 +34,7 @@ RsTimerType suspendPcTimer;
 
 uint32 suspendDepth;
 
-#ifdef FIX_BUGS
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
 double frameTime;
 #endif
 
@@ -97,7 +98,7 @@ void CTimer::Update(void)
 		float updInCyclesScaled = updInCycles * ms_fTimeScale;
 		
 		// We need that real frame time to fix transparent menu bug.
-#ifndef FIX_BUGS
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND
 		double
 #endif
 		frameTime = updInCyclesScaled / (double)_nCyclesPerMS;
@@ -121,7 +122,7 @@ void CTimer::Update(void)
 		RsTimerType updInMs = timer - oldPcTimer;
 		
 		// We need that real frame time to fix transparent menu bug.
-#ifndef FIX_BUGS
+#ifndef FIX_HIGH_FPS_BUGS_ON_FRONTEND
 		double
 #endif
 		frameTime = (double)updInMs * ms_fTimeScale;
diff --git a/src/core/Timer.h b/src/core/Timer.h
index 4e8b8805..6f100c63 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -1,10 +1,16 @@
 #pragma once
 
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
+#define PauseModeTime double
+#else
+#define PauseModeTime uint32
+#endif
+
 class CTimer
 {
 
 	static uint32 m_snTimeInMilliseconds;
-	static uint32 m_snTimeInMillisecondsPauseMode;
+	static PauseModeTime m_snTimeInMillisecondsPauseMode;
 	static uint32 m_snTimeInMillisecondsNonClipped;
 	static uint32 m_snPreviousTimeInMilliseconds;
 	static uint32 m_FrameCounter;
@@ -29,7 +35,7 @@ public:
 	static void SetTimeInMilliseconds(uint32 t) { m_snTimeInMilliseconds = t; }
 	static uint32 GetTimeInMillisecondsNonClipped(void) { return m_snTimeInMillisecondsNonClipped; }
 	static void SetTimeInMillisecondsNonClipped(uint32 t) { m_snTimeInMillisecondsNonClipped = t; }
-	static uint32 GetTimeInMillisecondsPauseMode(void) { return m_snTimeInMillisecondsPauseMode; }
+	static PauseModeTime GetTimeInMillisecondsPauseMode(void) { return m_snTimeInMillisecondsPauseMode; }
 	static void SetTimeInMillisecondsPauseMode(uint32 t) { m_snTimeInMillisecondsPauseMode = t; }
 	static uint32 GetPreviousTimeInMilliseconds(void) { return m_snPreviousTimeInMilliseconds; }
 	static void SetPreviousTimeInMilliseconds(uint32 t) { m_snPreviousTimeInMilliseconds = t; }
@@ -63,6 +69,6 @@ public:
 #endif
 };
 
-#ifdef FIX_BUGS
+#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
 extern double frameTime;
 #endif
diff --git a/src/core/User.cpp b/src/core/User.cpp
index f906ae44..56e37ac4 100644
--- a/src/core/User.cpp
+++ b/src/core/User.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 
-
+#include "GameLogic.h"
 #include "Hud.h"
 #include "PlayerPed.h"
 #include "Replay.h"
@@ -32,8 +32,8 @@ void
 CPlaceName::Process()
 {
 	CVector pos = CWorld::Players[CWorld::PlayerInFocus].GetPos();
-	CZone *navigZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_NAVIG);
-	CZone *defaultZone = CTheZones::FindSmallestZonePositionType(&pos, ZONE_DEFAULT);
+	CZone *navigZone = CTheZones::FindSmallestNavigationZoneForPosition(&pos, false, true);
+	CZone *defaultZone = CTheZones::FindSmallestNavigationZoneForPosition(&pos, true, false);
 
 	if (navigZone == nil) m_pZone = nil;
 	if (defaultZone == nil) m_pZone2 = nil;
@@ -99,7 +99,7 @@ void
 CCurrentVehicle::Display()
 {
 	wchar *text = nil;
-	if (m_pCurrentVehicle != nil)
+	if (m_pCurrentVehicle != nil && m_pCurrentVehicle != CGameLogic::pShortCutTaxi)
 		text = TheText.Get(((CVehicleModelInfo*)CModelInfo::GetModelInfo(m_pCurrentVehicle->GetModelIndex()))->m_gameName);
 	CHud::SetVehicleName(text);
 }
diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp
index 7508c9f4..d2623431 100644
--- a/src/core/Wanted.cpp
+++ b/src/core/Wanted.cpp
@@ -40,6 +40,12 @@ CWanted::Initialise()
 }
 
 bool
+CWanted::AreMiamiViceRequired()
+{
+	return m_nWantedLevel >= 3;
+}
+
+bool
 CWanted::AreSwatRequired()
 {
 	return m_nWantedLevel == 4 || m_bSwatRequired;
@@ -456,3 +462,10 @@ CWanted::UpdateCrimesQ(void)
 		}
 	}
 }
+
+void
+CWanted::Suspend(void)
+{
+	// TODO(MIAMI)!
+	Reset(); // <- temporary
+}
diff --git a/src/core/Wanted.h b/src/core/Wanted.h
index de36c442..ee72aa47 100644
--- a/src/core/Wanted.h
+++ b/src/core/Wanted.h
@@ -31,6 +31,7 @@ public:
 
 public:
 	void Initialise();
+	bool AreMiamiViceRequired();
 	bool AreSwatRequired();
 	bool AreFbiRequired();
 	bool AreArmyRequired();
@@ -48,6 +49,8 @@ public:
 	void UpdateCrimesQ();
 	void Update();
 
+	void Suspend();
+
 	bool IsIgnored(void) { return m_bIgnoredByCops || m_bIgnoredByEveryone; }
 
 	static int32 WorkOutPolicePresence(CVector posn, float radius);
diff --git a/src/core/World.cpp b/src/core/World.cpp
index c3633d77..53d36854 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -50,6 +50,8 @@ bool CWorld::bProcessCutsceneOnly;
 bool CWorld::bDoingCarCollisions;
 bool CWorld::bIncludeCarTyres;
 
+CColPoint CWorld::m_aTempColPts[MAX_COLLISION_POINTS];
+
 void
 CWorld::Initialise()
 {
@@ -165,7 +167,7 @@ CWorld::CameraToIgnoreThisObject(CEntity *ent)
 bool
 CWorld::ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoint &point, CEntity *&entity,
                            bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects,
-                           bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects)
+                           bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
 {
 	int x, xstart, xend;
 	int y, ystart, yend;
@@ -184,7 +186,7 @@ CWorld::ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoi
 
 #define LOSARGS                                                                                                        \
 	CColLine(point1, point2), point, dist, entity, checkBuildings, checkVehicles, checkPeds, checkObjects,         \
-	    checkDummies, ignoreSeeThrough, ignoreSomeObjects
+	    checkDummies, ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough
 
 	if(xstart == xend && ystart == yend) {
 		// Only one sector
@@ -266,7 +268,7 @@ CWorld::ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoi
 bool
 CWorld::ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity,
                                  bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects,
-                                 bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects)
+                                 bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
 {
 	float mindist = dist;
 	bool deadPeds = !!bIncludeDeadPeds;
@@ -274,39 +276,39 @@ CWorld::ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoin
 
 	if(checkBuildings) {
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_BUILDINGS], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_BUILDINGS_OVERLAP], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 	}
 
 	if(checkVehicles) {
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_VEHICLES], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_VEHICLES_OVERLAP], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 	}
 
 	if(checkPeds) {
 		if(deadPeds) bIncludeDeadPeds = true;
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_PEDS], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_PEDS_OVERLAP], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 		bIncludeDeadPeds = false;
 	}
 
 	if(checkObjects) {
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_OBJECTS], line, point, mindist, entity,
-		                             ignoreSeeThrough, ignoreSomeObjects);
+		                             ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough);
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_OBJECTS_OVERLAP], line, point, mindist, entity,
-		                             ignoreSeeThrough, ignoreSomeObjects);
+		                             ignoreSeeThrough, ignoreSomeObjects, ignoreShootThrough);
 	}
 
 	if(checkDummies) {
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_DUMMIES], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 		ProcessLineOfSightSectorList(sector.m_lists[ENTITYLIST_DUMMIES_OVERLAP], line, point, mindist, entity,
-		                             ignoreSeeThrough);
+		                             ignoreSeeThrough, false, ignoreShootThrough);
 	}
 
 	bIncludeDeadPeds = deadPeds;
@@ -320,7 +322,7 @@ CWorld::ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoin
 
 bool
 CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist,
-                                     CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects)
+                                     CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough)
 {
 	bool deadPeds = false;
 	float mindist = dist;
@@ -339,31 +341,15 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP
 
 			if(e->IsPed()) {
 				if(e->bUsesCollision || deadPeds && ((CPed *)e)->m_nPedState == PED_DEAD) {
-#ifdef PED_SKIN
-					if(IsClumpSkinned(e->GetClump()))
-						colmodel = ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))->AnimatePedColModelSkinned(e->GetClump());
-					else
-#endif
-					if(((CPed *)e)->UseGroundColModel())
-						colmodel = &CTempColModels::ms_colModelPedGroundHit;
-					else
-#ifdef ANIMATE_PED_COL_MODEL
-						colmodel = CPedModelInfo::AnimatePedColModel(
-						    ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))
-						        ->GetHitColModel(),
-						    RpClumpGetFrame(e->GetClump()));
-#else
-						colmodel =
-						    ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))
-						        ->GetHitColModel();
-#endif
+					colmodel = ((CPedModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex()))->AnimatePedColModelSkinned(e->GetClump());
 				} else
 					colmodel = nil;
+
 			} else if(e->bUsesCollision)
 				colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
 
 			if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, dist,
-			                                              ignoreSeeThrough))
+			                                              ignoreSeeThrough, ignoreShootThrough))
 				entity = e;
 		}
 	}
@@ -382,7 +368,11 @@ CWorld::ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, C
 {
 	AdvanceCurrentScanCode();
 	CVector point2(point1.x, point1.y, z2);
-	return ProcessVerticalLineSector(*GetSector(GetSectorIndexX(point1.x), GetSectorIndexY(point1.y)),
+	int secX = GetSectorIndexX(point1.x);
+	int secY = GetSectorIndexY(point1.y);
+	secX = clamp(secX, 0, NUMSECTORS_X-1);
+	secY = clamp(secY, 0, NUMSECTORS_Y-1);
+	return ProcessVerticalLineSector(*GetSector(secX, secY),
 	                                 CColLine(point1, point2), point, entity, checkBuildings, checkVehicles,
 	                                 checkPeds, checkObjects, checkDummies, ignoreSeeThrough, poly);
 }
@@ -448,7 +438,7 @@ CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CCol
 
 			colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
 			if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, dist,
-			                                   ignoreSeeThrough, poly))
+			                                   ignoreSeeThrough, false, poly))
 				entity = e;
 		}
 	}
@@ -649,7 +639,7 @@ CWorld::GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bo
 
 				colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
 
-				if(CCollision::TestLineOfSight(line, e->GetMatrix(), *colmodel, ignoreSeeThrough))
+				if(CCollision::TestLineOfSight(line, e->GetMatrix(), *colmodel, ignoreSeeThrough, false))
 					return false;
 			}
 		}
@@ -920,6 +910,7 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
                                     bool ignoreSomeObjects)
 {
 	static CColModel sphereCol;
+	CColSphere sphere;
 
 	sphereCol.boundingSphere.center.x = 0.0f;
 	sphereCol.boundingSphere.center.y = 0.0f;
@@ -932,7 +923,8 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
 	sphereCol.boundingBox.max.y = radius;
 	sphereCol.boundingBox.max.z = radius;
 	sphereCol.numSpheres = 1;
-	sphereCol.spheres = &sphereCol.boundingSphere;
+	sphere.Set(radius, CVector(0.0f, 0.0f, 0.0f));
+	sphereCol.spheres = &sphere;
 	sphereCol.numLines = 0;
 	sphereCol.numBoxes = 0;
 	sphereCol.numTriangles = 0;
@@ -1201,7 +1193,7 @@ CWorld::FindObjectsIntersectingCubeSectorList(CPtrList &list, const CVector &vec
 }
 
 void
-CWorld::FindObjectsIntersectingAngledCollisionBox(const CColBox &boundingBox, const CMatrix &matrix,
+CWorld::FindObjectsIntersectingAngledCollisionBox(const CBox &boundingBox, const CMatrix &matrix,
                                                   const CVector &position, float fStartX, float fStartY, float fEndX,
                                                   float fEndY, int16 *nEntitiesFound, int16 maxEntitiesToFind,
                                                   CEntity **aEntities, bool bBuildings, bool bVehicles, bool bPeds,
@@ -1261,7 +1253,7 @@ CWorld::FindObjectsIntersectingAngledCollisionBox(const CColBox &boundingBox, co
 }
 
 void
-CWorld::FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList &list, const CColBox &boundingBox,
+CWorld::FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList &list, const CBox &boundingBox,
                                                             const CMatrix &matrix, const CVector &position,
                                                             int16 *nEntitiesFound, int16 maxEntitiesToFind,
                                                             CEntity **aEntities)
@@ -1823,18 +1815,21 @@ void
 CWorld::RepositionOneObject(CEntity *pEntity)
 {
 	int16 modelId = pEntity->GetModelIndex();
-	if (IsStreetLight(modelId) || IsTreeModel(modelId) || modelId == MI_PARKINGMETER ||
-	   modelId == MI_PHONEBOOTH1 || modelId == MI_WASTEBIN || modelId == MI_BIN || modelId == MI_POSTBOX1 ||
-	   modelId == MI_NEWSSTAND || modelId == MI_TRAFFICCONE || modelId == MI_DUMP1 ||
-	   modelId == MI_ROADWORKBARRIER1 || modelId == MI_BUSSIGN1 || modelId == MI_NOPARKINGSIGN1 ||
-	   modelId == MI_PHONESIGN || modelId == MI_TAXISIGN || modelId == MI_FISHSTALL01 ||
-	   modelId == MI_FISHSTALL02 || modelId == MI_FISHSTALL03 || modelId == MI_FISHSTALL04 ||
-	   modelId == MI_BAGELSTAND2 || modelId == MI_FIRE_HYDRANT || modelId == MI_BOLLARDLIGHT ||
-	   modelId == MI_PARKTABLE) {
+	if (modelId == MI_PARKINGMETER || modelId == MI_PHONEBOOTH1 || modelId == MI_WASTEBIN ||
+	    modelId == MI_BIN || modelId == MI_POSTBOX1 || modelId == MI_NEWSSTAND || modelId == MI_TRAFFICCONE ||
+	    modelId == MI_DUMP1 || modelId == MI_ROADWORKBARRIER1 || modelId == MI_BUSSIGN1 || modelId == MI_NOPARKINGSIGN1 ||
+	    modelId == MI_PHONESIGN || modelId == MI_FIRE_HYDRANT || modelId == MI_BOLLARDLIGHT ||
+	    modelId == MI_PARKTABLE || modelId == MI_PARKINGMETER2 || modelId == MI_TELPOLE02 ||
+	    modelId == MI_PARKBENCH || modelId == MI_BARRIER1 || IsTreeModel(modelId) ||
+		IsLightThatNeedsRepositioning(modelId)
+		) {
 		CVector &position = pEntity->GetMatrix().GetPosition();
-		float fBoundingBoxMinZ = pEntity->GetColModel()->boundingBox.min.z;
+		CColModel *pColModel = pEntity->GetColModel();
+		float fBoundingBoxMinZ = pColModel->boundingBox.min.z;
+		float fHeight = pColModel->boundingBox.max.z - pColModel->boundingBox.min.z;
+		if(fHeight < OBJECT_REPOSITION_OFFSET_Z) fHeight = OBJECT_REPOSITION_OFFSET_Z;
 		position.z = CWorld::FindGroundZFor3DCoord(position.x, position.y,
-		                                           position.z + OBJECT_REPOSITION_OFFSET_Z, nil) -
+		                                           position.z + fHeight, nil) -
 		             fBoundingBoxMinZ;
 		pEntity->m_matrix.UpdateRW();
 		pEntity->UpdateRwFrame();
@@ -1921,6 +1916,7 @@ CWorld::Process(void)
 			if(csObj && csObj->m_entryInfoList.first) {
 				if(csObj->m_rwObject && RwObjectGetType(csObj->m_rwObject) == rpCLUMP &&
 				   RpAnimBlendClumpGetFirstAssociation(csObj->GetClump())) {
+// TODO(MIAMI): doRender argument
 					RpAnimBlendClumpUpdateAnimations(csObj->GetClump(),
 					                                 0.02f * (csObj->IsObject()
 					                                              ? CTimer::GetTimeStepNonClipped()
@@ -1939,6 +1935,7 @@ CWorld::Process(void)
 			CEntity *movingEnt = (CEntity *)node->item;
 			if(movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP &&
 			   RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) {
+// TODO(MIAMI): doRender argument
 				RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(),
 				                                 0.02f * (movingEnt->IsObject()
 				                                              ? CTimer::GetTimeStepNonClipped()
@@ -2041,9 +2038,12 @@ CWorld::Process(void)
 				   movingPed->EnteringCar()) {
 					CVehicle *movingCar = movingPed->m_pMyVehicle;
 					if(movingCar) {
+#ifdef GTA_TRAIN
 						if(movingCar->IsTrain()) {
 							movingPed->SetPedPositionInTrain();
-						} else {
+						} else
+#endif
+						{
 							switch(movingPed->m_nPedState) {
 							case PED_ENTER_CAR:
 							case PED_CARJACK: movingPed->EnterCar(); break;
@@ -2228,4 +2228,60 @@ CWorld::UseDetonator(CEntity *pEntity)
 				pVehicle->m_pBlowUpEntity->RegisterReference(&pVehicle->m_pBlowUpEntity);
 		}
 	}
+	CProjectileInfo::RemoveDetonatorProjectiles();
+}
+
+bool
+CWorld::IsWanderPathClear(CVector const& point1, CVector const& point2, float distance, int maxSteps)
+{
+	if (Abs(point1.z - point2.z) > distance)
+		return false;
+	if (!GetIsLineOfSightClear(point1, point2, true, false, false, false, false, false, false))
+		return false;
+	CVector vecBetween = point2 - point1;
+	uint32 nSteps = Max(vecBetween.Magnitude(), maxSteps);
+	if (nSteps == 0)
+		return true;
+	vecBetween.Normalise();
+	uint32 step = 1;
+	for (step = 1; step < nSteps; step++) {
+		CVector posThisStep = point1 + vecBetween * step;
+		float level;
+		if (!CWaterLevel::GetWaterLevel(posThisStep, &level, false))
+			continue;
+		posThisStep.z = level;
+		AdvanceCurrentScanCode();
+
+		CVector vecCheckedPos(posThisStep.x, posThisStep.y, Max(point1.z, point2.z));
+		CColPoint colpoint;
+		CEntity* entity;
+		if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+			CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+			return false;
+	}
+
+	CVector posThisStep = point1;
+	AdvanceCurrentScanCode();
+	CVector vecCheckedPos(posThisStep.x, posThisStep.y, point1.z - 5.0f);
+
+	CColPoint colpoint;
+	CEntity* entity;
+	if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+		CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+		return false;
+
+	float heightNextStep = colpoint.point.z + 0.5f;
+	for (step = 1; step < nSteps; step++) {
+		CVector posThisStep = point1 + vecBetween * step;
+		posThisStep.z = heightNextStep;
+		AdvanceCurrentScanCode();
+		CVector vecCheckedPos(posThisStep.x, posThisStep.y, heightNextStep - 2.0f);
+		if (!ProcessVerticalLineSector(*GetSector(GetSectorIndexX(posThisStep.x), GetSectorIndexY(posThisStep.y)),
+			CColLine(posThisStep, vecCheckedPos), colpoint, entity, true, false, false, false, false, false, nil))
+			return false;
+		if (Abs(colpoint.point.z - heightNextStep) > 1.0f)
+			return false;
+		heightNextStep = colpoint.point.z + 0.5f;
+	}
+	return true;
 }
diff --git a/src/core/World.h b/src/core/World.h
index 2bcc4e43..3da774ba 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -4,19 +4,19 @@
 #include "Lists.h"
 #include "PlayerInfo.h"
 
-/* Sectors span from -2000 to 2000 in x and y.
- * With 100x100 sectors, each is 40x40 units. */
+/* Sectors span from -2400 to 1600 in x and -2000 to 2000 y.
+ * With 80x80 sectors, each is 50x50 units. */
 
-#define SECTOR_SIZE_X (40.0f)
-#define SECTOR_SIZE_Y (40.0f)
+#define SECTOR_SIZE_X (50.0f)
+#define SECTOR_SIZE_Y (50.0f)
 
-#define NUMSECTORS_X (100)
-#define NUMSECTORS_Y (100)
+#define NUMSECTORS_X (80)
+#define NUMSECTORS_Y (80)
 
 #define WORLD_SIZE_X (NUMSECTORS_X * SECTOR_SIZE_X)
 #define WORLD_SIZE_Y (NUMSECTORS_Y * SECTOR_SIZE_Y)
 
-#define WORLD_MIN_X (-2000.0f)
+#define WORLD_MIN_X (-2400.0f)
 #define WORLD_MIN_Y (-2000.0f)
 
 #define WORLD_MAX_X (WORLD_MIN_X + WORLD_SIZE_X)
@@ -71,6 +71,7 @@ public:
 	static bool bProcessCutsceneOnly;
 	static bool bDoingCarCollisions;
 	static bool bIncludeCarTyres;
+	static CColPoint m_aTempColPts[MAX_COLLISION_POINTS];
 
 	static void Remove(CEntity *entity);
 	static void Add(CEntity *entity);
@@ -90,9 +91,9 @@ public:
 
 	static bool CameraToIgnoreThisObject(CEntity *ent);
 
-	static bool ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
-	static bool ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
-	static bool ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects = false);
+	static bool ProcessLineOfSight(const CVector &point1, const CVector &point2, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects = false, bool ignoreShootThrough = false);
+	static bool ProcessLineOfSightSector(CSector &sector, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough);
+	static bool ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool ignoreSeeThrough, bool ignoreSomeObjects, bool ignoreShootThrough);
 	static bool ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, CStoredCollPoly *poly);
 	static bool ProcessVerticalLineSector(CSector &sector, const CColLine &line, CColPoint &point, CEntity *&entity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, CStoredCollPoly *poly);
 	static bool ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist, CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly);
@@ -114,8 +115,8 @@ public:
 	static void FindObjectsKindaCollidingSectorList(CPtrList& list, const CVector& position, float radius, bool bCheck2DOnly, int16* nCollidingEntities, int16 maxEntitiesToFind, CEntity** aEntities);
 	static void FindObjectsIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bBuildings, bool bVehicles, bool bPeds, bool bObjects, bool bDummies);
 	static void FindObjectsIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities);
-	static void FindObjectsIntersectingAngledCollisionBox(const CColBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
-	static void FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList& list, const CColBox& boundingBox, const CMatrix& matrix, const CVector& position, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities);
+	static void FindObjectsIntersectingAngledCollisionBox(const CBox &, const CMatrix &, const CVector &, float, float, float, float, int16*, int16, CEntity **, bool, bool, bool, bool, bool);
+	static void FindObjectsIntersectingAngledCollisionBoxSectorList(CPtrList& list, const CBox& boundingBox, const CMatrix& matrix, const CVector& position, int16* nEntitiesFound, int16 maxEntitiesToFind, CEntity** aEntities);
 	static void FindMissionEntitiesIntersectingCube(const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bVehicles, bool bPeds, bool bObjects);
 	static void FindMissionEntitiesIntersectingCubeSectorList(CPtrList& list, const CVector& vecStartPos, const CVector& vecEndPos, int16* nIntersecting, int16 maxEntitiesToFind, CEntity** aEntities, bool bIsVehicleList, bool bIsPedList);
 
@@ -125,6 +126,8 @@ public:
 	static void CallOffChaseForAreaSectorListVehicles(CPtrList& list, float x1, float y1, float x2, float y2, float fStartX, float fStartY, float fEndX, float fEndY);
 	static void CallOffChaseForAreaSectorListPeds(CPtrList& list, float x1, float y1, float x2, float y2);
 
+	static bool IsWanderPathClear(CVector const&, CVector const&, float, int);
+
 	static float GetSectorX(float f) { return ((f - WORLD_MIN_X)/SECTOR_SIZE_X); }
 	static float GetSectorY(float f) { return ((f - WORLD_MIN_Y)/SECTOR_SIZE_Y); }
 	static int GetSectorIndexX(float f) { return (int)GetSectorX(f); }
diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp
index c376e11f..729cc35d 100644
--- a/src/core/ZoneCull.cpp
+++ b/src/core/ZoneCull.cpp
@@ -11,207 +11,22 @@
 #include "ZoneCull.h"
 #include "Zones.h"
 
-int32     CCullZones::NumCullZones;
-CCullZone CCullZones::aZones[NUMCULLZONES];
 int32     CCullZones::NumAttributeZones;
 CAttributeZone CCullZones::aAttributeZones[NUMATTRIBZONES];
-uint16    CCullZones::aIndices[NUMZONEINDICES];
-int16     CCullZones::aPointersToBigBuildingsForBuildings[NUMBUILDINGS];
-int16     CCullZones::aPointersToBigBuildingsForTreadables[NUMTREADABLES];
 
 int32 CCullZones::CurrentWantedLevelDrop_Player;
 int32 CCullZones::CurrentFlags_Camera;
 int32 CCullZones::CurrentFlags_Player;
-int32 CCullZones::OldCullZone;
-int32 CCullZones::EntityIndicesUsed;
 bool CCullZones::bCurrentSubwayIsInvisible;
-bool CCullZones::bCullZonesDisabled;
-
 
 void
 CCullZones::Init(void)
 {
-	int i;
-
 	NumAttributeZones = 0;
 	CurrentWantedLevelDrop_Player = 0;
 	CurrentFlags_Camera = 0;
 	CurrentFlags_Player = 0;
 	bCurrentSubwayIsInvisible = false;
-	NumCullZones = 0;
-	OldCullZone = -1;
-	EntityIndicesUsed = 0;
-
-	for(i = 0; i < NUMBUILDINGS; i++)
-		aPointersToBigBuildingsForBuildings[i] = -1;
-	for(i = 0; i < NUMTREADABLES; i++)
-		aPointersToBigBuildingsForTreadables[i] = -1;
-}
-
-bool CCullZone::TestLine(CVector vec1, CVector vec2)
-{
-	CColPoint colPoint;
-	CEntity *entity;
-
-	if (CWorld::ProcessLineOfSight(vec1, vec2, colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	if (CWorld::ProcessLineOfSight(CVector(vec1.x + 0.05f, vec1.y, vec1.z), CVector(vec2.x + 0.05f, vec2.y, vec2.z), colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	if (CWorld::ProcessLineOfSight(CVector(vec1.x - 0.05f, vec1.y, vec1.z), CVector(vec2.x - 0.05f, vec2.y, vec2.z), colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	if (CWorld::ProcessLineOfSight(CVector(vec1.x, vec1.y + 0.05f, vec1.z), CVector(vec2.x, vec2.y + 0.05f, vec2.z), colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	if (CWorld::ProcessLineOfSight(CVector(vec1.x, vec1.y - 0.05f, vec1.z), CVector(vec2.x, vec2.y - 0.05f, vec2.z), colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	if (CWorld::ProcessLineOfSight(CVector(vec1.x, vec1.y, vec1.z + 0.05f), CVector(vec2.x, vec2.y, vec2.z + 0.05f), colPoint, entity, true, false, false, false, false, true, false))
-		return true;
-	return CWorld::ProcessLineOfSight(CVector(vec1.x, vec1.y, vec1.z - 0.05f), CVector(vec2.x, vec2.y, vec2.z - 0.05f), colPoint, entity, true, false, false, false, false, true, false);
-}
-
-
-uint16* pTempArrayIndices;
-int TempEntityIndicesUsed;
-
-void
-CCullZones::ResolveVisibilities(void)
-{
-	int fd;
-
-	CFileMgr::SetDir("");
-	fd = CFileMgr::OpenFile("DATA\\cullzone.dat", "rb");
-	if(fd > 0){
-		CFileMgr::Read(fd, (char*)&NumCullZones, sizeof(NumCullZones));
-		CFileMgr::Read(fd, (char*)aZones, sizeof(aZones));
-		CFileMgr::Read(fd, (char*)&NumAttributeZones, sizeof(NumAttributeZones));
-		CFileMgr::Read(fd, (char*)aAttributeZones, sizeof(aAttributeZones));
-		CFileMgr::Read(fd, (char*)aIndices, sizeof(aIndices));
-		CFileMgr::Read(fd, (char*)aPointersToBigBuildingsForBuildings, sizeof(aPointersToBigBuildingsForBuildings));
-		CFileMgr::Read(fd, (char*)aPointersToBigBuildingsForTreadables, sizeof(aPointersToBigBuildingsForTreadables));
-		CFileMgr::CloseFile(fd);
-	}else{
-#if 0
-		// TODO: implement code from mobile to generate data here
-		EntityIndicesUsed = 0;
-		BuildListForBigBuildings();
-		pTempArrayIndices = new uint16[140000];
-		TempEntityIndicesUsed = 0;
-
-		for (int i = 0; i < NumCullZones; i++) {
-			DoVisibilityTestCullZone(i, true);
-		}
-
-		CompressIndicesArray();
-		delete[] pTempArrayIndices;
-
-		fd = CFileMgr::OpenFileForWriting("data\\cullzone.dat");
-		if (fd != 0) {
-			CFileMgr::Write(fd, (char*)&NumCullZones, sizeof(NumCullZones));
-			CFileMgr::Write(fd, (char*)aZones, sizeof(aZones));
-			CFileMgr::Write(fd, (char*)&NumAttributeZones, sizeof(NumAttributeZones));
-			CFileMgr::Write(fd, (char*)&aAttributeZones, sizeof(aAttributeZones));
-			CFileMgr::Write(fd, (char*)&aIndices, sizeof(aIndices));
-			CFileMgr::Write(fd, (char*)&aPointersToBigBuildingsForBuildings, sizeof(aPointersToBigBuildingsForBuildings));
-			CFileMgr::Write(fd, (char*)&aPointersToBigBuildingsForTreadables, sizeof(aPointersToBigBuildingsForTreadables));
-			CFileMgr::CloseFile(fd);
-		}
-#endif
-	}
-}
-
-void
-CCullZones::BuildListForBigBuildings()
-{
-	for (int i = CPools::GetBuildingPool()->GetSize()-1; i >= 0; i--) {
-		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
-		if (building == nil || !building->bIsBIGBuilding) continue;
-		CSimpleModelInfo *nonlod = (CSimpleModelInfo*)((CSimpleModelInfo *)CModelInfo::GetModelInfo(building->GetModelIndex()))->m_atomics[2];
-		if (nonlod == nil) continue;
-
-		for (int j = i; j >= 0; j--) {
-			CBuilding *building2 = CPools::GetBuildingPool()->GetSlot(j);
-			if (building2 == nil || building2->bIsBIGBuilding) continue;
-			if (CModelInfo::GetModelInfo(building2->GetModelIndex()) == nonlod) {
-				if ((building2->GetPosition() - building->GetPosition()).Magnitude() < 5.0f) {
-					aPointersToBigBuildingsForBuildings[j] = i;
-				}
-			}
-		}
-
-		for (int j = CPools::GetTreadablePool()->GetSize()-1; j >= 0; j--) {
-			CTreadable *treadable = CPools::GetTreadablePool()->GetSlot(j);
-			if (treadable == nil || treadable->bIsBIGBuilding) continue;
-			if (CModelInfo::GetModelInfo(treadable->GetModelIndex()) == nonlod) {
-				if ((treadable->GetPosition() - building->GetPosition()).Magnitude() < 5.0f) {
-					aPointersToBigBuildingsForTreadables[j] = i;
-				}
-			}
-		}
-	}
-}
-
-void
-CCullZones::DoVisibilityTestCullZone(int zoneId, bool doIt)
-{
-	aZones[zoneId].m_groupIndexCount[0] = 0;
-	aZones[zoneId].m_groupIndexCount[1] = 0;
-	aZones[zoneId].m_groupIndexCount[2] = 0;
-	aZones[zoneId].m_indexStart = TempEntityIndicesUsed;
-	aZones[zoneId].FindTestPoints();
-
-	if (!doIt) return;
-
-	for (int i = CPools::GetBuildingPool()->GetSize() - 1; i >= 0; i--) {
-		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
-		if (building != nil && !building->bIsBIGBuilding && aZones[zoneId].IsEntityCloseEnoughToZone(building, aPointersToBigBuildingsForBuildings[i] != -1)) {
-			CBuilding *building2 = nil;
-			if (aPointersToBigBuildingsForBuildings[i] != -1)
-				building2 = CPools::GetBuildingPool()->GetSlot(aPointersToBigBuildingsForBuildings[i]);
-
-			if (!aZones[zoneId].TestEntityVisibilityFromCullZone(building, 0.0f, building2)) {
-				pTempArrayIndices[TempEntityIndicesUsed++] = i;
-				aZones[zoneId].m_groupIndexCount[0]++;
-			}
-		}
-	}
-
-	for (int i = CPools::GetTreadablePool()->GetSize() - 1; i >= 0; i--) {
-		CTreadable* building = CPools::GetTreadablePool()->GetSlot(i);
-		if (building != nil && aZones[zoneId].IsEntityCloseEnoughToZone(building, aPointersToBigBuildingsForTreadables[i] != -1)) {
-			CTreadable* building2 = nil;
-			if (aPointersToBigBuildingsForTreadables[i] != -1)
-				building2 = CPools::GetTreadablePool()->GetSlot(aPointersToBigBuildingsForTreadables[i]);
-
-			if (!aZones[zoneId].TestEntityVisibilityFromCullZone(building, 10.0f, building2)) {
-				pTempArrayIndices[TempEntityIndicesUsed++] = i;
-				aZones[zoneId].m_groupIndexCount[1]++;
-			}
-		}
-	}
-
-	for (int i = CPools::GetTreadablePool()->GetSize() - 1; i >= 0; i--) {
-		CTreadable *building = CPools::GetTreadablePool()->GetSlot(i);
-		if (building != nil && aZones[zoneId].CalcDistToCullZoneSquared(building->GetPosition().x, building->GetPosition().y) < 40000.0f) {
-			int start = aZones[zoneId].m_groupIndexCount[0] + aZones[zoneId].m_indexStart;
-			int end = aZones[zoneId].m_groupIndexCount[1] + start;
-
-			bool alreadyAdded = false;
-
-			for (int k = start; k < end; k++) {
-				if (aIndices[k] == i)
-					alreadyAdded = true;
-			}
-
-			if (!alreadyAdded) {
-				CBuilding *building2 = nil;
-				if (aPointersToBigBuildingsForTreadables[i] != -1)
-					building2 = CPools::GetBuildingPool()->GetSlot(aPointersToBigBuildingsForTreadables[i]);
-				if (!aZones[zoneId].TestEntityVisibilityFromCullZone(building, 0.0f, building2)) {
-					pTempArrayIndices[TempEntityIndicesUsed++] = i;
-					aZones[zoneId].m_groupIndexCount[2]++;
-				}
-			}
-		}
-	}
 }
 
 void
@@ -219,14 +34,9 @@ CCullZones::Update(void)
 {
 	bool invisible;
 
-	if(bCullZonesDisabled)
-		return;
-
 	switch(CTimer::GetFrameCounter() & 7){
 	case 0:
 	case 4:
-		/* Update Cull zone */
-		ForceCullZoneCoors(TheCamera.GetGameCamPosition());
 		break;
 
 	case 2:
@@ -250,28 +60,6 @@ CCullZones::Update(void)
 void
 CCullZones::ForceCullZoneCoors(CVector coors)
 {
-	int32 z;
-	z = FindCullZoneForCoors(coors);
-	if(z != OldCullZone){
-		if(OldCullZone >= 0)
-			aZones[OldCullZone].DoStuffLeavingZone();
-		if(z >= 0)
-			aZones[z].DoStuffEnteringZone();
-		OldCullZone = z;
-	}
-}
-
-int32
-CCullZones::FindCullZoneForCoors(CVector coors)
-{
-	int i;
-
-	for(i = 0; i < NumCullZones; i++)
-		if(coors.x >= aZones[i].minx && coors.x <= aZones[i].maxx &&
-		   coors.y >= aZones[i].miny && coors.y <= aZones[i].maxy &&
-		   coors.z >= aZones[i].minz && coors.z <= aZones[i].maxz)
-			return i;
-	return -1;
 }
 
 int32
@@ -346,219 +134,16 @@ CCullZones::AddCullZone(CVector const &position,
                         float minz, float maxz,
                         uint16 flag, int16 wantedLevel)
 {
-	CCullZone *cull;
 	CAttributeZone *attrib;
 
-	CVector v;
-	if((flag & ATTRZONE_NOTCULLZONE) == 0){
-		cull = &aZones[NumCullZones++];
-		v = position;
-		// WTF is this?
-		if((v-CVector(1032.14f, -624.255f, 24.93f)).Magnitude() < 1.0f)
-			v = CVector(1061.7f, -613.0f, 19.0f);
-		if((v-CVector(1029.48f, -495.757f, 21.98f)).Magnitude() < 1.0f)
-			v = CVector(1061.4f, -506.0f, 18.5f);
-		cull->position.x = clamp(v.x, minx, maxx);
-		cull->position.y = clamp(v.y, miny, maxy);
-		cull->position.z = clamp(v.z, minz, maxz);
-		cull->minx = minx;
-		cull->maxx = maxx;
-		cull->miny = miny;
-		cull->maxy = maxy;
-		cull->minz = minz;
-		cull->maxz = maxz;
-		cull->m_groupIndexCount[0] = 0;
-		cull->m_groupIndexCount[1] = 0;
-		cull->m_groupIndexCount[2] = 0;
-		cull->m_indexStart = 0;
-	}
-	if(flag & ~ATTRZONE_NOTCULLZONE){
-		attrib = &aAttributeZones[NumAttributeZones++];
-		attrib->minx = minx;
-		attrib->maxx = maxx;
-		attrib->miny = miny;
-		attrib->maxy = maxy;
-		attrib->minz = minz;
-		attrib->maxz = maxz;
-		attrib->attributes = flag;
-		attrib->wantedLevel = wantedLevel;
-	}
-}
-
-
-void
-CCullZone::DoStuffLeavingZone(void)
-{
-	int i;
-
-	for(i = 0; i < m_numBuildings; i++)
-		DoStuffLeavingZone_OneBuilding(CCullZones::aIndices[m_indexStart + i]);
-	for(; i < m_numBuildings + m_numTreadablesPlus10m + m_numTreadables ; i++)
-		DoStuffLeavingZone_OneTreadableBoth(CCullZones::aIndices[m_indexStart + i]);
-}
-
-void
-CCullZone::DoStuffLeavingZone_OneBuilding(uint16 i)
-{
-	int16 bb;
-	int j;
-
-	if(i < 6000){
-		CPools::GetBuildingPool()->GetSlot(i)->bZoneCulled = false;
-		bb = CCullZones::aPointersToBigBuildingsForBuildings[i];
-		if(bb != -1)
-			CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = false;
-	}else{
-		i -= 6000;
-		for(j = 0; j < 3; j++)
-			DoStuffLeavingZone_OneBuilding(CCullZones::aIndices[i+j]);
-	}
-}
-
-void
-CCullZone::DoStuffLeavingZone_OneTreadableBoth(uint16 i)
-{
-	int16 bb;
-	int j;
-
-	if(i < 6000){
-		CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = false;
-		CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled2 = false;
-		bb = CCullZones::aPointersToBigBuildingsForTreadables[i];
-		if(bb != -1)
-			CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = false;
-	}else{
-		i -= 6000;
-		for(j = 0; j < 3; j++)
-			DoStuffLeavingZone_OneTreadableBoth(CCullZones::aIndices[i+j]);
-	}
-}
-
-void
-CCullZone::DoStuffEnteringZone(void)
-{
-	int i;
-
-	for(i = 0; i < m_numBuildings; i++)
-		DoStuffEnteringZone_OneBuilding(CCullZones::aIndices[m_indexStart + i]);
-	for(; i < m_numBuildings + m_numTreadablesPlus10m; i++)
-		DoStuffEnteringZone_OneTreadablePlus10m(CCullZones::aIndices[m_indexStart + i]);
-	for(; i < m_numBuildings + m_numTreadablesPlus10m + m_numTreadables; i++)
-		DoStuffEnteringZone_OneTreadable(CCullZones::aIndices[m_indexStart + i]);
-}
-
-void
-CCullZone::DoStuffEnteringZone_OneBuilding(uint16 i)
-{
-	int16 bb;
-	int j;
-
-	if(i < 6000){
-		CPools::GetBuildingPool()->GetSlot(i)->bZoneCulled = true;
-		bb = CCullZones::aPointersToBigBuildingsForBuildings[i];
-		if(bb != -1)
-			CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true;
-	}else{
-		i -= 6000;
-		for(j = 0; j < 3; j++)
-			DoStuffEnteringZone_OneBuilding(CCullZones::aIndices[i+j]);
-	}
-}
-
-void
-CCullZone::DoStuffEnteringZone_OneTreadablePlus10m(uint16 i)
-{
-	int16 bb;
-	int j;
-
-	if(i < 6000){
-		CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;
-		CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled2 = true;
-		bb = CCullZones::aPointersToBigBuildingsForTreadables[i];
-		if(bb != -1)
-			CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true;
-	}else{
-		i -= 6000;
-		for(j = 0; j < 3; j++)
-			DoStuffEnteringZone_OneTreadablePlus10m(CCullZones::aIndices[i+j]);
-	}
-}
-
-void
-CCullZone::DoStuffEnteringZone_OneTreadable(uint16 i)
-{
-	int16 bb;
-	int j;
-
-	if(i < 6000){
-		CPools::GetTreadablePool()->GetSlot(i)->bZoneCulled = true;
-		bb = CCullZones::aPointersToBigBuildingsForTreadables[i];
-		if(bb != -1)
-			CPools::GetBuildingPool()->GetSlot(bb)->bZoneCulled = true;
-	}else{
-		i -= 6000;
-		for(j = 0; j < 3; j++)
-			DoStuffEnteringZone_OneTreadable(CCullZones::aIndices[i+j]);
-	}
-}
-
-float
-CCullZone::CalcDistToCullZoneSquared(float x, float y)
-{
-	float rx, ry;
-
-	if (x < minx) rx = sq(x - minx);
-	else if (x > maxx) rx = sq(x - maxx);
-	else rx = 0.0f;
-
-	if (y < miny) ry = sq(y - miny);
-	else if (y > maxy) ry = sq(y - maxy);
-	else ry = 0.0f;
-
-	return rx + ry;
-}
-
-bool
-CCullZone::IsEntityCloseEnoughToZone(CEntity *entity, bool checkLevel)
-{
-	const CVector &pos = entity->GetPosition();
-
-	CSimpleModelInfo *minfo = (CSimpleModelInfo*)CModelInfo::GetModelInfo(entity->GetModelIndex());
-	float distToZone = CalcDistToCullZone(pos.x, pos.y);
-	float lodDist;
-	if (minfo->m_isSubway)
-		lodDist = minfo->GetLargestLodDistance() + 30.0f;
-	else
-		lodDist = minfo->GetLargestLodDistance() + 50.0f;
-
-	if (lodDist > distToZone) return true;
-	if (!checkLevel) return false;
-	CVector tempPos(minx, miny, minz);
-	return CTheZones::GetLevelFromPosition(&pos) == CTheZones::GetLevelFromPosition(&tempPos);
-}
-
-bool
-CCullZones::DoWeHaveMoreThanXOccurencesOfSet(int32 count, uint16 *set)
-{
-	int32 curCount;
-	int32 start;
-	int32 size;
-
-	for (int i = 0; i < NumCullZones; i++) {
-		curCount = 0;
-		for (int group = 0; group < 3; group++) {
-			aZones[i].GetGroupStartAndSize(group, start, size);
-
-			int unk = 0; // TODO: figure out
-			for (int j = 0; j < size; j++) {
-				for (int k = 0; k < 3; k++) {
-					if (set[k] == pTempArrayIndices[start+j])
-						unk++;
-				}
-			}
-			if (unk == 3 && ++curCount >= count)
-				return true;
-		}
-	}
-	return false;
+	assert(NumAttributeZones < NUMATTRIBZONES);
+	attrib = &aAttributeZones[NumAttributeZones++];
+	attrib->minx = minx;
+	attrib->maxx = maxx;
+	attrib->miny = miny;
+	attrib->maxy = maxy;
+	attrib->minz = minz;
+	attrib->maxz = maxz;
+	attrib->attributes = flag;
+	attrib->wantedLevel = wantedLevel;
 }
diff --git a/src/core/ZoneCull.h b/src/core/ZoneCull.h
index 9bc07b8c..aae06ca0 100644
--- a/src/core/ZoneCull.h
+++ b/src/core/ZoneCull.h
@@ -1,57 +1,5 @@
 class CEntity;
 
-class CCullZone
-{
-public:
-	CVector position;
-	float minx;
-	float maxx;
-	float miny;
-	float maxy;
-	float minz;
-	float maxz;
-
-	int32 m_indexStart;
-	int16 m_groupIndexCount[3];
-	int16 m_numBuildings;
-	int16 m_numTreadablesPlus10m;
-	int16 m_numTreadables;
-
-	void DoStuffLeavingZone(void);
-	static void DoStuffLeavingZone_OneBuilding(uint16 i);
-	static void DoStuffLeavingZone_OneTreadableBoth(uint16 i);
-	void DoStuffEnteringZone(void);
-	static void DoStuffEnteringZone_OneBuilding(uint16 i);
-	static void DoStuffEnteringZone_OneTreadablePlus10m(uint16 i);
-	static void DoStuffEnteringZone_OneTreadable(uint16 i);
-
-
-	static bool TestLine(CVector a1, CVector a2);
-	float CalcDistToCullZoneSquared(float x, float y);
-	float CalcDistToCullZone(float x, float y) { return Sqrt(CalcDistToCullZoneSquared(x, y)); };
-	bool IsEntityCloseEnoughToZone(CEntity* entity, bool checkLevel);
-
-	void GetGroupStartAndSize(int32 groupid, int32 &start, int32 &size) {
-		switch (groupid) {
-		case 1:
-			start = m_groupIndexCount[0] + m_indexStart;
-			size = m_groupIndexCount[1];
-			break;
-		case 2:
-			start = m_groupIndexCount[0] + m_groupIndexCount[1] + m_indexStart;
-			size = m_groupIndexCount[2];
-			break;
-		default:
-			start = m_indexStart;
-			size = m_groupIndexCount[0];
-			break;
-		}
-	}
-
-	void FindTestPoints() {}; // todo
-	bool TestEntityVisibilityFromCullZone(CEntity*, float, CEntity*) { return false; }; // todo
-};
-
 enum eZoneAttribs
 {
 	ATTRZONE_CAMCLOSEIN		= 1,
@@ -62,6 +10,8 @@ enum eZoneAttribs
 	ATTRZONE_NOTCULLZONE		= 0x20,
 	ATTRZONE_DOINEEDCOLLISION	= 0x40,
 	ATTRZONE_SUBWAYVISIBLE		= 0x80,
+	
+	ATTRZONE_WATERFUDGE		    = 0x400,
 };
 
 struct CAttributeZone
@@ -79,27 +29,17 @@ struct CAttributeZone
 class CCullZones
 {
 public:
-	static int32     NumCullZones;
-	static CCullZone aZones[NUMCULLZONES];
 	static int32     NumAttributeZones;
 	static CAttributeZone aAttributeZones[NUMATTRIBZONES];
-	static uint16        aIndices[NUMZONEINDICES];
-	static int16         aPointersToBigBuildingsForBuildings[NUMBUILDINGS];
-	static int16         aPointersToBigBuildingsForTreadables[NUMTREADABLES];
 
 	static int32 CurrentWantedLevelDrop_Player;
 	static int32 CurrentFlags_Camera;
 	static int32 CurrentFlags_Player;
-	static int32 OldCullZone;
-	static int32 EntityIndicesUsed;
 	static bool bCurrentSubwayIsInvisible;
-	static bool bCullZonesDisabled;
 
 	static void Init(void);
-	static void ResolveVisibilities(void);
 	static void Update(void);
 	static void ForceCullZoneCoors(CVector coors);
-	static int32 FindCullZoneForCoors(CVector coors);
 	static int32 FindAttributesForCoors(CVector coors, int32 *wantedLevel);
 	static CAttributeZone *FindZoneWithStairsAttributeForPlayer(void);
 	static void MarkSubwayAsInvisible(bool visible);
@@ -115,11 +55,9 @@ public:
 	static bool DoINeedToLoadCollision(void) { return (CurrentFlags_Player & ATTRZONE_DOINEEDCOLLISION) != 0; }
 	static bool PlayerNoRain(void) { return (CurrentFlags_Player & ATTRZONE_NORAIN) != 0; }
 	static bool CamNoRain(void) { return (CurrentFlags_Camera & ATTRZONE_NORAIN) != 0; }
+	static bool WaterFudge(void) { return (CurrentFlags_Camera & ATTRZONE_WATERFUDGE) != 0; }
 	static int32 GetWantedLevelDrop(void) { return CurrentWantedLevelDrop_Player; }
 
-	static void BuildListForBigBuildings();
-	static void DoVisibilityTestCullZone(int zoneId, bool doIt);
-	static bool DoWeHaveMoreThanXOccurencesOfSet(int32 count, uint16 *set);
-
-	static void CompressIndicesArray() {};// todo
+	//--MIAMI: TODO
+	static bool PoliceAbandonCars(void) { return false; }
 };
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
index 4f491a49..84b5ca29 100644
--- a/src/core/Zones.cpp
+++ b/src/core/Zones.cpp
@@ -9,133 +9,138 @@
 #include "World.h"
 
 eLevelName CTheZones::m_CurrLevel;
-CZone *CTheZones::m_pPlayersZone;
 int16 CTheZones::FindIndex;
 
 uint16 CTheZones::NumberOfAudioZones;
 int16 CTheZones::AudioZoneArray[NUMAUDIOZONES];
 uint16 CTheZones::TotalNumberOfMapZones;
-uint16 CTheZones::TotalNumberOfZones;
-CZone CTheZones::ZoneArray[NUMZONES];
+uint16 CTheZones::TotalNumberOfInfoZones;
+uint16 CTheZones::TotalNumberOfNavigationZones;
+CZone CTheZones::InfoZoneArray[NUMINFOZONES];
 CZone CTheZones::MapZoneArray[NUMMAPZONES];
+CZone CTheZones::NavigationZoneArray[NUMNAVIGZONES];
 uint16 CTheZones::TotalNumberOfZoneInfos;
-CZoneInfo CTheZones::ZoneInfoArray[2*NUMZONES];
+CZoneInfo CTheZones::ZoneInfoArray[2*NUMINFOZONES];
 
-#define SWAPF(a, b) { float t; t = a; a = b; b = t; }
-
-inline bool IsNormalZone(int type) { return type == ZONE_DEFAULT || type == ZONE_NAVIG || type == ZONE_INFO; }
 
-static void
-CheckZoneInfo(CZoneInfo *info)
-{
-	assert(info->carThreshold[0] >= 0);
-	assert(info->carThreshold[0] <= info->carThreshold[1]);
-	assert(info->carThreshold[1] <= info->carThreshold[2]);
-	assert(info->carThreshold[2] <= info->carThreshold[3]);
-	assert(info->carThreshold[3] <= info->carThreshold[4]);
-	assert(info->carThreshold[4] <= info->carThreshold[5]);
-	assert(info->carThreshold[5] <= info->copThreshold);
-	assert(info->copThreshold <= info->gangThreshold[0]);
-	assert(info->gangThreshold[0] <= info->gangThreshold[1]);
-	assert(info->gangThreshold[1] <= info->gangThreshold[2]);
-	assert(info->gangThreshold[2] <= info->gangThreshold[3]);
-	assert(info->gangThreshold[3] <= info->gangThreshold[4]);
-	assert(info->gangThreshold[4] <= info->gangThreshold[5]);
-	assert(info->gangThreshold[5] <= info->gangThreshold[6]);
-	assert(info->gangThreshold[6] <= info->gangThreshold[7]);
-	assert(info->gangThreshold[7] <= info->gangThreshold[8]);
-}
+#define SWAPF(a, b) { float t; t = a; a = b; b = t; }
 
+//--MIAMI: done
 wchar*
 CZone::GetTranslatedName(void)
 {
 	return TheText.Get(name);
 }
 
+//--MIAMI: done
 void
 CTheZones::Init(void)
 {
-	int i;
+	int i, j;
 	for(i = 0; i < NUMAUDIOZONES; i++)
 		AudioZoneArray[i] = -1;
 	NumberOfAudioZones = 0;
 
-	for(i = 0; i < NUMZONES; i++)
-		memset(&ZoneArray[i], 0, sizeof(CZone));
-
-	CZoneInfo *zonei;
-	int x = 1000/6;
-	for(i = 0; i < 2*NUMZONES; i++){
-		zonei = &ZoneInfoArray[i];
-		zonei->carDensity = 10;
-		zonei->carThreshold[0] = x;
-		zonei->carThreshold[1] = zonei->carThreshold[0] + x;
-		zonei->carThreshold[2] = zonei->carThreshold[1] + x;
-		zonei->carThreshold[3] = zonei->carThreshold[2] + x;
-		zonei->carThreshold[4] = zonei->carThreshold[3];
-		zonei->carThreshold[5] = zonei->carThreshold[4];
-		zonei->copThreshold = zonei->carThreshold[5] + x;
-		zonei->gangThreshold[0] = zonei->copThreshold;
-		zonei->gangThreshold[1] = zonei->gangThreshold[0];
-		zonei->gangThreshold[2] = zonei->gangThreshold[1];
-		zonei->gangThreshold[3] = zonei->gangThreshold[2];
-		zonei->gangThreshold[4] = zonei->gangThreshold[3];
-		zonei->gangThreshold[5] = zonei->gangThreshold[4];
-		zonei->gangThreshold[6] = zonei->gangThreshold[5];
-		zonei->gangThreshold[7] = zonei->gangThreshold[6];
-		zonei->gangThreshold[8] = zonei->gangThreshold[7];
-		CheckZoneInfo(zonei);
+	for(i = 0; i < NUMNAVIGZONES; i++)
+		memset(&NavigationZoneArray[i], 0, sizeof(CZone));
+
+	for(i = 0; i < NUMINFOZONES; i++)
+		memset(&InfoZoneArray[i], 0, sizeof(CZone));
+
+	int x = 1000/9;
+	for(i = 0; i < 2*NUMINFOZONES; i++){
+		// Cars
+
+		ZoneInfoArray[i].carDensity = 10;
+		ZoneInfoArray[i].carThreshold[0] = x;
+		ZoneInfoArray[i].carThreshold[1] = ZoneInfoArray[i].carThreshold[0] + x;
+		ZoneInfoArray[i].carThreshold[2] = ZoneInfoArray[i].carThreshold[1] + x;
+		ZoneInfoArray[i].carThreshold[3] = ZoneInfoArray[i].carThreshold[2] + x;
+		ZoneInfoArray[i].carThreshold[4] = ZoneInfoArray[i].carThreshold[3] + x;
+		ZoneInfoArray[i].carThreshold[5] = ZoneInfoArray[i].carThreshold[4] + x;
+		ZoneInfoArray[i].carThreshold[6] = ZoneInfoArray[i].carThreshold[5] + x;
+		ZoneInfoArray[i].carThreshold[7] = ZoneInfoArray[i].carThreshold[6] + x;
+		ZoneInfoArray[i].carThreshold[8] = 1000;
+
+		ZoneInfoArray[i].boatThreshold[0] = 500;
+		ZoneInfoArray[i].boatThreshold[1] = 1000;
+
+		// What's going on here? this looks more like density
+		ZoneInfoArray[i].copThreshold = 50;
+		for(j = 0; j < NUM_GANGS; j++)
+			ZoneInfoArray[i].gangThreshold[j] = ZoneInfoArray[i].copThreshold;
+
+		// Peds
+
+		ZoneInfoArray[i].pedDensity = 12;
+
+		// What's going on here? this looks more like density
+		ZoneInfoArray[i].copPedThreshold = 50;
+		for(j = 0; j < NUM_GANGS; j++)
+			ZoneInfoArray[i].gangPedThreshold[j] = ZoneInfoArray[i].copPedThreshold;
+
+		ZoneInfoArray[i].pedGroup = 0;
 	}
 
 	TotalNumberOfZoneInfos = 1;	// why 1?
-	TotalNumberOfZones = 1;
+	TotalNumberOfNavigationZones = 1;
+	TotalNumberOfInfoZones = 1;
+
+	strcpy(InfoZoneArray[0].name, "CITYINF");
+	InfoZoneArray[0].minx = -2400.0f;
+	InfoZoneArray[0].miny = -2000.0f;
+	InfoZoneArray[0].minz = -500.0f;
+	InfoZoneArray[0].maxx =  1600.0f;
+	InfoZoneArray[0].maxy =  2000.0f;
+	InfoZoneArray[0].maxz =  500.0f;
+	InfoZoneArray[0].level = LEVEL_NONE;
+	InfoZoneArray[0].type = ZONE_INFO;
+
+	strcpy(NavigationZoneArray[0].name, "VICE_C");
+	NavigationZoneArray[0].minx = -2400.0f;
+	NavigationZoneArray[0].miny = -2000.0f;
+	NavigationZoneArray[0].minz = -500.0f;
+	NavigationZoneArray[0].maxx =  1600.0f;
+	NavigationZoneArray[0].maxy =  2000.0f;
+	NavigationZoneArray[0].maxz =  500.0f;
+	NavigationZoneArray[0].level = LEVEL_NONE;
+	NavigationZoneArray[0].type = ZONE_NAVIG;
 
 	m_CurrLevel = LEVEL_NONE;
-	m_pPlayersZone = &ZoneArray[0];
-
-	strcpy(ZoneArray[0].name, "CITYZON");
-	ZoneArray[0].minx = -4000.0f;
-	ZoneArray[0].miny = -4000.0f;
-	ZoneArray[0].minz = -500.0f;
-	ZoneArray[0].maxx =  4000.0f;
-	ZoneArray[0].maxy =  4000.0f;
-	ZoneArray[0].maxz =  500.0f;
-	ZoneArray[0].level = LEVEL_NONE;
 
 	for(i = 0; i < NUMMAPZONES; i++){
 		memset(&MapZoneArray[i], 0, sizeof(CZone));
 		MapZoneArray[i].type = ZONE_MAPZONE;
 	}
-
 	TotalNumberOfMapZones = 1;
-
 	strcpy(MapZoneArray[0].name, "THEMAP");
-	MapZoneArray[0].minx = -4000.0f;
-	MapZoneArray[0].miny = -4000.0f;
+	MapZoneArray[0].minx = -2400.0f;
+	MapZoneArray[0].miny = -2000.0f;
 	MapZoneArray[0].minz = -500.0f;
-	MapZoneArray[0].maxx =  4000.0f;
-	MapZoneArray[0].maxy =  4000.0f;
+	MapZoneArray[0].maxx =  1600.0f;
+	MapZoneArray[0].maxy =  2000.0f;
 	MapZoneArray[0].maxz =  500.0f;
 	MapZoneArray[0].level = LEVEL_NONE;
 }
 
+//--MIAMI: done
 void
 CTheZones::Update(void)
 {
 	CVector pos;
 	pos = FindPlayerCoors();
-	m_pPlayersZone = FindSmallestZonePosition(&pos);
 	m_CurrLevel = GetLevelFromPosition(&pos);
 }
 
+//--MIAMI: done
 void
 CTheZones::CreateZone(char *name, eZoneType type,
 	              float minx, float miny, float minz,
 	              float maxx, float maxy, float maxz,
 	              eLevelName level)
 {
+	char tmpname[24];
 	char *p;
-	char tmpname[8];
 
 	if(minx > maxx) SWAPF(minx, maxx);
 	if(miny > maxy) SWAPF(miny, maxy);
@@ -144,73 +149,94 @@ CTheZones::CreateZone(char *name, eZoneType type,
 	// make upper case
 	for(p = name; *p; p++) if(islower(*p)) *p = toupper(*p);
 
-	// add zone
 	strncpy(tmpname, name, 7);
 	tmpname[7] = '\0';
-	strcpy(ZoneArray[TotalNumberOfZones].name, tmpname);
-	ZoneArray[TotalNumberOfZones].type = type;
-	ZoneArray[TotalNumberOfZones].minx = minx;
-	ZoneArray[TotalNumberOfZones].miny = miny;
-	ZoneArray[TotalNumberOfZones].minz = minz;
-	ZoneArray[TotalNumberOfZones].maxx = maxx;
-	ZoneArray[TotalNumberOfZones].maxy = maxy;
-	ZoneArray[TotalNumberOfZones].maxz = maxz;
-	ZoneArray[TotalNumberOfZones].level = level;
-	if(IsNormalZone(type)){
-		ZoneArray[TotalNumberOfZones].zoneinfoDay = TotalNumberOfZoneInfos++;
-		ZoneArray[TotalNumberOfZones].zoneinfoNight = TotalNumberOfZoneInfos++;
-	}
-	TotalNumberOfZones++;
-}
-
-void
-CTheZones::CreateMapZone(char *name, eZoneType type,
-	                 float minx, float miny, float minz,
-	                 float maxx, float maxy, float maxz,
-	                 eLevelName level)
-{
-	CZone *zone;
-	char *p;
-
-	if(minx > maxx) SWAPF(minx, maxx);
-	if(miny > maxy) SWAPF(miny, maxy);
-	if(minz > maxz) SWAPF(minz, maxz);
-
-	// make upper case
-	for(p = name; *p; p++) if(islower(*p)) *p = toupper(*p);
 
 	// add zone
-	zone = &MapZoneArray[TotalNumberOfMapZones++];
-	strncpy(zone->name, name, 7);
-	zone->name[7] = '\0';
-	zone->type = type;
-	zone->minx = minx;
-	zone->miny = miny;
-	zone->minz = minz;
-	zone->maxx = maxx;
-	zone->maxy = maxy;
-	zone->maxz = maxz;
-	zone->level = level;
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		assert(TotalNumberOfNavigationZones < NUMNAVIGZONES);
+		strcpy(NavigationZoneArray[TotalNumberOfNavigationZones].name, tmpname);
+		NavigationZoneArray[TotalNumberOfNavigationZones].type = type;
+		NavigationZoneArray[TotalNumberOfNavigationZones].minx = minx;
+		NavigationZoneArray[TotalNumberOfNavigationZones].miny = miny;
+		NavigationZoneArray[TotalNumberOfNavigationZones].minz = minz;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxx = maxx;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxy = maxy;
+		NavigationZoneArray[TotalNumberOfNavigationZones].maxz = maxz;
+		NavigationZoneArray[TotalNumberOfNavigationZones].level = level;
+		TotalNumberOfNavigationZones++;
+		break;
+	case ZONE_INFO:
+		assert(TotalNumberOfInfoZones < NUMINFOZONES);
+		strcpy(InfoZoneArray[TotalNumberOfInfoZones].name, tmpname);
+		InfoZoneArray[TotalNumberOfInfoZones].type = type;
+		InfoZoneArray[TotalNumberOfInfoZones].minx = minx;
+		InfoZoneArray[TotalNumberOfInfoZones].miny = miny;
+		InfoZoneArray[TotalNumberOfInfoZones].minz = minz;
+		InfoZoneArray[TotalNumberOfInfoZones].maxx = maxx;
+		InfoZoneArray[TotalNumberOfInfoZones].maxy = maxy;
+		InfoZoneArray[TotalNumberOfInfoZones].maxz = maxz;
+		InfoZoneArray[TotalNumberOfInfoZones].level = level;
+		InfoZoneArray[TotalNumberOfInfoZones].zoneinfoDay = TotalNumberOfZoneInfos++;
+		InfoZoneArray[TotalNumberOfInfoZones].zoneinfoNight = TotalNumberOfZoneInfos++;
+		TotalNumberOfInfoZones++;
+		break;
+	case ZONE_MAPZONE:
+		assert(TotalNumberOfMapZones < NUMMAPZONES);
+		strcpy(MapZoneArray[TotalNumberOfMapZones].name, tmpname);
+		MapZoneArray[TotalNumberOfMapZones].type = type;
+		MapZoneArray[TotalNumberOfMapZones].minx = minx;
+		MapZoneArray[TotalNumberOfMapZones].miny = miny;
+		MapZoneArray[TotalNumberOfMapZones].minz = minz;
+		MapZoneArray[TotalNumberOfMapZones].maxx = maxx;
+		MapZoneArray[TotalNumberOfMapZones].maxy = maxy;
+		MapZoneArray[TotalNumberOfMapZones].maxz = maxz;
+		MapZoneArray[TotalNumberOfMapZones].level = level;
+		TotalNumberOfMapZones++;
+		break;
+	}
 }
 
+//--MIAMI: done
 void
 CTheZones::PostZoneCreation(void)
 {
 	int i;
-	for(i = 1; i < TotalNumberOfZones; i++)
-		InsertZoneIntoZoneHierarchy(&ZoneArray[i]);
+	for(i = 1; i < TotalNumberOfNavigationZones; i++)
+		InsertZoneIntoZoneHierarchy(&NavigationZoneArray[i]);
 	InitialiseAudioZoneArray();
 }
 
+//--MIAMI: done, but does nothing
+void
+CTheZones::CheckZonesForOverlap(void)
+{
+	int i, j;
+	char str[116];
+
+	for(i = 1; i < TotalNumberOfInfoZones; i++){
+		ZoneIsEntirelyContainedWithinOtherZone(&InfoZoneArray[i], &InfoZoneArray[0]);
+		
+		for(j = 1; j < TotalNumberOfInfoZones; j++)
+			if(i != j && ZoneIsEntirelyContainedWithinOtherZone(&InfoZoneArray[i], &InfoZoneArray[j]))
+				sprintf(str, "Info zone %s contains %s\n",
+						&InfoZoneArray[j].name, &InfoZoneArray[i].name);
+	}
+}
+
+//--MIAMI: done
 void
 CTheZones::InsertZoneIntoZoneHierarchy(CZone *zone)
 {
 	zone->child = nil;
 	zone->parent = nil;
 	zone->next = nil;
-	InsertZoneIntoZoneHierRecursive(zone, &ZoneArray[0]);
+	InsertZoneIntoZoneHierRecursive(zone, &NavigationZoneArray[0]);
 }
 
+//--MIAMI: done
 bool
 CTheZones::InsertZoneIntoZoneHierRecursive(CZone *inner, CZone *outer)
 {
@@ -254,6 +280,7 @@ CTheZones::InsertZoneIntoZoneHierRecursive(CZone *inner, CZone *outer)
 	return true;
 }
 
+//--MIAMI: done
 bool
 CTheZones::ZoneIsEntirelyContainedWithinOtherZone(CZone *inner, CZone *outer)
 {
@@ -278,6 +305,7 @@ CTheZones::ZoneIsEntirelyContainedWithinOtherZone(CZone *inner, CZone *outer)
 	return true;
 }
 
+//--MIAMI: done
 bool
 CTheZones::PointLiesWithinZone(const CVector *v, CZone *zone)
 {
@@ -286,6 +314,7 @@ CTheZones::PointLiesWithinZone(const CVector *v, CZone *zone)
 	       zone->minz <= v->z && v->z <= zone->maxz;
 }
 
+//--MIAMI: done
 eLevelName
 CTheZones::GetLevelFromPosition(CVector const *v)
 {
@@ -299,35 +328,35 @@ CTheZones::GetLevelFromPosition(CVector const *v)
 	return MapZoneArray[0].level;
 }
 
+//--MIAMI: done
 CZone*
-CTheZones::FindSmallestZonePosition(const CVector *v)
+CTheZones::FindInformationZoneForPosition(const CVector *v)
 {
-	CZone *best = &ZoneArray[0];
-	// zone to test next
-	CZone *zone = ZoneArray[0].child;
-	while(zone)
-		// if in zone, descent into children
-		if(PointLiesWithinZone(v, zone)){
-			best = zone;
-			zone = zone->child;
-		// otherwise try next zone
-		}else
-			zone = zone->next;
-	return best;
+	int i;
+//	char tmp[116];
+//	if(!PointLiesWithinZone(v, &InfoZoneArray[0]))
+//		sprintf(tmp, "x = %.3f y= %.3f z = %.3f\n", v.x, v.y, v.z);
+	for(i = 1; i < TotalNumberOfInfoZones; i++)
+		if(PointLiesWithinZone(v, &InfoZoneArray[i]))
+			return &InfoZoneArray[i];
+	return &InfoZoneArray[0];
 }
 
+//--MIAMI: done
 CZone*
-CTheZones::FindSmallestZonePositionType(const CVector *v, eZoneType type)
+CTheZones::FindSmallestNavigationZoneForPosition(const CVector *v, bool findDefault, bool findNavig)
 {
 	CZone *best = nil;
-	if(ZoneArray[0].type == type)
-		best = &ZoneArray[0];
+	if(findDefault && NavigationZoneArray[0].type == ZONE_DEFAULT ||
+	   findNavig && NavigationZoneArray[0].type == ZONE_NAVIG)
+		best = &NavigationZoneArray[0];
 	// zone to test next
-	CZone *zone = ZoneArray[0].child;
+	CZone *zone = NavigationZoneArray[0].child;
 	while(zone)
 		// if in zone, descent into children
 		if(PointLiesWithinZone(v, zone)){
-			if(zone->type == type)
+			if(findDefault && zone->type == ZONE_DEFAULT ||
+			   findNavig && zone->type == ZONE_NAVIG)
 				best = zone;
 			zone = zone->child;
 		// otherwise try next zone
@@ -336,43 +365,73 @@ CTheZones::FindSmallestZonePositionType(const CVector *v, eZoneType type)
 	return best;
 }
 
-CZone*
-CTheZones::FindSmallestZonePositionILN(const CVector *v)
+//--MIAMI: done
+int16
+CTheZones::FindZoneByLabelAndReturnIndex(char *name, eZoneType type)
 {
-	CZone *best = nil;
-	if(IsNormalZone(ZoneArray[0].type))
-		best = &ZoneArray[0];
-	// zone to test next
-	CZone *zone = ZoneArray[0].child;
-	while(zone)
-		// if in zone, descent into children
-		if(PointLiesWithinZone(v, zone)){
-			if(IsNormalZone(zone->type))
-				best = zone;
-			zone = zone->child;
-		// otherwise try next zone
-		}else
-			zone = zone->next;
-	return best;
+	char str[8];
+	memset(str, 0, 8);
+	strncpy(str, name, 8);
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		for(FindIndex = 0; FindIndex < TotalNumberOfNavigationZones; FindIndex++)
+			if(strcmp(GetNavigationZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_INFO:
+		for(FindIndex = 0; FindIndex < TotalNumberOfInfoZones; FindIndex++)
+			if(strcmp(GetInfoZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_MAPZONE:
+		for(FindIndex = 0; FindIndex < TotalNumberOfMapZones; FindIndex++)
+			if(strcmp(GetMapZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+	}
+	return -1;
 }
 
+//--MIAMI: done
 int16
-CTheZones::FindZoneByLabelAndReturnIndex(Const char *name)
+CTheZones::FindNextZoneByLabelAndReturnIndex(char *name, eZoneType type)
 {
 	char str[8];
+	++FindIndex;
 	memset(str, 0, 8);
 	strncpy(str, name, 8);
-	for(FindIndex = 0; FindIndex < TotalNumberOfZones; FindIndex++)
-		if(strcmp(GetZone(FindIndex)->name, name) == 0)
-			return FindIndex;
+	switch(type){
+	case ZONE_DEFAULT:
+	case ZONE_NAVIG:
+		for(; FindIndex < TotalNumberOfNavigationZones; FindIndex++)
+			if(strcmp(GetNavigationZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_INFO:
+		for(; FindIndex < TotalNumberOfInfoZones; FindIndex++)
+			if(strcmp(GetInfoZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+
+	case ZONE_MAPZONE:
+		for(; FindIndex < TotalNumberOfMapZones; FindIndex++)
+			if(strcmp(GetMapZone(FindIndex)->name, name) == 0)
+				return FindIndex;
+		break;
+	}
 	return -1;
 }
 
+//--MIAMI: done
 CZoneInfo*
 CTheZones::GetZoneInfo(const CVector *v, uint8 day)
 {
 	CZone *zone;
-	zone = FindSmallestZonePositionILN(v);
+	zone = FindInformationZoneForPosition(v);
 	if(zone == nil)
 		return &ZoneInfoArray[0];
 	return &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
@@ -383,6 +442,7 @@ CTheZones::GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info)
 {
 	CZoneInfo *day, *night;
 	float d, n;
+	int i;
 
 	day = GetZoneInfo(pos, 1);
 	night = GetZoneInfo(pos, 0);
@@ -402,109 +462,60 @@ CTheZones::GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info)
 			n = 1.0f - d;
 		}
 		info->carDensity = day->carDensity * d + night->carDensity * n;
-		info->carThreshold[0] = day->carThreshold[0] * d + night->carThreshold[0] * n;
-		info->carThreshold[1] = day->carThreshold[1] * d + night->carThreshold[1] * n;
-		info->carThreshold[2] = day->carThreshold[2] * d + night->carThreshold[2] * n;
-		info->carThreshold[3] = day->carThreshold[3] * d + night->carThreshold[3] * n;
-		info->carThreshold[4] = day->carThreshold[4] * d + night->carThreshold[4] * n;
-		info->carThreshold[5] = day->carThreshold[5] * d + night->carThreshold[5] * n;
-		info->copThreshold = day->copThreshold * d + night->copThreshold * n;
-		info->gangThreshold[0] = day->gangThreshold[0] * d + night->gangThreshold[0] * n;
-		info->gangThreshold[1] = day->gangThreshold[1] * d + night->gangThreshold[1] * n;
-		info->gangThreshold[2] = day->gangThreshold[2] * d + night->gangThreshold[2] * n;
-		info->gangThreshold[3] = day->gangThreshold[3] * d + night->gangThreshold[3] * n;
-		info->gangThreshold[4] = day->gangThreshold[4] * d + night->gangThreshold[4] * n;
-		info->gangThreshold[5] = day->gangThreshold[5] * d + night->gangThreshold[5] * n;
-		info->gangThreshold[6] = day->gangThreshold[6] * d + night->gangThreshold[6] * n;
-		info->gangThreshold[7] = day->gangThreshold[7] * d + night->gangThreshold[7] * n;
-		info->gangThreshold[8] = day->gangThreshold[8] * d + night->gangThreshold[8] * n;
+		for(i = 0; i < ARRAY_SIZE(info->carThreshold); i++)
+			info->carThreshold[i] = day->carThreshold[i] * d + night->carThreshold[i] * n;
+		for(i = 0; i < ARRAY_SIZE(info->boatThreshold); i++)
+			info->boatThreshold[i] = day->boatThreshold[i] * d + night->boatThreshold[i] * n;
+		for(i = 0; i < ARRAY_SIZE(info->gangThreshold); i++)
+			info->gangThreshold[i] = day->gangThreshold[i] * d + night->gangThreshold[i] * n;
 
+		info->copThreshold = day->copThreshold * d + night->copThreshold * n;
 		info->pedDensity = day->pedDensity * d + night->pedDensity * n;
-		info->copDensity = day->copDensity * d + night->copDensity * n;
-		info->gangDensity[0] = day->gangDensity[0] * d + night->gangDensity[0] * n;
-		info->gangDensity[1] = day->gangDensity[1] * d + night->gangDensity[1] * n;
-		info->gangDensity[2] = day->gangDensity[2] * d + night->gangDensity[2] * n;
-		info->gangDensity[3] = day->gangDensity[3] * d + night->gangDensity[3] * n;
-		info->gangDensity[4] = day->gangDensity[4] * d + night->gangDensity[4] * n;
-		info->gangDensity[5] = day->gangDensity[5] * d + night->gangDensity[5] * n;
-		info->gangDensity[6] = day->gangDensity[6] * d + night->gangDensity[6] * n;
-		info->gangDensity[7] = day->gangDensity[7] * d + night->gangDensity[7] * n;
-		info->gangDensity[8] = day->gangDensity[8] * d + night->gangDensity[8] * n;
+		info->copPedThreshold = day->copPedThreshold * d + night->copPedThreshold * n;
+		for(i = 0; i < ARRAY_SIZE(info->gangPedThreshold); i++)
+			info->gangPedThreshold[i] = day->gangPedThreshold[i] * d + night->gangPedThreshold[i] * n;
 	}
 	if(CClock::GetIsTimeInRange(5, 19))
 		info->pedGroup = day->pedGroup;
 	else
 		info->pedGroup = night->pedGroup;
-
-	CheckZoneInfo(info);
 }
 
 void
 CTheZones::SetZoneCarInfo(uint16 zoneid, uint8 day, int16 carDensity,
-	int16 gang0Num, int16 gang1Num, int16 gang2Num,
-	int16 gang3Num, int16 gang4Num, int16 gang5Num,
-	int16 gang6Num, int16 gang7Num, int16 gang8Num,
-	int16 copNum,
-	int16 car0Num, int16 car1Num, int16 car2Num,
-	int16 car3Num, int16 car4Num, int16 car5Num)
+	int16 copCarDensity, const int16 *gangCarDensities)
 {
 	CZone *zone;
 	CZoneInfo *info;
-	zone = GetZone(zoneid);
+	zone = GetInfoZone(zoneid);
 	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
 
-	CheckZoneInfo(info);
-
-	if(carDensity != -1) info->carDensity = carDensity;
-	int16 oldCar1Num = info->carThreshold[1] - info->carThreshold[0];
-	int16 oldCar2Num = info->carThreshold[2] - info->carThreshold[1];
-	int16 oldCar3Num = info->carThreshold[3] - info->carThreshold[2];
-	int16 oldCar4Num = info->carThreshold[4] - info->carThreshold[3];
-	int16 oldCar5Num = info->carThreshold[5] - info->carThreshold[4];
-	int16 oldCopNum = info->copThreshold - info->carThreshold[5];
-	int16 oldGang0Num = info->gangThreshold[0] - info->copThreshold;
-	int16 oldGang1Num = info->gangThreshold[1] - info->gangThreshold[0];
-	int16 oldGang2Num = info->gangThreshold[2] - info->gangThreshold[1];
-	int16 oldGang3Num = info->gangThreshold[3] - info->gangThreshold[2];
-	int16 oldGang4Num = info->gangThreshold[4] - info->gangThreshold[3];
-	int16 oldGang5Num = info->gangThreshold[5] - info->gangThreshold[4];
-	int16 oldGang6Num = info->gangThreshold[6] - info->gangThreshold[5];
-	int16 oldGang7Num = info->gangThreshold[7] - info->gangThreshold[6];
-	int16 oldGang8Num = info->gangThreshold[8] - info->gangThreshold[7];
-
-	if(car0Num != -1) info->carThreshold[0] = car0Num;
-	if(car1Num != -1) info->carThreshold[1] = info->carThreshold[0] + car1Num;
-	else              info->carThreshold[1] = info->carThreshold[0] + oldCar1Num;
-	if(car2Num != -1) info->carThreshold[2] = info->carThreshold[1] + car2Num;
-	else              info->carThreshold[2] = info->carThreshold[1] + oldCar2Num;
-	if(car3Num != -1) info->carThreshold[3] = info->carThreshold[2] + car3Num;
-	else              info->carThreshold[3] = info->carThreshold[2] + oldCar3Num;
-	if(car4Num != -1) info->carThreshold[4] = info->carThreshold[3] + car4Num;
-	else              info->carThreshold[4] = info->carThreshold[3] + oldCar4Num;
-	if(car5Num != -1) info->carThreshold[5] = info->carThreshold[4] + car5Num;
-	else              info->carThreshold[5] = info->carThreshold[4] + oldCar5Num;
-	if(copNum != -1) info->copThreshold = info->carThreshold[5] + copNum;
-	else             info->copThreshold = info->carThreshold[5] + oldCopNum;
-	if(gang0Num != -1) info->gangThreshold[0] = info->copThreshold + gang0Num;
-	else               info->gangThreshold[0] = info->copThreshold + oldGang0Num;
-	if(gang1Num != -1) info->gangThreshold[1] = info->gangThreshold[0] + gang1Num;
-	else               info->gangThreshold[1] = info->gangThreshold[0] + oldGang1Num;
-	if(gang2Num != -1) info->gangThreshold[2] = info->gangThreshold[1] + gang2Num;
-	else               info->gangThreshold[2] = info->gangThreshold[1] + oldGang2Num;
-	if(gang3Num != -1) info->gangThreshold[3] = info->gangThreshold[2] + gang3Num;
-	else               info->gangThreshold[3] = info->gangThreshold[2] + oldGang3Num;
-	if(gang4Num != -1) info->gangThreshold[4] = info->gangThreshold[3] + gang4Num;
-	else               info->gangThreshold[4] = info->gangThreshold[3] + oldGang4Num;
-	if(gang5Num != -1) info->gangThreshold[5] = info->gangThreshold[4] + gang5Num;
-	else               info->gangThreshold[5] = info->gangThreshold[4] + oldGang5Num;
-	if(gang6Num != -1) info->gangThreshold[6] = info->gangThreshold[5] + gang6Num;
-	else               info->gangThreshold[6] = info->gangThreshold[5] + oldGang6Num;
-	if(gang7Num != -1) info->gangThreshold[7] = info->gangThreshold[6] + gang7Num;
-	else               info->gangThreshold[7] = info->gangThreshold[6] + oldGang7Num;
-	if(gang8Num != -1) info->gangThreshold[8] = info->gangThreshold[7] + gang8Num;
-	else               info->gangThreshold[8] = info->gangThreshold[7] + oldGang8Num;
-
-	CheckZoneInfo(info);
+	info->carDensity = carDensity;
+	info->copThreshold = copCarDensity;
+	info->gangThreshold[0] = gangCarDensities[0] + copCarDensity;
+	info->gangThreshold[1] = gangCarDensities[1] + info->gangThreshold[0];
+	info->gangThreshold[2] = gangCarDensities[2] + info->gangThreshold[1];
+	info->gangThreshold[3] = gangCarDensities[3] + info->gangThreshold[2];
+	info->gangThreshold[4] = gangCarDensities[4] + info->gangThreshold[3];
+	info->gangThreshold[5] = gangCarDensities[5] + info->gangThreshold[4];
+	info->gangThreshold[6] = gangCarDensities[6] + info->gangThreshold[5];
+	info->gangThreshold[7] = gangCarDensities[7] + info->gangThreshold[6];
+	info->gangThreshold[8] = gangCarDensities[8] + info->gangThreshold[7];
+}
+
+void CTheZones::SetZoneCivilianCarInfo(uint16 zoneid, uint8 day,
+	const int16* carDensities, const int16* boatDensities)
+{
+	CZone* zone;
+	CZoneInfo* info;
+	zone = GetInfoZone(zoneid);
+	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
+	info->carThreshold[0] = carDensities[0];
+	for (int i = 1; i < CCarCtrl::NUM_CAR_CLASSES; i++)
+		info->carThreshold[i] = carDensities[i] + info->carThreshold[i-1];
+	info->boatThreshold[0] = boatDensities[0];
+	for (int i = 1; i < CCarCtrl::NUM_BOAT_CLASSES; i++)
+		info->boatThreshold[i] = boatDensities[i] + info->boatThreshold[i - 1];
 }
 
 void
@@ -515,48 +526,59 @@ CTheZones::SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity,
 {
 	CZone *zone;
 	CZoneInfo *info;
-	zone = GetZone(zoneid);
+	zone = GetInfoZone(zoneid);
 	info = &ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight];
-	if(pedDensity != -1) info->pedDensity = pedDensity;
-	if(copDensity != -1) info->copDensity = copDensity;
-	if(gang0Density != -1) info->gangDensity[0] = gang0Density;
-	if(gang1Density != -1) info->gangDensity[1] = gang1Density;
-	if(gang2Density != -1) info->gangDensity[2] = gang2Density;
-	if(gang3Density != -1) info->gangDensity[3] = gang3Density;
-	if(gang4Density != -1) info->gangDensity[4] = gang4Density;
-	if(gang5Density != -1) info->gangDensity[5] = gang5Density;
-	if(gang6Density != -1) info->gangDensity[6] = gang6Density;
-	if(gang7Density != -1) info->gangDensity[7] = gang7Density;
-	if(gang8Density != -1) info->gangDensity[8] = gang8Density;
+	info->pedDensity = pedDensity;
+	info->copPedThreshold = copDensity;
+	info->gangPedThreshold[0] = gang0Density;
+	info->gangPedThreshold[1] = gang1Density;
+	info->gangPedThreshold[2] = gang2Density;
+	info->gangPedThreshold[3] = gang3Density;
+	info->gangPedThreshold[4] = gang4Density;
+	info->gangPedThreshold[5] = gang5Density;
+	info->gangPedThreshold[6] = gang6Density;
+	info->gangPedThreshold[7] = gang7Density;
+	info->gangPedThreshold[8] = gang8Density;
+
+	info->gangPedThreshold[0] += info->copPedThreshold;
+	info->gangPedThreshold[1] = info->gangPedThreshold[0];
+	info->gangPedThreshold[2] = info->gangPedThreshold[1];
+	info->gangPedThreshold[3] = info->gangPedThreshold[2];
+	info->gangPedThreshold[4] = info->gangPedThreshold[3];
+	info->gangPedThreshold[5] = info->gangPedThreshold[4];
+	info->gangPedThreshold[6] = info->gangPedThreshold[5];
+	info->gangPedThreshold[7] = info->gangPedThreshold[6];
+	info->gangPedThreshold[8] = info->gangPedThreshold[7];
 }
 
+//--MIAMI: done, unused
 void
 CTheZones::SetCarDensity(uint16 zoneid, uint8 day, uint16 cardensity)
 {
 	CZone *zone;
-	zone = GetZone(zoneid);
-	if(IsNormalZone(zone->type))
-		ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].carDensity = cardensity;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].carDensity = cardensity;
 }
 
+//--MIAMI: done, unused
 void
 CTheZones::SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity)
 {
 	CZone *zone;
-	zone = GetZone(zoneid);
-	if(IsNormalZone(zone->type))
-		ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedDensity = peddensity;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedDensity = peddensity;
 }
 
+//--MIAMI: done
 void
 CTheZones::SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup)
 {
 	CZone *zone;
-	zone = GetZone(zoneid);
-	if(IsNormalZone(zone->type))
-		ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedGroup = pedgroup;
+	zone = GetInfoZone(zoneid);
+	ZoneInfoArray[day ? zone->zoneinfoDay : zone->zoneinfoNight].pedGroup = pedgroup;
 }
 
+//--MIAMI: done
 int16
 CTheZones::FindAudioZone(CVector *pos)
 {
@@ -568,18 +590,7 @@ CTheZones::FindAudioZone(CVector *pos)
 	return -1;
 }
 
-eLevelName
-CTheZones::FindZoneForPoint(const CVector &pos)
-{
-	if(PointLiesWithinZone(&pos, GetZone(FindZoneByLabelAndReturnIndex("IND_ZON"))))
-		return LEVEL_INDUSTRIAL;
-	if(PointLiesWithinZone(&pos, GetZone(FindZoneByLabelAndReturnIndex("COM_ZON"))))
-		return LEVEL_COMMERCIAL;
-	if(PointLiesWithinZone(&pos, GetZone(FindZoneByLabelAndReturnIndex("SUB_ZON"))))
-		return LEVEL_SUBURBAN;
-	return LEVEL_NONE;
-}
-
+//--MIAMI: done
 void
 CTheZones::AddZoneToAudioZoneArray(CZone *zone)
 {
@@ -590,12 +601,14 @@ CTheZones::AddZoneToAudioZoneArray(CZone *zone)
 
 	/* This is a bit stupid */
 	z = -1;
-	for(i = 0; i < NUMZONES; i++)
-		if(&ZoneArray[i] == zone)
+	for(i = 0; i < NUMNAVIGZONES; i++)
+		if(&NavigationZoneArray[i] == zone)
 			z = i;
+	assert(NumberOfAudioZones < NUMAUDIOZONES);
 	AudioZoneArray[NumberOfAudioZones++] = z;
 }
 
+//--MIAMI: done
 void
 CTheZones::InitialiseAudioZoneArray(void)
 {
@@ -603,7 +616,7 @@ CTheZones::InitialiseAudioZoneArray(void)
 	CZone *zone;
 
 	gonext = false;
-	zone = &ZoneArray[0];
+	zone = &NavigationZoneArray[0];
 	// Go deep first,
 	// set gonext when backing up a level to visit the next child
 	while(zone)
@@ -627,6 +640,7 @@ CTheZones::InitialiseAudioZoneArray(void)
 		}
 }
 
+//--MIAMI: TODO
 void
 CTheZones::SaveAllZones(uint8 *buffer, uint32 *size)
 {
@@ -634,32 +648,39 @@ CTheZones::SaveAllZones(uint8 *buffer, uint32 *size)
 	int i;
 
 	*size = SAVE_HEADER_SIZE
-		+ sizeof(int32) // GetIndexForZonePointer
 		+ sizeof(m_CurrLevel) + sizeof(FindIndex)
 		+ sizeof(int16) // padding
-		+ sizeof(ZoneArray) + sizeof(ZoneInfoArray)
-		+ sizeof(TotalNumberOfZones) + sizeof(TotalNumberOfZoneInfos)
+		+ sizeof(NavigationZoneArray) + sizeof(InfoZoneArray) + sizeof(ZoneInfoArray)
+		+ sizeof(TotalNumberOfNavigationZones) + sizeof(TotalNumberOfInfoZones) + sizeof(TotalNumberOfZoneInfos)
 		+ sizeof(MapZoneArray) + sizeof(AudioZoneArray)
 		+ sizeof(TotalNumberOfMapZones) + sizeof(NumberOfAudioZones);
 
 	WriteSaveHeader(buffer, 'Z', 'N', 'S', '\0', *size - SAVE_HEADER_SIZE);
 
-	WriteSaveBuf(buffer, GetIndexForZonePointer(m_pPlayersZone));
 	WriteSaveBuf(buffer, m_CurrLevel);
 	WriteSaveBuf(buffer, FindIndex);
 	WriteSaveBuf(buffer, (int16)0); // padding
 
-	for(i = 0; i < ARRAY_SIZE(ZoneArray); i++){
-		CZone *zone = WriteSaveBuf(buffer, ZoneArray[i]);
-		zone->child = (CZone*)GetIndexForZonePointer(ZoneArray[i].child);
-		zone->parent = (CZone*)GetIndexForZonePointer(ZoneArray[i].parent);
-		zone->next = (CZone*)GetIndexForZonePointer(ZoneArray[i].next);
+// TODO(MIAMI): implement SaveOneZone
+	for(i = 0; i < ARRAY_SIZE(NavigationZoneArray); i++){
+		CZone *zone = WriteSaveBuf(buffer, NavigationZoneArray[i]);
+		zone->child = (CZone*)GetIndexForZonePointer(NavigationZoneArray[i].child);
+		zone->parent = (CZone*)GetIndexForZonePointer(NavigationZoneArray[i].parent);
+		zone->next = (CZone*)GetIndexForZonePointer(NavigationZoneArray[i].next);
+	}
+
+	for(i = 0; i < ARRAY_SIZE(InfoZoneArray); i++){
+		CZone *zone = WriteSaveBuf(buffer, InfoZoneArray[i]);
+		zone->child = (CZone*)GetIndexForZonePointer(InfoZoneArray[i].child);
+		zone->parent = (CZone*)GetIndexForZonePointer(InfoZoneArray[i].parent);
+		zone->next = (CZone*)GetIndexForZonePointer(InfoZoneArray[i].next);
 	}
 
 	for(i = 0; i < ARRAY_SIZE(ZoneInfoArray); i++)
 		WriteSaveBuf(buffer, ZoneInfoArray[i]);
 
-	WriteSaveBuf(buffer, TotalNumberOfZones);
+	WriteSaveBuf(buffer, TotalNumberOfNavigationZones);
+	WriteSaveBuf(buffer, TotalNumberOfInfoZones);
 	WriteSaveBuf(buffer, TotalNumberOfZoneInfos);
 
 	for(i = 0; i < ARRAY_SIZE(MapZoneArray); i++) {
@@ -687,6 +708,7 @@ CTheZones::SaveAllZones(uint8 *buffer, uint32 *size)
 	VALIDATESAVEBUF(*size)
 }
 
+//--MIAMI: TODO
 void
 CTheZones::LoadAllZones(uint8 *buffer, uint32 size)
 {
@@ -695,23 +717,32 @@ CTheZones::LoadAllZones(uint8 *buffer, uint32 size)
 
 	CheckSaveHeader(buffer, 'Z', 'N', 'S', '\0', size - SAVE_HEADER_SIZE);
 
-	m_pPlayersZone = GetPointerForZoneIndex(ReadSaveBuf<int32>(buffer));
 	m_CurrLevel = ReadSaveBuf<eLevelName>(buffer);
 	FindIndex = ReadSaveBuf<int16>(buffer);
 	ReadSaveBuf<int16>(buffer);
 
-	for(i = 0; i < ARRAY_SIZE(ZoneArray); i++){
-		ZoneArray[i] = ReadSaveBuf<CZone>(buffer);
+// TODO(MIAMI): implement LoadOneZone
+	for(i = 0; i < ARRAY_SIZE(NavigationZoneArray); i++){
+		NavigationZoneArray[i] = ReadSaveBuf<CZone>(buffer);
+
+		NavigationZoneArray[i].child = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].child);
+		NavigationZoneArray[i].parent = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].parent);
+		NavigationZoneArray[i].next = GetPointerForZoneIndex((uintptr)NavigationZoneArray[i].next);
+	}
+
+	for(i = 0; i < ARRAY_SIZE(InfoZoneArray); i++){
+		InfoZoneArray[i] = ReadSaveBuf<CZone>(buffer);
 
-		ZoneArray[i].child = GetPointerForZoneIndex((uintptr)ZoneArray[i].child);
-		ZoneArray[i].parent = GetPointerForZoneIndex((uintptr)ZoneArray[i].parent);
-		ZoneArray[i].next = GetPointerForZoneIndex((uintptr)ZoneArray[i].next);
+		InfoZoneArray[i].child = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].child);
+		InfoZoneArray[i].parent = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].parent);
+		InfoZoneArray[i].next = GetPointerForZoneIndex((uintptr)InfoZoneArray[i].next);
 	}
 
 	for(i = 0; i < ARRAY_SIZE(ZoneInfoArray); i++)
 		ZoneInfoArray[i] = ReadSaveBuf<CZoneInfo>(buffer);
 
-	TotalNumberOfZones = ReadSaveBuf<int16>(buffer);
+	TotalNumberOfNavigationZones = ReadSaveBuf<int16>(buffer);
+	TotalNumberOfInfoZones = ReadSaveBuf<int16>(buffer);
 	TotalNumberOfZoneInfos = ReadSaveBuf<int16>(buffer);
 
 	for(i = 0; i < ARRAY_SIZE(MapZoneArray); i++){
diff --git a/src/core/Zones.h b/src/core/Zones.h
index 6549dad5..8d5af182 100644
--- a/src/core/Zones.h
+++ b/src/core/Zones.h
@@ -2,6 +2,7 @@
 
 #include "Game.h"
 #include "Gangs.h"
+#include "CarCtrl.h"
 
 enum eZoneType
 {
@@ -37,31 +38,33 @@ class CZoneInfo
 public:
 	// Car data
 	int16 carDensity;
-	int16 carThreshold[6];
-	int16 copThreshold;
+	int16 carThreshold[CCarCtrl::NUM_CAR_CLASSES];
+	int16 boatThreshold[CCarCtrl::NUM_BOAT_CLASSES];
 	int16 gangThreshold[NUM_GANGS];
+	int16 copThreshold;
 
 	// Ped data
 	uint16 pedDensity;
-	uint16 copDensity;
-	uint16 gangDensity[NUM_GANGS];
+	uint16 gangPedThreshold[NUM_GANGS];
+	uint16 copPedThreshold;
 	uint16 pedGroup;
 };
 
 
 class CTheZones
 {
-	static CZone *m_pPlayersZone;
 	static int16 FindIndex;
 
 	static uint16 NumberOfAudioZones;
 	static int16 AudioZoneArray[NUMAUDIOZONES];
 	static uint16 TotalNumberOfMapZones;
-	static uint16 TotalNumberOfZones;
-	static CZone ZoneArray[NUMZONES];
+	static uint16 TotalNumberOfInfoZones;
+	static uint16 TotalNumberOfNavigationZones;
+	static CZone InfoZoneArray[NUMINFOZONES];
 	static CZone MapZoneArray[NUMMAPZONES];
+	static CZone NavigationZoneArray[NUMNAVIGZONES];
 	static uint16 TotalNumberOfZoneInfos;
-	static CZoneInfo ZoneInfoArray[2*NUMZONES];
+	static CZoneInfo ZoneInfoArray[2*NUMINFOZONES];
 public:
 	static eLevelName m_CurrLevel;
 
@@ -71,31 +74,27 @@ public:
 	                       float minx, float miny, float minz,
 	                       float maxx, float maxy, float maxz,
 	                       eLevelName level);
-	static void CreateMapZone(char *name, eZoneType type,
-	                          float minx, float miny, float minz,
-	                          float maxx, float maxy, float maxz,
-	                          eLevelName level);
-	static CZone *GetZone(uint16 i) { return &ZoneArray[i]; }
-	static CZone *GetAudioZone(uint16 i) { return &ZoneArray[AudioZoneArray[i]]; }
+	static CZone *GetInfoZone(uint16 i) { return &InfoZoneArray[i]; }
+	static CZone *GetNavigationZone(uint16 i) { return &NavigationZoneArray[i]; }
+	static CZone *GetMapZone(uint16 i) { return &MapZoneArray[i]; }
+	static CZone *GetAudioZone(uint16 i) { return &InfoZoneArray[AudioZoneArray[i]]; }
 	static void PostZoneCreation(void);
+	static void CheckZonesForOverlap(void);
 	static void InsertZoneIntoZoneHierarchy(CZone *zone);
 	static bool InsertZoneIntoZoneHierRecursive(CZone *z1, CZone *z2);
 	static bool ZoneIsEntirelyContainedWithinOtherZone(CZone *z1, CZone *z2);
 	static bool PointLiesWithinZone(const CVector *v, CZone *zone);
 	static eLevelName GetLevelFromPosition(const CVector *v);
-	static CZone *FindSmallestZonePosition(const CVector *v);
-	static CZone *FindSmallestZonePositionType(const CVector *v, eZoneType type);
-	static CZone *FindSmallestZonePositionILN(const CVector *v);
-	static int16 FindZoneByLabelAndReturnIndex(Const char *name);
+	static CZone *FindInformationZoneForPosition(const CVector *v);
+	static CZone *FindSmallestNavigationZoneForPosition(const CVector *v, bool findDefault, bool findNavig);
+	static int16 FindZoneByLabelAndReturnIndex(char *name, eZoneType type);
+	static int16 FindNextZoneByLabelAndReturnIndex(char *name, eZoneType type);
 	static CZoneInfo *GetZoneInfo(const CVector *v, uint8 day);
 	static void GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info);
 	static void SetZoneCarInfo(uint16 zoneid, uint8 day, int16 carDensity,
-		int16 gang0Num, int16 gang1Num, int16 gang2Num,
-		int16 gang3Num, int16 gang4Num, int16 gang5Num,
-		int16 gang6Num, int16 gang7Num, int16 gang8Num,
-		int16 copNum,
-		int16 car0Num, int16 car1Num, int16 car2Num,
-		int16 car3Num, int16 car4Num, int16 car5Num);
+		int16 copCarDensity, const int16 *gangCarDensities /*[NUMGANGS]*/);
+	static void SetZoneCivilianCarInfo(uint16 zoneid, uint8 day,
+		const int16* carDensities, const int16* boatDensities);
 	static void SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity,
 		int16 gang0Density, int16 gang1Density, int16 gang2Density, int16 gang3Density,
 		int16 gang4Density, int16 gang5Density, int16 gang6Density, int16 gang7Density,
@@ -104,9 +103,8 @@ public:
 	static void SetPedDensity(uint16 zoneid, uint8 day, uint16 peddensity);
 	static void SetPedGroup(uint16 zoneid, uint8 day, uint16 pedgroup);
 	static int16 FindAudioZone(CVector *pos);
-	static eLevelName FindZoneForPoint(const CVector &pos);
-	static CZone *GetPointerForZoneIndex(int32 i) { return i == -1 ? nil : &ZoneArray[i]; }
-	static int32 GetIndexForZonePointer(CZone *zone) { return zone == nil ? -1 : zone - ZoneArray; }
+	static CZone *GetPointerForZoneIndex(int32 i) { return i == -1 ? nil : &InfoZoneArray[i]; }
+	static int32 GetIndexForZonePointer(CZone *zone) { return zone == nil ? -1 : zone - InfoZoneArray; }
 	static void AddZoneToAudioZoneArray(CZone *zone);
 	static void InitialiseAudioZoneArray(void);
 	static void SaveAllZones(uint8 *buffer, uint32 *length);
diff --git a/src/core/common.h b/src/core/common.h
index ff1feb5c..eb43d8d5 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -187,6 +187,7 @@ public:
 
 #if (defined(_MSC_VER))
 extern int strcasecmp(const char *str1, const char *str2);
+extern int strncasecmp(const char *str1, const char *str2, size_t len);
 #endif
 
 #define clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
diff --git a/src/core/config.h b/src/core/config.h
index 837d8165..b0ef3f67 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -3,71 +3,74 @@
 enum Config {
 	NUMPLAYERS = 1,
 
-	NUMCDIMAGES = 12, // gta3.img duplicates (not used on PC)
+	NUMCDIMAGES = 6, // gta3.img duplicates (not used on PC)
 	MAX_CDIMAGES = 8, // additional cdimages
 	MAX_CDCHANNELS = 5,
 
-	MODELINFOSIZE = 5500,
-	TXDSTORESIZE = 850,
-	EXTRADIRSIZE = 128,
+	MODELINFOSIZE = 6500,
+	TXDSTORESIZE = 1385,
+	COLSTORESIZE = 31,
+	EXTRADIRSIZE = 256,
 	CUTSCENEDIRSIZE = 512,
 
-	SIMPLEMODELSIZE = 5000,
-	MLOMODELSIZE = 1,
-	MLOINSTANCESIZE = 1,
-	TIMEMODELSIZE = 30,
+	SIMPLEMODELSIZE = 3885,
+	TIMEMODELSIZE = 385,
 	CLUMPMODELSIZE = 5,
-	PEDMODELSIZE = 90,
-	VEHICLEMODELSIZE = 120,
-	XTRACOMPSMODELSIZE = 2,
-	TWODFXSIZE = 2000,
+	WEAPONMODELSIZE = 37,
+	PEDMODELSIZE = 130,
+	VEHICLEMODELSIZE = 110,
+	TWODFXSIZE = 1210,
 
 	MAXVEHICLESLOADED = 50, // 70 on mobile
 
-	NUMOBJECTINFO = 168, // object.dat
+	NUMOBJECTINFO = 400, // TODO(MIAMI): fantasy	// object.dat
 
 	// Pool sizes
-	NUMPTRNODES = 30000,  // 26000 on PS2
-	NUMENTRYINFOS = 5400, // 3200 on PS2
-	NUMPEDS = 140,        // 90 on PS2
-	NUMVEHICLES = 110,    // 70 on PS2
-	NUMBUILDINGS = 5500,  // 4915 on PS2
-	NUMTREADABLES = 1214,
-	NUMOBJECTS = 450,
-	NUMDUMMIES = 2802, // 2368 on PS2
-	NUMAUDIOSCRIPTOBJECTS = 256,
-	NUMCUTSCENEOBJECTS = 50,
-
-	NUMANIMBLOCKS = 2,
-	NUMANIMATIONS = 250,
-
-	NUMTEMPOBJECTS = 30,
+	NUMPTRNODES = 50000,
+	NUMENTRYINFOS = 5400, // only 3200 in VC???
+	NUMPEDS = 140,
+	NUMVEHICLES = 110,
+	NUMBUILDINGS = 7000,
+	NUMTREADABLES = 1214,	// 1 in VC
+	NUMOBJECTS = 460,
+	NUMDUMMIES = 2802, // 2340 in VC
+	NUMAUDIOSCRIPTOBJECTS = 256,	// 192 in VC
+	NUMCUTSCENEOBJECTS = 50,	// does not exist in VC
+	// TODO(MIAMI): colmodel pool
+
+	NUMANIMBLOCKS = 35,
+	NUMANIMATIONS = 450,
+
+	NUMTEMPOBJECTS = 40,
 
 	// Path data
-	NUM_PATHNODES = 4930,
-	NUM_CARPATHLINKS = 2076,
+	NUM_PATHNODES = 9650,
+	NUM_CARPATHLINKS = 3500,
 	NUM_MAPOBJECTS = 1250,
-	NUM_PATHCONNECTIONS = 10260,
+	NUM_PATHCONNECTIONS = 20400,
 
 	// Link list lengths
 	NUMALPHALIST = 20,
-	NUMALPHAENTITYLIST = 150,
+	NUMBOATALPHALIST = 20,
+	NUMALPHAENTITYLIST = 200,
+	NUMALPHAUNTERWATERENTITYLIST = 30,
 	NUMCOLCACHELINKS = 200,
 	NUMREFERENCES = 800,
 
 	// Zones
-	NUMAUDIOZONES = 36,
-	NUMZONES = 50,
-	NUMMAPZONES = 25,
+	NUMAUDIOZONES = 14,
+	NUMINFOZONES = 169,
+	NUMMAPZONES = 39,
+	NUMNAVIGZONES = 20,
 
 	// Cull zones
-	NUMCULLZONES = 512,
-	NUMATTRIBZONES = 288,
-	NUMZONEINDICES = 55000,
+	NUMATTRIBZONES = 704,
+
+	NUMOCCLUSIONVOLUMES = 350,
 
 	PATHNODESIZE = 4500,
 
-	NUMWEATHERS = 4,
+	NUMWEATHERS = 7,
 	NUMHOURS = 24,
 
 	NUMEXTRADIRECTIONALS = 4,
@@ -92,7 +95,7 @@ enum Config {
 	NUMPACMANPICKUPS = 256,
 	NUMEVENTS = 64,
 
-	NUM_CARGENS = 160,
+	NUM_CARGENS = 185,
 
 	NUM_PATH_NODES_IN_AUTOPILOT = 8,
 
@@ -107,11 +110,12 @@ enum Config {
 
 	NUMPEDROUTES = 200,
 	NUMPHONES = 50,
-	NUMPEDGROUPS = 31,
-	NUMMODELSPERPEDGROUP = 8,
+	NUMPEDGROUPS = 67,
+	NUMMODELSPERPEDGROUP = 16,
 	NUMSHOTINFOS = 100,
 
-	NUMROADBLOCKS = 600,
+	NUMROADBLOCKS = 300,
+	NUM_SCRIPT_ROADBLOCKS = 16,
 
 	NUMVISIBLEENTITIES = 2000,
 	NUMINVISIBLEENTITIES = 150,
@@ -127,11 +131,14 @@ enum Config {
 	NUM_AUDIO_REFLECTIONS = 5,
 	NUM_SCRIPT_MAX_ENTITIES = 40,
 
-	NUM_GARAGE_STORED_CARS = 6,
+	NUM_GARAGE_STORED_CARS = 4,
 
 	NUM_CRANES = 8,
 
 	NUM_EXPLOSIONS = 48,
+
+	NUM_SETPIECES = 96,
+	NUM_SHORTCUT_START_POINTS = 16
 };
 
 // We'll use this once we're ready to become independent of the game
@@ -161,6 +168,7 @@ enum Config {
 #elif defined GTA_PC
 #	define GTA3_1_1_PATCH
 //#	define GTA3_STEAM_PATCH
+//# define GTAVC_JP_PATCH
 #	ifdef GTA_PS2_STUFF
 #		define USE_PS2_RAND
 #		define RANDOMSPLASH	// use random splash as on PS2
@@ -190,9 +198,17 @@ enum Config {
 #endif
 
 #define FIX_BUGS		// fixes bugs that we've came across during reversing, TODO: use this more
-#define TOGGLEABLE_BETA_FEATURES // toggleable from debug menu. not too many things
-#define MORE_LANGUAGES		// Add more translations to the game
+//#define MORE_LANGUAGES		// Add more translations to the game
 #define COMPATIBLE_SAVES // this allows changing structs while keeping saves compatible
+#define FIX_HIGH_FPS_BUGS_ON_FRONTEND
+
+// Rendering/display
+#define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
+// Just debug menu entries
+#ifdef DEBUGMENU
+#define TOGGLEABLE_BETA_FEATURES // not too many things
+#define RELOADABLES			// some debug menu options to reload TXD files
+#endif
 
 // Rendering/display
 #define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
@@ -201,9 +217,11 @@ enum Config {
 #define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
 //#define USE_TEXTURE_POOL
 
-// Particle
-//#define PC_PARTICLE
+// Water & Particle
+#define PC_PARTICLE
 //#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2
+// #define PC_WATER
+#define WATER_CHEATS
 
 // Pad
 #if !defined(RW_GL3) && defined(_WIN32)
@@ -217,7 +235,6 @@ enum Config {
 
 // Hud, frontend and radar
 #define TRIANGULAR_BLIPS	// height indicating triangular radar blips, as in VC
-#define PS2_SAVE_DIALOG		// PS2 style save dialog with transparent black box
 // #define PS2_LIKE_MENU	// An effort to recreate PS2 menu, cycling through tabs, different bg etc.
 #define MENU_MAP			// VC-like menu map. Make sure you have new menu.txd
 #define SCROLLABLE_STATS_PAGE	// only draggable by mouse atm
@@ -225,13 +242,15 @@ enum Config {
 // #define CIRCLE_BACK_BUTTON
 #define HUD_ENHANCEMENTS	// Adjusts some aspects to make the HUD look/behave a little bit better.
 #define BETA_SLIDING_TEXT
-#define CUSTOM_FRONTEND_OPTIONS
+//#define CUSTOM_FRONTEND_OPTIONS
+#define LEGACY_MENU_OPTIONS
+#define MUCH_SHORTER_OUTRO_SCREEN
 
 // Script
 #define USE_DEBUG_SCRIPT_LOADER	// Loads main.scm by default. Hold R for main_freeroam.scm and D for main_d.scm
 #define USE_MEASUREMENTS_IN_METERS // makes game use meters instead of feet in script
 #define USE_PRECISE_MEASUREMENT_CONVERTION // makes game convert feet to meeters more precisely
-#define MISSION_REPLAY // mobile feature
+//#define MISSION_REPLAY // mobile feature
 //#define SIMPLIER_MISSIONS // apply simplifications from mobile
 
 // Replay
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 3fca618b..6ffaabf6 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -84,7 +84,7 @@ RwRGBA gColourTop;
 bool gameAlreadyInitialised;
 
 float NumberOfChunksLoaded;
-#define TOTALNUMCHUNKS 73.0f
+#define TOTALNUMCHUNKS 95.0f
 
 bool g_SlowMode = false;
 char version_name[64];
@@ -139,11 +139,8 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
 	CRGBA TopColor(TopRed, TopGreen, TopBlue, Alpha);
 	CRGBA BottomColor(BottomRed, BottomGreen, BottomBlue, Alpha);
 
-#ifndef ASPECT_RATIO_SCALE
-	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f / 9.f : 4.f / 3.f));
-#else
+	CDraw::CalculateAspectRatio();
 	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
-#endif
 	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
 	RwCameraClear(Scene.camera, &TopColor.rwRGBA, rwCAMERACLEARZ);
 
@@ -161,11 +158,8 @@ DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomR
 bool
 DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha)
 {
-#ifndef ASPECT_RATIO_SCALE
-	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, (CMenuManager::m_PrefsUseWideScreen ? 16.f/9.f : 4.f/3.f));
-#else
+	CDraw::CalculateAspectRatio();
 	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
-#endif
 	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
 	RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
 
@@ -209,13 +203,13 @@ DoFade(void)
 		}
 	}
 
-	if(CDraw::FadeValue != 0 || CMenuManager::m_PrefsBrightness < 256){
+	if(CDraw::FadeValue != 0 || FrontEndMenuManager.m_PrefsBrightness < 256){
 		CSprite2d *splash = LoadSplash(nil);
 
 		CRGBA fadeColor;
 		CRect rect;
 		int fadeValue = CDraw::FadeValue;
-		float brightness = Min(CMenuManager::m_PrefsBrightness, 256);
+		float brightness = Min(FrontEndMenuManager.m_PrefsBrightness, 256);
 		if(brightness <= 50)
 			brightness = 50;
 		if(FrontEndMenuManager.m_bMenuActive)
@@ -366,6 +360,7 @@ Terminate3D(void)
 CSprite2d splash;
 int splashTxdId = -1;
 
+//--MIAMI: done
 CSprite2d*
 LoadSplash(const char *name)
 {
@@ -411,22 +406,23 @@ DestroySplashScreen(void)
 	splashTxdId = -1;
 }
 
+//--MIAMI: done
 Const char*
 GetRandomSplashScreen(void)
 {
 	int index;
 	static int index2 = 0;
 	static char splashName[128];
-	static int splashIndex[24] = {
-		25, 22, 4, 13,
-		1, 21, 14, 16,
-		10, 12, 5, 9,
-		11, 18, 3, 2,
-		19, 23, 7, 17,
-		15, 6, 8, 20
+	static int splashIndex[12] = {
+		1, 2,
+		3, 4,
+		5, 11,
+		6, 8,
+		9, 10,
+		7, 12
 	};
 
-	index = splashIndex[4*index2 + CGeneral::GetRandomNumberInRange(0, 3)];
+	index = splashIndex[2*index2 + CGeneral::GetRandomNumberInRange(0, 2)];
 	index2++;
 	if(index2 == 6)
 		index2 = 0;
@@ -453,17 +449,14 @@ ResetLoadingScreenBar()
 	NumberOfChunksLoaded = 0.0f;
 }
 
-// TODO: compare with PS2
+//--MIAMI: done
 void
 LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
 {
 	CSprite2d *splash;
 
 #ifndef RANDOMSPLASH
-	if(CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
-		splashscreen = "mainsc2";
-	else
-		splashscreen = "mainsc1";
+	splashscreen = "LOADSC0";
 #endif
 
 	splash = LoadSplash(splashscreen);
@@ -484,36 +477,50 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
 		if(str1){
 			NumberOfChunksLoaded += 1;
 
+#ifndef RANDOMSPLASH
 			float hpos = SCREEN_SCALE_X(40);
-			float length = SCREEN_WIDTH - SCREEN_SCALE_X(100);
-			float vpos = SCREEN_HEIGHT - SCREEN_SCALE_Y(13);
-			float height = SCREEN_SCALE_Y(7);
-			CSprite2d::DrawRect(CRect(hpos, vpos, hpos + length, vpos + height), CRGBA(40, 53, 68, 255));
+			float length = SCREEN_WIDTH - SCREEN_SCALE_X(80);
+			float top = SCREEN_HEIGHT - SCREEN_SCALE_Y(14);
+			float bottom = top + SCREEN_SCALE_Y(5);
+#else
+			float hpos = SCREEN_STRETCH_X(40);
+			float length = SCREEN_STRETCH_X(440);
+			// this is rather weird
+			float top = SCREEN_STRETCH_Y(407.4f - 7.0f/3.0f);
+			float bottom = SCREEN_STRETCH_Y(407.4f + 7.0f/3.0f);
+#endif
+
+			CSprite2d::DrawRect(CRect(hpos-1.0f, top-1.0f, hpos+length+1.0f, bottom+1.0f), CRGBA(40, 53, 68, 255));
+
+			CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(155, 50, 125, 255));
 
 			length *= NumberOfChunksLoaded/TOTALNUMCHUNKS;
-			CSprite2d::DrawRect(CRect(hpos, vpos, hpos + length, vpos + height), CRGBA(81, 106, 137, 255));
+			CSprite2d::DrawRect(CRect(hpos, top, hpos+length, bottom), CRGBA(255, 150, 225, 255));
 
 			// this is done by the game but is unused
+			CFont::SetBackgroundOff();
 			CFont::SetScale(SCREEN_SCALE_X(2), SCREEN_SCALE_Y(2));
 			CFont::SetPropOn();
 			CFont::SetRightJustifyOn();
+			CFont::SetDropShadowPosition(1);
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 			CFont::SetFontStyle(FONT_HEADING);
 
 #ifdef CHATTYSPLASH
 			// my attempt
 			static wchar tmpstr[80];
 			float yscale = SCREEN_SCALE_Y(0.9f);
-			vpos -= 45*yscale;
+			top -= 45*yscale;
 			CFont::SetScale(SCREEN_SCALE_X(0.75f), yscale);
 			CFont::SetPropOn();
 			CFont::SetRightJustifyOff();
 			CFont::SetFontStyle(FONT_STANDARD);
 			CFont::SetColor(CRGBA(255, 255, 255, 255));
 			AsciiToUnicode(str1, tmpstr);
-			CFont::PrintString(hpos, vpos, tmpstr);
-			vpos += 22*yscale;
+			CFont::PrintString(hpos, top, tmpstr);
+			top += 22*yscale;
 			AsciiToUnicode(str2, tmpstr);
-			CFont::PrintString(hpos, vpos, tmpstr);
+			CFont::PrintString(hpos, top, tmpstr);
 #endif
 		}
 
@@ -686,11 +693,13 @@ DisplayGameDebugText()
 {
 	static bool bDisplayPosn = false;
 	static bool bDisplayRate = false;
+	static bool bDisplayCheatStr = false;
 
 	{
 		SETTWEAKPATH("GameDebugText");
 		TWEAKBOOL(bDisplayPosn);
 		TWEAKBOOL(bDisplayRate);
+		TWEAKBOOL(bDisplayCheatStr);
 	}
 
 
@@ -778,6 +787,26 @@ DisplayGameDebugText()
 		CFont::SetColor(CRGBA(255, 108, 0, 255));
 		CFont::PrintString(40.0f, 40.0f, ustr);
 	}
+
+	if (bDisplayCheatStr)
+	{
+		sprintf(str, "%s", CPad::KeyBoardCheatString);
+		AsciiToUnicode(str, ustr);
+
+		CFont::SetPropOff();
+		CFont::SetBackgroundOff();
+		CFont::SetScale(0.7f, 1.5f);
+		CFont::SetCentreOn();
+		CFont::SetBackGroundOnlyTextOff();
+		CFont::SetWrapx(640.0f);
+		CFont::SetFontStyle(FONT_HEADING);
+
+		CFont::SetColor(CRGBA(0, 0, 0, 255));
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.5f)+2.f, SCREEN_SCALE_FROM_BOTTOM(20.0f)+2.f, ustr);
+
+		CFont::SetColor(CRGBA(255, 150, 225, 255));
+		CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH * 0.5f), SCREEN_SCALE_FROM_BOTTOM(20.0f), ustr);
+	}
 }
 #endif
 
@@ -788,14 +817,17 @@ RenderScene(void)
 	DoRWRenderHorizon();
 	CRenderer::RenderRoads();
 	CCoronas::RenderReflections();
-	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
 	CRenderer::RenderEverythingBarRoads();
-	CRenderer::RenderBoats();
-	DefinedState();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
 	CWaterLevel::RenderWater();
+	CRenderer::RenderBoats();
+	CRenderer::RenderFadingInUnderwaterEntities();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+	CWaterLevel::RenderTransparentWater();
 	CRenderer::RenderFadingInEntities();
-	CRenderer::RenderVehiclesButNotBoats();
+	RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
 	CWeather::RenderRainStreaks();
+	// CCoronas::RenderSunReflection
 }
 
 void
@@ -920,15 +952,12 @@ Render2dStuffAfterFade(void)
 
 	CHud::DrawAfterFade();
 	CFont::DrawFonts();
+	CCredits::Render();
 }
 
 void
 Idle(void *arg)
 {
-#ifdef ASPECT_RATIO_SCALE
-	CDraw::SetAspectRatio(CDraw::FindAspectRatio());
-#endif
-
 	CTimer::Update();
 
 #ifdef TIMEBARS
@@ -938,35 +967,6 @@ Idle(void *arg)
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
 
-	// We're basically merging FrontendIdle and Idle (just like TheGame on PS2)
-#ifdef PS2_SAVE_DIALOG
-	// Only exists on PC FrontendIdle, probably some PS2 bug fix
-	if (FrontEndMenuManager.m_bMenuActive)
-		CSprite2d::SetRecipNearClip();
-	
-	if (FrontEndMenuManager.m_bGameNotLoaded) {
-		CPad::UpdatePads();
-		FrontEndMenuManager.Process();
-	} else {
-		CPointLights::InitPerFrame();
-#ifdef TIMEBARS
-		tbStartTimer(0, "CGame::Process");
-#endif
-		CGame::Process();
-#ifdef TIMEBARS
-		tbEndTimer("CGame::Process");
-		tbStartTimer(0, "DMAudio.Service");
-#endif
-		DMAudio.Service();
-
-#ifdef TIMEBARS
-		tbEndTimer("DMAudio.Service");
-#endif
-	}
-
-	if (RsGlobal.quit)
-		return;
-#else
 	CPointLights::InitPerFrame();
 #ifdef TIMEBARS
 	tbStartTimer(0, "CGame::Process");
@@ -982,7 +982,6 @@ Idle(void *arg)
 #ifdef TIMEBARS
 	tbEndTimer("DMAudio.Service");
 #endif
-#endif
 
 	if(CGame::bDemoMode && CTimer::GetTimeInMilliseconds() > (3*60 + 30)*1000 && !CCutsceneMgr::IsCutsceneProcessing()){
 		FrontEndMenuManager.m_bWantToRestart = true;
@@ -998,21 +997,23 @@ Idle(void *arg)
 	if(arg == nil)
 		return;
 
-	if((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu) &&
+	// m_bRenderGameInMenu is there in III PS2 but I don't know about VC PS2.
+	if((!FrontEndMenuManager.m_bMenuActive/* || FrontEndMenuManager.m_bRenderGameInMenu*/) &&
 	   TheCamera.GetScreenFadeStatus() != FADE_2)
 	{
 #ifdef GTA_PC
-		if (!FrontEndMenuManager.m_bRenderGameInMenu) {
 			// This is from SA, but it's nice for windowed mode
 			RwV2d pos;
 			pos.x = SCREEN_WIDTH / 2.0f;
 			pos.y = SCREEN_HEIGHT / 2.0f;
 			RsMouseSetPos(&pos);
-		}
 #endif
 #ifdef TIMEBARS
 		tbStartTimer(0, "CnstrRenderList");
 #endif
+#ifdef PC_WATER
+		CWaterLevel::PreCalcWaterGeometry();
+#endif
 		CRenderer::ConstructRenderList();
 #ifdef TIMEBARS
 		tbEndTimer("CnstrRenderList");
@@ -1065,6 +1066,7 @@ Idle(void *arg)
 		tbEndTimer("Render2dStuff");
 #endif
 	}else{
+		CDraw::CalculateAspectRatio();
 #ifdef ASPECT_RATIO_SCALE
 		CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
 #else
@@ -1076,10 +1078,6 @@ Idle(void *arg)
 			return;
 	}
 
-#ifdef PS2_SAVE_DIALOG
-	if (FrontEndMenuManager.m_bMenuActive)
-		DefinedState();
-#endif
 #ifdef TIMEBARS
 	tbStartTimer(0, "RenderMenus");
 #endif
@@ -1097,7 +1095,7 @@ Idle(void *arg)
 #ifdef TIMEBARS
 	tbEndTimer("Render2dStuff-Fade");
 #endif
-	CCredits::Render();
+	// CCredits::Render(); // They added it to function above and also forgot it here
 
 
 #ifdef TIMEBARS
@@ -1114,10 +1112,7 @@ Idle(void *arg)
 void
 FrontendIdle(void)
 {
-#ifdef ASPECT_RATIO_SCALE
-	CDraw::SetAspectRatio(CDraw::FindAspectRatio());
-#endif
-
+	CDraw::CalculateAspectRatio();
 	CTimer::Update();
 	CSprite2d::SetRecipNearClip(); // this should be on InitialiseRenderWare according to PS2 asm. seems like a bug fix
 	CSprite2d::InitPerFrame();
@@ -1128,11 +1123,7 @@ FrontendIdle(void)
 	if(RsGlobal.quit)
 		return;
 
-#ifdef ASPECT_RATIO_SCALE
 	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, SCREEN_ASPECT_RATIO);
-#else
-	CameraSize(Scene.camera, nil, SCREEN_VIEWWINDOW, DEFAULT_ASPECT_RATIO);
-#endif
 	CVisibilityPlugins::SetRenderWareCamera(Scene.camera);
 	RwCameraClear(Scene.camera, &gColourTop, rwCAMERACLEARZ);
 	if(!RsCameraBeginUpdate(Scene.camera))
@@ -1142,7 +1133,7 @@ FrontendIdle(void)
 	RenderMenus();
 	DoFade();
 	Render2dStuffAfterFade();
-//	CFont::DrawFonts(); // redundant
+	CFont::DrawFonts();
 	DoRWStuffEndOfFrame();
 }
 
@@ -1150,7 +1141,7 @@ void
 InitialiseGame(void)
 {
 	LoadingScreen(nil, nil, "loadsc0");
-	CGame::Initialise("DATA\\GTA3.DAT");
+	CGame::Initialise("DATA\\GTA_VC.DAT");
 }
 
 RsEventStatus
@@ -1213,11 +1204,7 @@ AppEventHandler(RsEvent event, void *param)
 
 		case rsFRONTENDIDLE:
 		{
-#ifdef PS2_SAVE_DIALOG
-			Idle((void*)1);
-#else
 			FrontendIdle();
-#endif
 
 			return rsEVENTPROCESSED;
 		}
@@ -1252,9 +1239,8 @@ TheModelViewer(void)
 #if (defined(GTA_PS2) || defined(GTA_XBOX))
 	//TODO
 #else
-#ifdef ASPECT_RATIO_SCALE
-	CDraw::SetAspectRatio(CDraw::FindAspectRatio());
-#endif
+
+	CDraw::CalculateAspectRatio();
 	CAnimViewer::Update();
 	CTimer::Update();
 	SetLightsWithTimeOfDayColour(Scene.world);
@@ -1303,9 +1289,9 @@ void TheGame(void)
 		strcpy(TheMemoryCard.LoadFileName, TheMemoryCard.field37);
 		TheMemoryCard.b_FoundRecentSavedGameWantToLoad = true;
 
-		if (CMenuManager::m_PrefsLanguage != TheMemoryCard.GetLanguageToLoad())
+		if (FrontEndMenuManager.m_PrefsLanguage != TheMemoryCard.GetLanguageToLoad())
 		{
-			CMenuManager::m_PrefsLanguage = TheMemoryCard.GetLanguageToLoad();
+			FrontEndMenuManager.m_PrefsLanguage = TheMemoryCard.GetLanguageToLoad();
 			TheText.Unload();
 			TheText.Load();
 		}
@@ -1379,7 +1365,8 @@ void TheGame(void)
 			gMainHeap.PushMemId(_TODOCONST(15));
 #endif
 
-			if (!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true && TheCamera.GetScreenFadeStatus() != FADE_2 )
+			// m_bRenderGameInMenu is there in III PS2 but I don't know about VC PS2.
+			if (!FrontEndMenuManager.m_bMenuActive || /*FrontEndMenuManager.m_bRenderGameInMenu == true && */TheCamera.GetScreenFadeStatus() != FADE_2 )
 			{
 #ifdef GTA_PS2
 				gMainHeap.PushMemId(_TODOCONST(11));
@@ -1586,30 +1573,30 @@ void SystemInit()
 	CGame::frenchGame = false;
 	CGame::germanGame = false;
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	
 #ifdef GTA_PS2
 	int32 lang = sceScfGetLanguage();
 	if ( lang  == SCE_ITALIAN_LANGUAGE )
-		CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 	else if ( lang  == SCE_SPANISH_LANGUAGE )
-		CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 	else if ( lang  == SCE_GERMAN_LANGUAGE )
 	{
 		CGame::germanGame = true;
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
-		CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 	}
 	else if ( lang  == SCE_FRENCH_LANGUAGE )
 	{
 		CGame::frenchGame = true;
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
-		CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 	}
 	else
-		CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 	
 	FrontEndMenuManager.InitialiseMenuContentsAfterLoadingGame();
 #else
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 38854f25..77c387b3 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -16,6 +16,7 @@
 #include "Boat.h"
 #include "Heli.h"
 #include "Automobile.h"
+#include "Bike.h"
 #include "Ped.h"
 #include "Particle.h"
 #include "Console.h"
@@ -164,9 +165,11 @@ CustomFrontendOptionsPopulate(void)
 #endif
 
 #ifdef DEBUGMENU
-void WeaponCheat();
+void WeaponCheat1();
+void WeaponCheat2();
+void WeaponCheat3();
 void HealthCheat();
-void TankCheat();
+void VehicleCheat(bool something, int model);
 void BlowUpCarsCheat();
 void ChangePlayerCheat();
 void MayhemCheat();
@@ -209,6 +212,8 @@ SpawnCar(int id)
 		CVehicle *v;
 		if(CModelInfo::IsBoatModel(id))
 			v = new CBoat(id, RANDOM_VEHICLE);
+		if(CModelInfo::IsBikeModel(id))
+			v = new CBike(id, RANDOM_VEHICLE);
 		else
 			v = new CAutomobile(id, RANDOM_VEHICLE);
 
@@ -238,10 +243,12 @@ FixCar(void)
 	if(veh == nil)
 		return;
 	veh->m_fHealth = 1000.0f;
-	if(!veh->IsCar())
-		return;
-	((CAutomobile*)veh)->Damage.SetEngineStatus(0);
-	((CAutomobile*)veh)->Fix();
+	if(veh->IsCar()){
+		((CAutomobile*)veh)->Damage.SetEngineStatus(0);
+		((CAutomobile*)veh)->Fix();
+	}else if(veh->IsBike()){
+		((CBike*)veh)->Fix();
+	}
 }
 
 #ifdef MENU_MAP
@@ -303,11 +310,17 @@ ResetCamStatics(void)
 }
 
 static const char *carnames[] = {
-	"landstal", "idaho", "stinger", "linerun", "peren", "sentinel", "patriot", "firetruk", "trash", "stretch", "manana", "infernus", "blista", "pony",
-	"mule", "cheetah", "ambulan", "fbicar", "moonbeam", "esperant", "taxi", "kuruma", "bobcat", "mrwhoop", "bfinject", "corpse", "police", "enforcer",
-	"securica", "banshee", "predator", "bus", "rhino", "barracks", "train", "chopper", "dodo", "coach", "cabbie", "stallion", "rumpo", "rcbandit",
-	"bellyup", "mrwongs", "mafia", "yardie", "yakuza", "diablos", "columb", "hoods", "airtrain", "deaddodo", "speeder", "reefer", "panlant", "flatbed",
-	"yankee", "escape", "borgnine", "toyz", "ghost",
+	"landstal", "idaho", "stinger", "linerun", "peren", "sentinel", "rio", "firetruk", "trash", "stretch", "manana",
+	"infernus", "voodoo", "pony", "mule", "cheetah", "ambulan", "fbicar", "moonbeam", "esperant", "taxi", "washing",
+	"bobcat", "mrwhoop", "bfinject", "hunter", "police", "enforcer", "securica", "banshee", "predator", "bus",
+	"rhino", "barracks", "cuban", "chopper", "angel", "coach", "cabbie", "stallion", "rumpo", "rcbandit", "romero",
+	"packer", "sentxs", "admiral", "squalo", "seaspar", "pizzaboy", "gangbur", "airtrain", "deaddodo", "speeder",
+	"reefer", "tropic", "flatbed", "yankee", "caddy", "zebra", "topfun", "skimmer", "pcj600", "faggio", "freeway",
+	"rcbaron", "rcraider", "glendale", "oceanic", "sanchez", "sparrow", "patriot", "lovefist", "coastg", "dinghy",
+	"hermes", "sabre", "sabretur", "pheonix", "walton", "regina", "comet", "deluxo", "burrito", "spand", "marquis",
+	"baggage", "kaufman", "maverick", "vcnmav", "rancher", "fbiranch", "virgo", "greenwoo", "jetmax", "hotring",
+	"sandking", "blistac", "polmav", "boxville", "benson", "mesa", "rcgoblin", "hotrina", "hotrinb",
+	"bloodra", "bloodrb", "vicechee"
 };
 
 static CTweakVar** TweakVarsList;
@@ -371,7 +384,7 @@ DebugMenuPopulate(void)
 {
 	if(1){
 		static const char *weathers[] = {
-			"Sunny", "Cloudy", "Rainy", "Foggy"
+			"Sunny", "Cloudy", "Rainy", "Foggy", "Extrasunny", "Stormy"
 		};
 		DebugMenuEntry *e;
 		e = DebugMenuAddVar("Time & Weather", "Current Hour", &CClock::GetHoursRef(), nil, 1, 0, 23, nil);
@@ -379,19 +392,21 @@ DebugMenuPopulate(void)
 		e = DebugMenuAddVar("Time & Weather", "Current Minute", &CClock::GetMinutesRef(),
 			[](){ CWeather::InterpolationValue = CClock::GetMinutes()/60.0f; }, 1, 0, 59, nil);
 			DebugMenuEntrySetWrap(e, true);
-		e = DebugMenuAddVar("Time & Weather", "Old Weather", (int16*)&CWeather::OldWeatherType, nil, 1, 0, 3, weathers);
+		e = DebugMenuAddVar("Time & Weather", "Old Weather", (int16*)&CWeather::OldWeatherType, nil, 1, 0, 5, weathers);
 		DebugMenuEntrySetWrap(e, true);
-		e = DebugMenuAddVar("Time & Weather", "New Weather", (int16*)&CWeather::NewWeatherType, nil, 1, 0, 3, weathers);
+		e = DebugMenuAddVar("Time & Weather", "New Weather", (int16*)&CWeather::NewWeatherType, nil, 1, 0, 5, weathers);
 		DebugMenuEntrySetWrap(e, true);
 		DebugMenuAddVar("Time & Weather", "Wind", (float*)&CWeather::Wind, nil, 0.1f, 0.0f, 1.0f);
 		DebugMenuAddVar("Time & Weather", "Time scale", (float*)&CTimer::GetTimeScale(), nil, 0.1f, 0.0f, 10.0f);
 
-		DebugMenuAddCmd("Cheats", "Weapons", WeaponCheat);
+		DebugMenuAddCmd("Cheats", "Weapon set 1", WeaponCheat1);
+		DebugMenuAddCmd("Cheats", "Weapon set 2", WeaponCheat2);
+		DebugMenuAddCmd("Cheats", "Weapon set 3", WeaponCheat3);
 		DebugMenuAddCmd("Cheats", "Money", MoneyCheat);
 		DebugMenuAddCmd("Cheats", "Health", HealthCheat);
 		DebugMenuAddCmd("Cheats", "Wanted level up", WantedLevelUpCheat);
 		DebugMenuAddCmd("Cheats", "Wanted level down", WantedLevelDownCheat);
-		DebugMenuAddCmd("Cheats", "Tank", TankCheat);
+		DebugMenuAddCmd("Cheats", "Tank", []() { VehicleCheat(true, MI_TAXI); });
 		DebugMenuAddCmd("Cheats", "Blow up cars", BlowUpCarsCheat);
 		DebugMenuAddCmd("Cheats", "Change player", ChangePlayerCheat);
 		DebugMenuAddCmd("Cheats", "Mayhem", MayhemCheat);
@@ -411,14 +426,12 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Cheats", "Nasty limbs", NastyLimbsCheat);
 
 		static int spawnCarId = MI_LANDSTAL;
-		e = DebugMenuAddVar("Spawn", "Spawn Car ID", &spawnCarId, nil, 1, MI_LANDSTAL, MI_GHOST, carnames);
+		e = DebugMenuAddVar("Spawn", "Spawn Car ID", &spawnCarId, nil, 1, MI_LANDSTAL, MI_VICECHEE, carnames);
 		DebugMenuEntrySetWrap(e, true);
 		DebugMenuAddCmd("Spawn", "Spawn Car", [](){
-			if(spawnCarId == MI_TRAIN ||
-			   spawnCarId == MI_CHOPPER ||
+			if(spawnCarId == MI_CHOPPER ||
 			   spawnCarId == MI_AIRTRAIN ||
-			   spawnCarId == MI_DEADDODO ||
-			   spawnCarId == MI_ESCAPE)
+			   spawnCarId == MI_DEADDODO)
 				return;
 			SpawnCar(spawnCarId);
 		});
@@ -428,21 +441,32 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Spawn", "Spawn Stinger", [](){ SpawnCar(MI_STINGER); });
 		DebugMenuAddCmd("Spawn", "Spawn Infernus", [](){ SpawnCar(MI_INFERNUS); });
 		DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); });
+		DebugMenuAddCmd("Spawn", "Spawn Phoenix", [](){ SpawnCar(MI_PHEONIX); });
+		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
 		DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); });
 		DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); });
-		DebugMenuAddCmd("Spawn", "Spawn Kuruma", [](){ SpawnCar(MI_KURUMA); });
+		DebugMenuAddCmd("Spawn", "Spawn Admiral", [](){ SpawnCar(MI_ADMIRAL); });
+		DebugMenuAddCmd("Spawn", "Spawn Washington", [](){ SpawnCar(MI_WASHING); });
 		DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); });
 		DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); });
 		DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); });
-		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
-		DebugMenuAddCmd("Spawn", "Spawn Yakuza", [](){ SpawnCar(MI_YAKUZA); });
-		DebugMenuAddCmd("Spawn", "Spawn Yardie", [](){ SpawnCar(MI_YARDIE); });
-		DebugMenuAddCmd("Spawn", "Spawn Dodo", [](){ SpawnCar(MI_DODO); });
+		DebugMenuAddCmd("Spawn", "Spawn Cuban", [](){ SpawnCar(MI_CUBAN); });
+		DebugMenuAddCmd("Spawn", "Spawn Voodoo", [](){ SpawnCar(MI_VOODOO); });
+		DebugMenuAddCmd("Spawn", "Spawn BF injection", [](){ SpawnCar(MI_BFINJECT); });
+		DebugMenuAddCmd("Spawn", "Spawn Maverick", [](){ SpawnCar(MI_MAVERICK); });
+		DebugMenuAddCmd("Spawn", "Spawn VCN Maverick", [](){ SpawnCar(MI_VCNMAV); });
+		DebugMenuAddCmd("Spawn", "Spawn Sparrow", [](){ SpawnCar(MI_SPARROW); });
+		DebugMenuAddCmd("Spawn", "Spawn Sea Sparrow", [](){ SpawnCar(MI_SEASPAR); });
+		DebugMenuAddCmd("Spawn", "Spawn Hunter", [](){ SpawnCar(MI_HUNTER); });
 		DebugMenuAddCmd("Spawn", "Spawn Rhino", [](){ SpawnCar(MI_RHINO); });
 		DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); });
 		DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); });
+		DebugMenuAddCmd("Spawn", "Spawn PCJ 600", [](){ SpawnCar(MI_PCJ600); });
+		DebugMenuAddCmd("Spawn", "Spawn Faggio", [](){ SpawnCar(MI_FAGGIO); });
+		DebugMenuAddCmd("Spawn", "Spawn Freeway", [](){ SpawnCar(MI_FREEWAY); });
 
 		DebugMenuAddVarBool8("Render", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil);
+		DebugMenuAddVarBool8("Render", "Backface Culling", &gBackfaceCulling, nil);
 #ifdef LIBRW
 		DebugMenuAddVarBool8("Render", "PS2 Alpha test Emu", &gPS2alphaTest, nil);
 #endif
@@ -452,8 +476,6 @@ DebugMenuPopulate(void)
 		DebugMenuAddVarBool8("Render", "Show Ped Paths", &gbShowPedPaths, nil);
 		DebugMenuAddVarBool8("Render", "Show Car Paths", &gbShowCarPaths, nil);
 		DebugMenuAddVarBool8("Render", "Show Car Path Links", &gbShowCarPathsLinks, nil);
-		DebugMenuAddVarBool8("Render", "Show Ped Road Groups", &gbShowPedRoadGroups, nil);
-		DebugMenuAddVarBool8("Render", "Show Car Road Groups", &gbShowCarRoadGroups, nil);
 		DebugMenuAddVarBool8("Render", "Show Collision Lines", &gbShowCollisionLines, nil);
 		DebugMenuAddVarBool8("Render", "Show Collision Polys", &gbShowCollisionPolys, nil);
 		DebugMenuAddVarBool8("Render", "Don't render Buildings", &gbDontRenderBuildings, nil);
@@ -474,23 +496,17 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Debug", "Toggle Comedy Controls", ToggleComedy);
 		DebugMenuAddCmd("Debug", "Place Car on Road", PlaceOnRoad);
 
-		DebugMenuAddVarBool8("Debug", "Catalina Heli On", &CHeli::CatalinaHeliOn, nil);
-		DebugMenuAddCmd("Debug", "Catalina Fly By", CHeli::StartCatalinaFlyBy);
-		DebugMenuAddCmd("Debug", "Catalina Take Off", CHeli::CatalinaTakeOff);
-		DebugMenuAddCmd("Debug", "Catalina Fly Away", CHeli::MakeCatalinaHeliFlyAway);
 		DebugMenuAddVarBool8("Debug", "Script Heli On", &CHeli::ScriptHeliOn, nil);
 
 #ifdef CUSTOM_FRONTEND_OPTIONS
 		DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions);
 #endif
-#ifdef TOGGLEABLE_BETA_FEATURES
-		DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil);
-		DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil);
-#endif
-
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
 		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
 
+#ifdef RELOADABLES
+		DebugMenuAddCmd("Reload", "HUD.TXD", CHud::ReloadTXD);
+#endif
 		DebugMenuAddVarBool8("Debug", "Show DebugStuffInRelease", &gbDebugStuffInRelease, nil);
 #ifdef TIMEBARS
 		DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
diff --git a/src/core/templates.h b/src/core/templates.h
index 4f7b8490..465e3bef 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -44,18 +44,20 @@ class CPool
 	int    m_allocPtr;
 
 public:
+	// TODO(MIAMI): remove ctor without name argument
 	CPool(int size){
 		// TODO: use new here
 		m_entries = (U*)malloc(sizeof(U)*size);
 		m_flags = (Flags*)malloc(sizeof(Flags)*size);
 		m_size = size;
-		m_allocPtr = 0;
+		m_allocPtr = -1;
 		for(int i = 0; i < size; i++){
 			m_flags[i].id   = 0;
 			m_flags[i].free = 1;
 		}
 	}
-
+	CPool(int size, const char *name)
+	 : CPool(size) {}
 	~CPool() {
 		Flush();
 	}
@@ -131,7 +133,7 @@ public:
 		// TODO: the cast is unsafe
 		return (int)((U*)entry - m_entries);
 	}
-	int GetNoOfUsedSpaces(void) const{
+	int GetNoOfUsedSpaces(void) const {
 		int i;
 		int n = 0;
 		for(i = 0; i < m_size; i++)
@@ -162,6 +164,7 @@ public:
 		memcpy(entries, m_entries, sizeof(U)*m_size);
 		debug("Stored:%d (/%d)\n", GetNoOfUsedSpaces(), m_size); /* Assumed inlining */
 	}
+	int32 GetNoOfFreeSpaces() const { return GetSize() - GetNoOfUsedSpaces(); }
 };
 
 template<typename T>
diff --git a/src/entities/Building.cpp b/src/entities/Building.cpp
index 3c096636..3217e684 100644
--- a/src/entities/Building.cpp
+++ b/src/entities/Building.cpp
@@ -20,3 +20,25 @@ CBuilding::ReplaceWithNewModel(int32 id)
 		if(m_level == LEVEL_NONE || m_level == CGame::currLevel)
 			CStreaming::RequestModel(id, STREAMFLAGS_DONT_REMOVE);
 }
+
+bool
+IsBuildingPointerValid(CBuilding* pBuilding)
+{
+	if (!pBuilding)
+		return false;
+	if (pBuilding->GetIsATreadable()) {
+		int index = CPools::GetTreadablePool()->GetJustIndex((CTreadable*)pBuilding);
+#ifdef FIX_BUGS
+		return index >= 0 && index < CPools::GetTreadablePool()->GetSize();
+#else
+		return index >= 0 && index <= CPools::GetTreadablePool()->GetSize();
+#endif
+	} else {
+		int index = CPools::GetBuildingPool()->GetJustIndex(pBuilding);
+#ifdef FIX_BUGS
+		return index >= 0 && index < CPools::GetBuildingPool()->GetSize();
+#else
+		return index >= 0 && index <= CPools::GetBuildingPool()->GetSize();
+#endif
+	}
+}
diff --git a/src/entities/Building.h b/src/entities/Building.h
index 3586a8dc..2c2dfb1f 100644
--- a/src/entities/Building.h
+++ b/src/entities/Building.h
@@ -17,5 +17,4 @@ public:
 	virtual bool GetIsATreadable(void) { return false; }
 };
 
-VALIDATE_SIZE(CBuilding, 0x64);
-
+bool IsBuildingPointerValid(CBuilding*);
diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp
index 8a4bfd5f..92b69761 100644
--- a/src/entities/Dummy.cpp
+++ b/src/entities/Dummy.cpp
@@ -50,3 +50,18 @@ CDummy::Remove(void)
 		m_entryInfoList.DeleteNode(node);
 	}
 }
+
+bool
+IsDummyPointerValid(CDummy* pDummy)
+{
+	if (!pDummy)
+		return false;
+	int index = CPools::GetDummyPool()->GetJustIndex(pDummy);
+#ifdef FIX_BUGS
+	if (index < 0 || index >= CPools::GetDummyPool()->GetSize())
+#else
+	if (index < 0 || index > CPools::GetDummyPool()->GetSize())
+#endif
+		return false;
+	return pDummy->m_entryInfoList.first;
+}
diff --git a/src/entities/Dummy.h b/src/entities/Dummy.h
index 3717a01c..84b1ce1a 100644
--- a/src/entities/Dummy.h
+++ b/src/entities/Dummy.h
@@ -16,5 +16,4 @@ public:
 	static void operator delete(void*, size_t);
 };
 
-VALIDATE_SIZE(CDummy, 0x68);
-
+bool IsDummyPointerValid(CDummy* pDummy);
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index a9b6b2b8..41a2e2bd 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -28,6 +28,11 @@
 #include "Bones.h"
 #include "Debug.h"
 #include "Renderer.h"
+#include "Ped.h"
+#include "Dummy.h"
+#include "WindModifiers.h"
+
+//--MIAMI: file almost done (see TODO)
 
 int gBuildings;
 
@@ -52,18 +57,17 @@ CEntity::CEntity(void)
 	bRenderScorched = false;
 	bHasBlip = false;
 	bIsBIGBuilding = false;
-	bRenderDamaged = false;
+	bStreamBIGBuilding = false;
 
+	bRenderDamaged = false;
 	bBulletProof = false;
 	bFireProof = false;
 	bCollisionProof = false;
 	bMeleeProof = false;
 	bOnlyDamagedByPlayer = false;
 	bStreamingDontDelete = false;
-	bZoneCulled = false;
-	bZoneCulled2 = false;
-
 	bRemoveFromWorld = false;
+
 	bHasHitWall = false;
 	bImBeingRendered = false;
 	bTouchingWater = false;
@@ -71,13 +75,20 @@ CEntity::CEntity(void)
 	bDrawLast = false;
 	bNoBrightHeadLights = false;
 	bDoNotRender = false;
-
 	bDistanceFade = false;
+
+	m_flagE1 = false;
 	m_flagE2 = false;
+	bOffscreen = false;
+	bIsStaticWaitingForCollision = false;
+	bDontStream = false;
+	bUnderwater = false;
+	bHasPreRenderEffects = false;
 
 	m_scanCode = 0;
 	m_modelIndex = -1;
 	m_rwObject = nil;
+	m_area = AREA_MAIN_MAP;
 	m_randomSeed = CGeneral::GetRandomNumber();
 	m_pFirstReference = nil;
 }
@@ -269,6 +280,21 @@ CEntity::Remove(void)
 }
 
 void
+CEntity::SetModelIndex(uint32 id)
+{
+	m_modelIndex = id;
+	bHasPreRenderEffects = HasPreRenderEffects();
+	CreateRwObject();
+}
+
+void
+CEntity::SetModelIndexNoCreate(uint32 id)
+{
+	m_modelIndex = id;
+	bHasPreRenderEffects = HasPreRenderEffects();
+}
+
+void
 CEntity::CreateRwObject(void)
 {
 	CBaseModelInfo *mi;
@@ -298,10 +324,8 @@ CEntity::DeleteRwObject(void)
 			RpAtomicDestroy((RpAtomic*)m_rwObject);
 			RwFrameDestroy(f);
 		}else if(RwObjectGetType(m_rwObject) == rpCLUMP){
-#ifdef PED_SKIN
 			if(IsClumpSkinned((RpClump*)m_rwObject))
 				RpClumpForAllAtomics((RpClump*)m_rwObject, AtomicRemoveAnimFromSkinCB, nil);
-#endif
 			RpClumpDestroy((RpClump*)m_rwObject);
 		}
 		m_rwObject = nil;
@@ -332,14 +356,12 @@ CEntity::SetupBigBuilding(void)
 	bStreamingDontDelete = true;
 	bUsesCollision = false;
 	m_level = CTheZones::GetLevelFromPosition(&GetPosition());
-	if(m_level == LEVEL_NONE){
-		if(mi->GetTxdSlot() != CTxdStore::FindTxdSlot("generic")){
-			mi->SetTexDictionary("generic");
-			printf("%d:%s txd has been set to generic\n", m_modelIndex, mi->GetName());
-		}
-	}
-	if(mi->m_lodDistances[0] > 2000.0f)
+	if(mi->m_lodDistances[0] <= 2000.0f)
+		bStreamBIGBuilding = true;
+	if(mi->m_lodDistances[0] > 2500.0f || mi->m_ignoreDrawDist)
 		m_level = LEVEL_NONE;
+	else if(m_level == LEVEL_NONE)
+		printf("%s isn't in a level\n", mi->GetName());
 }
 
 CRect
@@ -363,19 +385,39 @@ CEntity::GetBoundRect(void)
 	return rect;
 }
 
+bool
+CEntity::HasPreRenderEffects(void)
+{
+	return IsTreeModel(GetModelIndex()) ||
+	   GetModelIndex() == MI_COLLECTABLE1 ||
+	   GetModelIndex() == MI_MONEY ||
+	   GetModelIndex() == MI_CARMINE ||
+	   GetModelIndex() == MI_NAUTICALMINE ||
+	   GetModelIndex() == MI_BRIEFCASE ||
+	   GetModelIndex() == MI_GRENADE ||
+	   GetModelIndex() == MI_MOLOTOV ||
+	   GetModelIndex() == MI_MISSILE ||
+	   GetModelIndex() == MI_BEACHBALL ||
+	   IsGlass(GetModelIndex()) ||
+	   IsObject() && ((CObject*)this)->bIsPickup ||
+	   IsLightWithPreRenderEffects(GetModelIndex());
+}
+
 void
 CEntity::PreRender(void)
 {
+	if (CModelInfo::GetModelInfo(GetModelIndex())->GetNum2dEffects() != 0)
+		ProcessLightsForEntity();
+
+	if(!bHasPreRenderEffects)
+		return;
+
 	switch(m_type){
 	case ENTITY_TYPE_BUILDING:
-		if(GetModelIndex() == MI_RAILTRACKS){
-			CShadows::StoreShadowForPole(this, 0.0f, -10.949f, 5.0f, 8.0f, 1.0f, 0);
-			CShadows::StoreShadowForPole(this, 0.0f, 10.949f, 5.0f, 8.0f, 1.0f, 1);
-		}else if(IsTreeModel(GetModelIndex())){
-			CShadows::StoreShadowForTree(this);
+		if(IsTreeModel(GetModelIndex())){
+			float dist = (TheCamera.GetPosition() - GetPosition()).Magnitude2D();
+			CObject::fDistToNearestTree = Min(CObject::fDistToNearestTree, dist);
 			ModifyMatrixForTreeInWind();
-		}else if(IsBannerModel(GetModelIndex())){
-			ModifyMatrixForBannerInWind();
 		}
 		break;
 	case ENTITY_TYPE_OBJECT:
@@ -395,22 +437,6 @@ CEntity::PreRender(void)
 				GetMatrix().UpdateRW();
 				UpdateRwFrame();
 			}
-		}else if(IsPickupModel(GetModelIndex())){
-			if(((CObject*)this)->bIsPickup){
-				CPickups::DoPickUpEffects(this);
-				GetMatrix().UpdateRW();
-				UpdateRwFrame();
-			}else if(GetModelIndex() == MI_GRENADE){
-				CMotionBlurStreaks::RegisterStreak((uintptr)this,
-					100, 100, 100,
-					GetPosition() - 0.07f*TheCamera.GetRight(),
-					GetPosition() + 0.07f*TheCamera.GetRight());
-			}else if(GetModelIndex() == MI_MOLOTOV){
-				CMotionBlurStreaks::RegisterStreak((uintptr)this,
-					0, 100, 0,
-					GetPosition() - 0.07f*TheCamera.GetRight(),
-					GetPosition() + 0.07f*TheCamera.GetRight());
-			}
 		}else if(GetModelIndex() == MI_MISSILE){
 			CVector pos = GetPosition();
 			float flicker = (CGeneral::GetRandomNumber() & 0xF)/(float)0x10;
@@ -433,12 +459,44 @@ CEntity::PreRender(void)
 				CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
 		}else if(IsGlass(GetModelIndex())){
 			PreRenderForGlassWindow();
+		}else if (((CObject*)this)->bIsPickup) {
+			CPickups::DoPickUpEffects(this);
+			GetMatrix().UpdateRW();
+			UpdateRwFrame();
+		} else if (GetModelIndex() == MI_GRENADE) {
+			CMotionBlurStreaks::RegisterStreak((uintptr)this,
+				100, 100, 100,
+				GetPosition() - 0.07f * TheCamera.GetRight(),
+				GetPosition() + 0.07f * TheCamera.GetRight());
+		} else if (GetModelIndex() == MI_MOLOTOV) {
+			CMotionBlurStreaks::RegisterStreak((uintptr)this,
+				0, 100, 0,
+				GetPosition() - 0.07f * TheCamera.GetRight(),
+				GetPosition() + 0.07f * TheCamera.GetRight());
+		}else if(GetModelIndex() == MI_BEACHBALL){
+			CVector pos = GetPosition();
+			CShadows::StoreShadowToBeRendered(SHADOWTYPE_DARK,
+				gpShadowPedTex, &pos,
+				0.4f, 0.0f, 0.0f, -0.4f,
+				CTimeCycle::GetShadowStrength(),
+				CTimeCycle::GetShadowStrength(),
+				CTimeCycle::GetShadowStrength(),
+				CTimeCycle::GetShadowStrength(),
+				20.0f, false, 1.0f);
 		}
 		// fall through
 	case ENTITY_TYPE_DUMMY:
 		if(GetModelIndex() == MI_TRAFFICLIGHTS){
 			CTrafficLights::DisplayActualLight(this);
 			CShadows::StoreShadowForPole(this, 2.957f, 0.147f, 0.0f, 16.0f, 0.4f, 0);
+		}else if(GetModelIndex() == MI_TRAFFICLIGHTS_VERTICAL){
+			CTrafficLights::DisplayActualLight(this);
+		}else if(GetModelIndex() == MI_TRAFFICLIGHTS_MIAMI){
+			CTrafficLights::DisplayActualLight(this);
+			CShadows::StoreShadowForPole(this, 4.819f, 1.315f, 0.0f, 16.0f, 0.4f, 0);
+		}else if(GetModelIndex() == MI_TRAFFICLIGHTS_TWOVERTICAL){
+			CTrafficLights::DisplayActualLight(this);
+			CShadows::StoreShadowForPole(this, 7.503f, 0.0f, 0.0f, 16.0f, 0.4f, 0);
 		}else if(GetModelIndex() == MI_SINGLESTREETLIGHTS1)
 			CShadows::StoreShadowForPole(this, 0.744f, 0.0f, 0.0f, 16.0f, 0.4f, 0);
 		else if(GetModelIndex() == MI_SINGLESTREETLIGHTS2)
@@ -447,19 +505,15 @@ CEntity::PreRender(void)
 			CShadows::StoreShadowForPole(this, 1.143f, 0.145f, 0.0f, 16.0f, 0.4f, 0);
 		else if(GetModelIndex() == MI_DOUBLESTREETLIGHTS)
 			CShadows::StoreShadowForPole(this, 0.0f, -0.048f, 0.0f, 16.0f, 0.4f, 0);
-		else if(GetModelIndex() == MI_STREETLAMP1 ||
-		        GetModelIndex() == MI_STREETLAMP2)
-			CShadows::StoreShadowForPole(this, 0.0f, 0.0f, 0.0f, 16.0f, 0.4f, 0);
 		break;
 	}
-
-	if (CModelInfo::GetModelInfo(GetModelIndex())->GetNum2dEffects() != 0)
-		ProcessLightsForEntity();
 }
 
 void
 CEntity::PreRenderForGlassWindow(void)
 {
+	if(((CSimpleModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_isArtistGlass)
+		return;
 	CGlass::AskForObjectToBeRenderedInGlass(this);
 	bIsVisible = false;
 }
@@ -480,8 +534,6 @@ CEntity::Render(void)
 bool
 CEntity::SetupLighting(void)
 {
-	DeActivateDirectional();
-	SetAmbientColours();
 	return false;
 }
 
@@ -567,13 +619,12 @@ CEntity::PruneReferences(void)
 	}
 }
 
-#ifdef PED_SKIN
 void
 CEntity::UpdateRpHAnim(void)
 {
-	RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-	RpHAnimHierarchyUpdateMatrices(hier);
-
+	if(IsClumpSkinned(GetClump())){
+		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
+		RpHAnimHierarchyUpdateMatrices(hier);
 #if 0
 	int i;
 	char buf[256];
@@ -602,8 +653,8 @@ CEntity::UpdateRpHAnim(void)
 	void RenderSkeleton(RpHAnimHierarchy *hier);
 	RenderSkeleton(hier);
 #endif
+	}
 }
-#endif
 
 void
 CEntity::AddSteamsFromGround(CVector *unused)
@@ -635,6 +686,15 @@ CEntity::AddSteamsFromGround(CVector *unused)
 		case 4:
 			CParticleObject::AddObject(POBJECT_DARK_SMOKE, pos, effect->particle.dir, effect->particle.scale, false);
 			break;
+// TODO(MIAMI): enable this once we have the particle objects
+/*
+		case 5:
+			CParticleObject::AddObject(POBJECT_WATER_FOUNTAIN_VERT, pos, effect->particle.dir, effect->particle.scale, false);
+			break;
+		case 6:
+			CParticleObject::AddObject(POBJECT_WATER_FOUNTAIN_HORIZ, pos, effect->particle.dir, effect->particle.scale, false);
+			break;
+*/
 		}
 	}
 }
@@ -659,80 +719,66 @@ CEntity::ProcessLightsForEntity(void)
 	for(i = 0; i < n; i++, flashTimer1 += 0x80, flashTimer2 += 0x100, flashTimer3 += 0x200){
 		effect = CModelInfo::GetModelInfo(GetModelIndex())->Get2dEffect(i);
 
-		if(effect->type != EFFECT_LIGHT)
-			continue;
-
-		pos = GetMatrix() * effect->pos;
+		switch(effect->type){
+		case EFFECT_LIGHT:
+			pos = GetMatrix() * effect->pos;
 
-		lightOn = false;
-		lightFlickering = false;
-		switch(effect->light.lightType){
-		case LIGHT_ON:
-			lightOn = true;
-			break;
-		case LIGHT_ON_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
-				lightOn = true;
-			break;
-		case LIGHT_FLICKER:
-			if((CTimer::GetTimeInMilliseconds() ^ m_randomSeed) & 0x60)
-				lightOn = true;
-			else
-				lightFlickering = true;
-			if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed) & 3)
+			lightOn = false;
+			lightFlickering = false;
+			switch(effect->light.lightType){
+			case LIGHT_ON:
 				lightOn = true;
-			break;
-		case LIGHT_FLICKER_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7 || CWeather::WetRoads > 0.5f){
+				break;
+			case LIGHT_ON_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+					lightOn = true;
+				break;
+			case LIGHT_FLICKER:
 				if((CTimer::GetTimeInMilliseconds() ^ m_randomSeed) & 0x60)
 					lightOn = true;
 				else
 					lightFlickering = true;
 				if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed) & 3)
 					lightOn = true;
-			}
-			break;
-		case LIGHT_FLASH1:
-			if((CTimer::GetTimeInMilliseconds() + flashTimer1) & 0x200)
-				lightOn = true;
-			break;
-		case LIGHT_FLASH1_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+				break;
+			case LIGHT_FLICKER_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7 || CWeather::WetRoads > 0.5f){
+					if((CTimer::GetTimeInMilliseconds() ^ m_randomSeed) & 0x60)
+						lightOn = true;
+					else
+						lightFlickering = true;
+					if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed) & 3)
+						lightOn = true;
+				}
+				break;
+			case LIGHT_FLASH1:
 				if((CTimer::GetTimeInMilliseconds() + flashTimer1) & 0x200)
 					lightOn = true;
-			break;
-		case LIGHT_FLASH2:
-			if((CTimer::GetTimeInMilliseconds() + flashTimer2) & 0x400)
-				lightOn = true;
-			break;
-		case LIGHT_FLASH2_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+				break;
+			case LIGHT_FLASH1_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+					if((CTimer::GetTimeInMilliseconds() + flashTimer1) & 0x200)
+						lightOn = true;
+				break;
+			case LIGHT_FLASH2:
 				if((CTimer::GetTimeInMilliseconds() + flashTimer2) & 0x400)
 					lightOn = true;
-			break;
-		case LIGHT_FLASH3:
-			if((CTimer::GetTimeInMilliseconds() + flashTimer3) & 0x800)
-				lightOn = true;
-			break;
-		case LIGHT_FLASH3_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+				break;
+			case LIGHT_FLASH2_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+					if((CTimer::GetTimeInMilliseconds() + flashTimer2) & 0x400)
+						lightOn = true;
+				break;
+			case LIGHT_FLASH3:
 				if((CTimer::GetTimeInMilliseconds() + flashTimer3) & 0x800)
 					lightOn = true;
-			break;
-		case LIGHT_RANDOM_FLICKER:
-			if(m_randomSeed > 16)
-				lightOn = true;
-			else{
-				if((CTimer::GetTimeInMilliseconds() ^ m_randomSeed*8) & 0x60)
-					lightOn = true;
-				else
-					lightFlickering = true;
-				if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed*8) & 3)
-					lightOn = true;
-			}
-			break;
-		case LIGHT_RANDOM_FLICKER_NIGHT:
-			if(CClock::GetHours() > 18 || CClock::GetHours() < 7){
+				break;
+			case LIGHT_FLASH3_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7)
+					if((CTimer::GetTimeInMilliseconds() + flashTimer3) & 0x800)
+						lightOn = true;
+				break;
+			case LIGHT_RANDOM_FLICKER:
 				if(m_randomSeed > 16)
 					lightOn = true;
 				else{
@@ -743,85 +789,143 @@ CEntity::ProcessLightsForEntity(void)
 					if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed*8) & 3)
 						lightOn = true;
 				}
+				break;
+			case LIGHT_RANDOM_FLICKER_NIGHT:
+				if(CClock::GetHours() > 18 || CClock::GetHours() < 7){
+					if(m_randomSeed > 16)
+						lightOn = true;
+					else{
+						if((CTimer::GetTimeInMilliseconds() ^ m_randomSeed*8) & 0x60)
+							lightOn = true;
+						else
+							lightFlickering = true;
+						if((CTimer::GetTimeInMilliseconds()>>11 ^ m_randomSeed*8) & 3)
+							lightOn = true;
+					}
+				}
+				break;
+			case LIGHT_BRIDGE_FLASH1:
+				if(CBridge::ShouldLightsBeFlashing() && CTimer::GetTimeInMilliseconds() & 0x200)
+					lightOn = true;
+				break;
+			case LIGHT_BRIDGE_FLASH2:
+				if(CBridge::ShouldLightsBeFlashing() && (CTimer::GetTimeInMilliseconds() & 0x1FF) < 60)
+					lightOn = true;
+				break;
+			}
+
+			if(effect->light.flags & LIGHTFLAG_HIDE_OBJECT){
+				if(lightOn)
+					bDoNotRender = false;
+				else
+					bDoNotRender = true;
+				return;
+			}
+
+			// Corona
+			if(lightOn)
+				CCoronas::RegisterCorona((uintptr)this + i,
+					effect->col.r, effect->col.g, effect->col.b, 255,
+					pos, effect->light.size, effect->light.dist,
+					effect->light.corona, effect->light.flareType, effect->light.roadReflection,
+					effect->light.flags&LIGHTFLAG_LOSCHECK, CCoronas::STREAK_OFF, 0.0f,
+					!!(effect->light.flags&LIGHTFLAG_LONG_DIST));
+			else if(lightFlickering)
+				CCoronas::RegisterCorona((uintptr)this + i,
+					0, 0, 0, 255,
+					pos, effect->light.size, effect->light.dist,
+					effect->light.corona, effect->light.flareType, effect->light.roadReflection,
+					effect->light.flags&LIGHTFLAG_LOSCHECK, CCoronas::STREAK_OFF, 0.0f,
+					!!(effect->light.flags&LIGHTFLAG_LONG_DIST));
+
+			// Pointlight
+			bool alreadyProcessedFog;
+			alreadyProcessedFog = false;
+			if(effect->light.range != 0.0f && lightOn){
+				if(effect->col.r == 0 && effect->col.g == 0 && effect->col.b == 0){
+					CPointLights::AddLight(CPointLights::LIGHT_POINT,
+						pos, CVector(0.0f, 0.0f, 0.0f),
+						effect->light.range,
+						0.0f, 0.0f, 0.0f,
+						CPointLights::FOG_NONE, true);
+				}else{
+					CPointLights::AddLight(CPointLights::LIGHT_POINT,
+						pos, CVector(0.0f, 0.0f, 0.0f),
+						effect->light.range,
+						effect->col.r*CTimeCycle::GetSpriteBrightness()/255.0f,
+						effect->col.g*CTimeCycle::GetSpriteBrightness()/255.0f,
+						effect->col.b*CTimeCycle::GetSpriteBrightness()/255.0f,
+						(effect->light.flags & LIGHTFLAG_FOG) >> 1,
+						true);
+					alreadyProcessedFog = true; 
+				}
 			}
-			break;
-		case LIGHT_BRIDGE_FLASH1:
-			if(CBridge::ShouldLightsBeFlashing() && CTimer::GetTimeInMilliseconds() & 0x200)
-				lightOn = true;
-			break;
-		case LIGHT_BRIDGE_FLASH2:
-			if(CBridge::ShouldLightsBeFlashing() && (CTimer::GetTimeInMilliseconds() & 0x1FF) < 60)
-				lightOn = true;
-			break;
-		}
 
-		// Corona
-		if(lightOn)
-			CCoronas::RegisterCorona((uintptr)this + i,
-				effect->col.r, effect->col.g, effect->col.b, 255,
-				pos, effect->light.size, effect->light.dist,
-				effect->light.corona, effect->light.flareType, effect->light.roadReflection,
-				effect->light.flags&LIGHTFLAG_LOSCHECK, CCoronas::STREAK_OFF, 0.0f);
-		else if(lightFlickering)
-			CCoronas::RegisterCorona((uintptr)this + i,
-				0, 0, 0, 255,
-				pos, effect->light.size, effect->light.dist,
-				effect->light.corona, effect->light.flareType, effect->light.roadReflection,
-				effect->light.flags&LIGHTFLAG_LOSCHECK, CCoronas::STREAK_OFF, 0.0f);
-
-		// Pointlight
-		if(effect->light.flags & LIGHTFLAG_FOG_ALWAYS){
-			CPointLights::AddLight(CPointLights::LIGHT_FOGONLY_ALWAYS,
-				pos, CVector(0.0f, 0.0f, 0.0f),
-				effect->light.range,
-				effect->col.r/255.0f, effect->col.g/255.0f, effect->col.b/255.0f,
-				CPointLights::FOG_ALWAYS, true);
-		}else if(effect->light.flags & LIGHTFLAG_FOG_NORMAL && lightOn && effect->light.range == 0.0f){
-			CPointLights::AddLight(CPointLights::LIGHT_FOGONLY,
-				pos, CVector(0.0f, 0.0f, 0.0f),
-				effect->light.range,
-				effect->col.r/255.0f, effect->col.g/255.0f, effect->col.b/255.0f,
-				CPointLights::FOG_NORMAL, true);
-		}else if(lightOn && effect->light.range != 0.0f){
-			if(effect->col.r == 0 && effect->col.g == 0 && effect->col.b == 0){
-				CPointLights::AddLight(CPointLights::LIGHT_POINT,
-					pos, CVector(0.0f, 0.0f, 0.0f),
-					effect->light.range,
-					0.0f, 0.0f, 0.0f,
-					CPointLights::FOG_NONE, true);
-			}else{
-				CPointLights::AddLight(CPointLights::LIGHT_POINT,
-					pos, CVector(0.0f, 0.0f, 0.0f),
-					effect->light.range,
-					effect->col.r*CTimeCycle::GetSpriteBrightness()/255.0f,
-					effect->col.g*CTimeCycle::GetSpriteBrightness()/255.0f,
-					effect->col.b*CTimeCycle::GetSpriteBrightness()/255.0f,
-					// half-useless because LIGHTFLAG_FOG_ALWAYS can't be on
-					(effect->light.flags & LIGHTFLAG_FOG) >> 1,
-					true);
+			if(!alreadyProcessedFog){
+				if(effect->light.flags & LIGHTFLAG_FOG_ALWAYS){
+					CPointLights::AddLight(CPointLights::LIGHT_FOGONLY_ALWAYS,
+						pos, CVector(0.0f, 0.0f, 0.0f),
+						0.0f,
+						effect->col.r/255.0f, effect->col.g/255.0f, effect->col.b/255.0f,
+						CPointLights::FOG_ALWAYS, true);
+				}else if(effect->light.flags & LIGHTFLAG_FOG_NORMAL && lightOn && effect->light.range == 0.0f){
+					CPointLights::AddLight(CPointLights::LIGHT_FOGONLY,
+						pos, CVector(0.0f, 0.0f, 0.0f),
+						0.0f,
+						effect->col.r/255.0f, effect->col.g/255.0f, effect->col.b/255.0f,
+						CPointLights::FOG_NORMAL, true);
+				}
 			}
-		}
 
-		// Light shadow
-		if(effect->light.shadowRange != 0.0f){
-			if(lightOn){
-				CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
-					effect->light.shadow, &pos,
-					effect->light.shadowRange, 0.0f,
-					0.0f, -effect->light.shadowRange,
-					128,
-					effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
-					effect->col.g*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
-					effect->col.b*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
-					15.0f, 1.0f, 40.0f, false, 0.0f);
-			}else if(lightFlickering){
-				CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
-					effect->light.shadow, &pos,
-					effect->light.shadowRange, 0.0f,
-					0.0f, -effect->light.shadowRange,
-					0, 0.0f, 0.0f, 0.0f,
-					15.0f, 1.0f, 40.0f, false, 0.0f);
+			// Light shadow
+			if(effect->light.shadowRange != 0.0f){
+				if(lightOn){
+					CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
+						effect->light.shadow, &pos,
+						effect->light.shadowRange, 0.0f,
+						0.0f, -effect->light.shadowRange,
+						128,
+						effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
+						effect->col.g*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
+						effect->col.b*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
+						15.0f, 1.0f, 40.0f, false, 0.0f);
+				}else if(lightFlickering){
+					CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
+						effect->light.shadow, &pos,
+						effect->light.shadowRange, 0.0f,
+						0.0f, -effect->light.shadowRange,
+						0, 0.0f, 0.0f, 0.0f,
+						15.0f, 1.0f, 40.0f, false, 0.0f);
+				}
+			}
+			break;
+
+		case EFFECT_SUNGLARE:
+			if(CWeather::SunGlare >= 0.0f){
+				CVector pos = GetMatrix() * effect->pos;
+				CVector glareDir = pos - GetPosition();
+				glareDir.Normalise();
+				CVector camDir = TheCamera.GetPosition() - pos;
+				float dist = camDir.Magnitude();
+				camDir *= 2.0f/dist;
+				glareDir += camDir;
+				glareDir.Normalise();
+				float camAngle = -DotProduct(glareDir, CTimeCycle::GetSunDirection());
+				if(camAngle > 0.0f){
+					float intens = Sqrt(camAngle) * CWeather::SunGlare;
+					pos += camDir;
+					CCoronas::RegisterCorona((uintptr)this + 33 + i,
+						intens * (CTimeCycle::GetSunCoreRed() + 2*255)/3.0f,
+						intens * (CTimeCycle::GetSunCoreGreen() + 2*255)/3.0f,
+						intens * (CTimeCycle::GetSunCoreBlue() + 2*255)/3.0f,
+						255,
+						pos, 0.5f*CWeather::SunGlare*Sqrt(dist), 120.0f,
+						CCoronas::TYPE_STAR, CCoronas::FLARE_NONE,
+						CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF,
+						CCoronas::STREAK_OFF, 0.0f);
+				}
 			}
+			break;
 		}
 	}
 }
@@ -844,27 +948,31 @@ CEntity::ModifyMatrixForTreeInWind(void)
 	CMatrix mat(GetMatrix().m_attachment);
 
 	if(CWeather::Wind >= 0.5){
-		t = m_randomSeed + 16*CTimer::GetTimeInMilliseconds();
+		t = m_randomSeed + 8*CTimer::GetTimeInMilliseconds();
 		f = (t & 0xFFF)/(float)0x1000;
 		flutter = f * WindTabel[(t>>12)+1 & 0xF] +
 			(1.0f - f) * WindTabel[(t>>12) & 0xF] +
 			1.0f;
-		strength = CWeather::Wind < 0.8f ? 0.008f : 0.014f;
+		strength = -0.015f*CWeather::Wind;
 	}else if(CWeather::Wind >= 0.2){
 		t = (uintptr)this + CTimer::GetTimeInMilliseconds();
 		f = (t & 0xFFF)/(float)0x1000;
 		flutter = Sin(f * 6.28f);
-		strength = 0.008f;
+		strength = -0.008f;
 	}else{
 		t = (uintptr)this + CTimer::GetTimeInMilliseconds();
 		f = (t & 0xFFF)/(float)0x1000;
 		flutter = Sin(f * 6.28f);
-		strength = 0.005f;
+		strength = -0.005f;
 	}
 
 	mat.GetUp().x = strength * flutter;
+	if(IsPalmTreeModel(GetModelIndex()))
+		mat.GetUp().x += -0.07f*CWeather::Wind;
 	mat.GetUp().y = mat.GetUp().x;
 
+	CWindModifiers::FindWindModifier(GetPosition(), &mat.GetUp().x, &mat.GetUp().y);
+
 	mat.UpdateRW();
 	UpdateRwFrame();
 }
@@ -876,6 +984,7 @@ float BannerWindTabel[] = {
 	0.28f, 0.28f, 0.22f, 0.1f, 0.0f, -0.1f, -0.17f, -0.12f
 };
 
+//--MIAMI: unused
 void
 CEntity::ModifyMatrixForBannerInWind(void)
 {
@@ -946,32 +1055,37 @@ CEntity::SaveEntityFlags(uint8*& buf)
 	if (bRenderScorched) tmp |= BIT(20);
 	if (bHasBlip) tmp |= BIT(21);
 	if (bIsBIGBuilding) tmp |= BIT(22);
-	if (bRenderDamaged) tmp |= BIT(23);
+	if (bStreamBIGBuilding) tmp |= BIT(23);
 
-	if (bBulletProof) tmp |= BIT(24);
-	if (bFireProof) tmp |= BIT(25);
-	if (bCollisionProof)  tmp |= BIT(26);
-	if (bMeleeProof) tmp |= BIT(27);
-	if (bOnlyDamagedByPlayer) tmp |= BIT(28);
-	if (bStreamingDontDelete) tmp |= BIT(29);
-	if (bZoneCulled) tmp |= BIT(30);
-	if (bZoneCulled2) tmp |= BIT(31);
+	if (bRenderDamaged) tmp |= BIT(24);
+	if (bBulletProof) tmp |= BIT(25);
+	if (bFireProof) tmp |= BIT(26);
+	if (bCollisionProof)  tmp |= BIT(27);
+	if (bMeleeProof) tmp |= BIT(28);
+	if (bOnlyDamagedByPlayer) tmp |= BIT(29);
+	if (bStreamingDontDelete) tmp |= BIT(30);
+	if (bRemoveFromWorld) tmp |= BIT(31);
 
 	WriteSaveBuf<uint32>(buf, tmp);
 
 	tmp = 0;
 
-	if (bRemoveFromWorld) tmp |= BIT(0);
-	if (bHasHitWall) tmp |= BIT(1);
-	if (bImBeingRendered)  tmp |= BIT(2);
-	if (bTouchingWater) tmp |= BIT(3);
-	if (bIsSubway) tmp |= BIT(4);
-	if (bDrawLast) tmp |= BIT(5);
-	if (bNoBrightHeadLights) tmp |= BIT(6);
-	if (bDoNotRender) tmp |= BIT(7);
+	if (bHasHitWall) tmp |= BIT(0);
+	if (bImBeingRendered)  tmp |= BIT(1);
+	if (bTouchingWater) tmp |= BIT(2);
+	if (bIsSubway) tmp |= BIT(3);
+	if (bDrawLast) tmp |= BIT(4);
+	if (bNoBrightHeadLights) tmp |= BIT(5);
+	if (bDoNotRender) tmp |= BIT(6);
+	if (bDistanceFade) tmp |= BIT(7);
 
-	if (bDistanceFade) tmp |= BIT(8);
+	if (m_flagE1) tmp |= BIT(8);
 	if (m_flagE2) tmp |= BIT(9);
+	if (bOffscreen) tmp |= BIT(10);
+	if (bIsStaticWaitingForCollision) tmp |= BIT(11);
+	if (bDontStream) tmp |= BIT(12);
+	if (bUnderwater) tmp |= BIT(13);
+	if (bHasPreRenderEffects) tmp |= BIT(14);
 
 	WriteSaveBuf<uint32>(buf, tmp);
 }
@@ -999,30 +1113,50 @@ CEntity::LoadEntityFlags(uint8*& buf)
 	bRenderScorched = !!(tmp & BIT(20));
 	bHasBlip = !!(tmp & BIT(21));
 	bIsBIGBuilding = !!(tmp & BIT(22));
-	bRenderDamaged = !!(tmp & BIT(23));
+	bStreamBIGBuilding = !!(tmp & BIT(23));
 
-	bBulletProof = !!(tmp & BIT(24));
-	bFireProof = !!(tmp & BIT(25));
-	bCollisionProof = !!(tmp & BIT(26));
-	bMeleeProof = !!(tmp & BIT(27));
-	bOnlyDamagedByPlayer = !!(tmp & BIT(28));
-	bStreamingDontDelete = !!(tmp & BIT(29));
-	bZoneCulled = !!(tmp & BIT(30));
-	bZoneCulled2 = !!(tmp & BIT(31));
+	bRenderDamaged = !!(tmp & BIT(24));
+	bBulletProof = !!(tmp & BIT(25));
+	bFireProof = !!(tmp & BIT(26));
+	bCollisionProof = !!(tmp & BIT(27));
+	bMeleeProof = !!(tmp & BIT(28));
+	bOnlyDamagedByPlayer = !!(tmp & BIT(29));
+	bStreamingDontDelete = !!(tmp & BIT(30));
+	bRemoveFromWorld = !!(tmp & BIT(31));
 
 	tmp = ReadSaveBuf<uint32>(buf);
 
-	bRemoveFromWorld = !!(tmp & BIT(0));
-	bHasHitWall = !!(tmp & BIT(1));
-	bImBeingRendered = !!(tmp & BIT(2));
-	bTouchingWater = !!(tmp & BIT(3));
-	bIsSubway = !!(tmp & BIT(4));
-	bDrawLast = !!(tmp & BIT(5));
-	bNoBrightHeadLights = !!(tmp & BIT(6));
-	bDoNotRender = !!(tmp & BIT(7));
+	bHasHitWall = !!(tmp & BIT(0));
+	bImBeingRendered = !!(tmp & BIT(1));
+	bTouchingWater = !!(tmp & BIT(2));
+	bIsSubway = !!(tmp & BIT(3));
+	bDrawLast = !!(tmp & BIT(4));
+	bNoBrightHeadLights = !!(tmp & BIT(5));
+	bDoNotRender = !!(tmp & BIT(6));
+	bDistanceFade = !!(tmp & BIT(7));
 
-	bDistanceFade = !!(tmp & BIT(8));
+	m_flagE1 = !!(tmp & BIT(8));
 	m_flagE2 = !!(tmp & BIT(9));
+	bOffscreen = !!(tmp & BIT(10));
+	bIsStaticWaitingForCollision = !!(tmp & BIT(11));
+	bDontStream = !!(tmp & BIT(12));
+	bUnderwater = !!(tmp & BIT(13));
+	bHasPreRenderEffects = !!(tmp & BIT(14));
 }
 
 #endif
+
+bool IsEntityPointerValid(CEntity* pEntity)
+{
+	if (!pEntity)
+		return false;
+	switch (pEntity->GetType()) {
+	case ENTITY_TYPE_NOTHING: return false;
+	case ENTITY_TYPE_BUILDING: return IsBuildingPointerValid((CBuilding*)pEntity);
+	case ENTITY_TYPE_VEHICLE: return IsVehiclePointerValid((CVehicle*)pEntity);
+	case ENTITY_TYPE_PED: return IsPedPointerValid((CPed*)pEntity);
+	case ENTITY_TYPE_OBJECT: return IsObjectPointerValid((CObject*)pEntity);
+	case ENTITY_TYPE_DUMMY: return IsDummyPointerValid((CDummy*)pEntity);
+	}
+	return false;
+}
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index eca462cd..c3e4cc3b 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -30,6 +30,7 @@ enum eEntityStatus : uint8
 	STATUS_PLANE,
 	STATUS_PLAYER_REMOTE,
 	STATUS_PLAYER_DISABLED,
+	STATUS_GHOST
 };
 
 class CEntity : public CPlaceable
@@ -59,36 +60,42 @@ public:
 	uint32 bRenderScorched : 1;
 	uint32 bHasBlip : 1;
 	uint32 bIsBIGBuilding : 1;			// Set if this entity is a big building
-	uint32 bRenderDamaged : 1;			// use damaged LOD models for objects with applicable damage
+	uint32 bStreamBIGBuilding : 1;	// set when draw dist <= 2000
 
 	// flagsC
+	uint32 bRenderDamaged : 1;			// use damaged LOD models for objects with applicable damage
 	uint32 bBulletProof : 1;
 	uint32 bFireProof : 1;
 	uint32 bCollisionProof : 1;
 	uint32 bMeleeProof : 1;
 	uint32 bOnlyDamagedByPlayer : 1;
 	uint32 bStreamingDontDelete : 1;	// Dont let the streaming remove this 
-	uint32 bZoneCulled : 1;
-	uint32 bZoneCulled2 : 1;    // only treadables+10m
+	uint32 bRemoveFromWorld : 1;		// remove this entity next time it should be processed
 
 	// flagsD
-	uint32 bRemoveFromWorld : 1;		// remove this entity next time it should be processed
 	uint32 bHasHitWall : 1;				// has collided with a building (changes subsequent collisions)
 	uint32 bImBeingRendered : 1;		// don't delete me because I'm being rendered
 	uint32 bTouchingWater : 1;	// used by cBuoyancy::ProcessBuoyancy
 	uint32 bIsSubway : 1;	// set when subway, but maybe different meaning?
 	uint32 bDrawLast : 1;				// draw object last
 	uint32 bNoBrightHeadLights : 1;
-	uint32 bDoNotRender : 1;
+	uint32 bDoNotRender : 1;	//-- only applies to CObjects apparently
+	uint32 bDistanceFade : 1;			// Fade entity because it is far away
 
 	// flagsE
-	uint32 bDistanceFade : 1;			// Fade entity because it is far away
+	uint32 m_flagE1 : 1;
 	uint32 m_flagE2 : 1;
+	uint32 bOffscreen : 1;               // offscreen flag. This can only be trusted when it is set to true
+	uint32 bIsStaticWaitingForCollision : 1; // this is used by script created entities - they are static until the collision is loaded below them
+	uint32 bDontStream : 1;              // tell the streaming not to stream me
+	uint32 bUnderwater : 1;              // this object is underwater change drawing order
+	uint32 bHasPreRenderEffects : 1; // Object has a prerender effects attached to it
 
 	uint16 m_scanCode;
 	uint16 m_randomSeed;
 	int16 m_modelIndex;
-	uint16 m_level;	// int16
+	int8 m_level;
+	int8 m_area;
 	CReference *m_pFirstReference;
 
 public:
@@ -97,7 +104,7 @@ public:
 	eEntityStatus GetStatus() const { return (eEntityStatus)m_status; }
 	void SetStatus(eEntityStatus status) { m_status = status; }
 	CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); }
-	bool IsStatic(void) { return bIsStatic; }
+	bool IsStatic(void) { return bIsStatic || bIsStaticWaitingForCollision; }
 #ifdef COMPATIBLE_SAVES
 	void SaveEntityFlags(uint8*& buf);
 	void LoadEntityFlags(uint8*& buf);
@@ -106,12 +113,12 @@ public:
 #endif
 
 	CEntity(void);
-	~CEntity(void);
+	virtual ~CEntity(void);
 
 	virtual void Add(void);
 	virtual void Remove(void);
-	virtual void SetModelIndex(uint32 id) { m_modelIndex = id; CreateRwObject(); }
-	virtual void SetModelIndexNoCreate(uint32 id) { m_modelIndex = id; }
+	virtual void SetModelIndex(uint32 id);
+	virtual void SetModelIndexNoCreate(uint32 id);
 	virtual void CreateRwObject(void);
 	virtual void DeleteRwObject(void);
 	virtual CRect GetBoundRect(void);
@@ -149,9 +156,12 @@ public:
 	bool GetIsOnScreenComplex(void);
 	bool IsVisible(void) { return m_rwObject && bIsVisible && GetIsOnScreen(); }
 	bool IsVisibleComplex(void) { return m_rwObject && bIsVisible && GetIsOnScreenComplex(); }
+// TODO(MIAMI):
+	bool IsEntityOccluded(void) { return false; }
 	int16 GetModelIndex(void) const { return m_modelIndex; }
 	void UpdateRwFrame(void);
 	void SetupBigBuilding(void);
+	bool HasPreRenderEffects(void);
 
 	void AttachToRwObject(RwObject *obj);
 	void DetachFromRwObject(void);
@@ -173,4 +183,4 @@ public:
 	static void AddSteamsFromGround(CPtrList& list);
 };
 
-VALIDATE_SIZE(CEntity, 0x64);
+bool IsEntityPointerValid(CEntity*);
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index e89b4858..090eae6b 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1,7 +1,9 @@
 #include "common.h"
 
 #include "World.h"
+#include "General.h"
 #include "Timer.h"
+#include "Stats.h"
 #include "ModelIndices.h"
 #include "Treadable.h"
 #include "Vehicle.h"
@@ -15,8 +17,12 @@
 #include "CarCtrl.h"
 #include "DMAudio.h"
 #include "Automobile.h"
+#include "Bike.h"
+#include "Pickups.h"
 #include "Physical.h"
 
+//--MIAMI: file done
+
 CPhysical::CPhysical(void)
 {
 	int i;
@@ -41,6 +47,7 @@ CPhysical::CPhysical(void)
 		m_aCollisionRecords[i] = nil;
 
 	m_bIsVehicleBeingShifted = false;
+	bJustCheckCollision = false;
 
 	m_nDamagePieceType = 0;
 	m_fDamageImpulse = 0.0f;
@@ -56,21 +63,22 @@ CPhysical::CPhysical(void)
 	bIsHeavy = false;
 	bAffectedByGravity = true;
 	bInfiniteMass = false;
+	m_phy_flagA08 = false;
 	bIsInWater = false;
 	bHitByTrain = false;
 	bSkipLineCol = false;
 
 	m_fDistanceTravelled = 0.0f;
-	m_treadable[PATH_CAR] = nil;
-	m_treadable[PATH_PED] = nil;
 
-	m_phy_flagA10 = false;
 	m_phy_flagA20 = false;
 
 #ifdef FIX_BUGS
 	m_nSurfaceTouched = SURFACE_DEFAULT;
 #endif
 	m_nZoneLevel = LEVEL_NONE;
+
+	bIsFrozen = false;
+	bDontLoadCollision = false;
 }
 
 CPhysical::~CPhysical(void)
@@ -225,7 +233,8 @@ CPhysical::GetBoundRect(void)
 void
 CPhysical::AddToMovingList(void)
 {
-	m_movingListNode = CWorld::GetMovingEntityList().InsertItem(this);
+	if (!bIsStaticWaitingForCollision)
+		m_movingListNode = CWorld::GetMovingEntityList().InsertItem(this);
 }
 
 void
@@ -274,17 +283,6 @@ void
 CPhysical::AddCollisionRecord_Treadable(CEntity *ent)
 {
 	if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){
-		CTreadable *t = (CTreadable*)ent;
-		if(t->m_nodeIndices[PATH_PED][0] >= 0 ||
-		   t->m_nodeIndices[PATH_PED][1] >= 0 ||
-		   t->m_nodeIndices[PATH_PED][2] >= 0 ||
-		   t->m_nodeIndices[PATH_PED][3] >= 0)
-			m_treadable[PATH_PED] = t;
-		if(t->m_nodeIndices[PATH_CAR][0] >= 0 ||
-		   t->m_nodeIndices[PATH_CAR][1] >= 0 ||
-		   t->m_nodeIndices[PATH_CAR][2] >= 0 ||
-		   t->m_nodeIndices[PATH_CAR][3] >= 0)
-			m_treadable[PATH_CAR] = t;
 	}
 }
 
@@ -417,18 +415,26 @@ CPhysical::GetSpeed(const CVector &r)
 void
 CPhysical::ApplyMoveSpeed(void)
 {
-	GetMatrix().Translate(m_vecMoveSpeed * CTimer::GetTimeStep());
+	if(bIsFrozen)
+		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+	else
+		GetMatrix().Translate(m_vecMoveSpeed * CTimer::GetTimeStep());
 }
 
+
 void
 CPhysical::ApplyTurnSpeed(void)
 {
-	// Move the coordinate axes by their speed
-	// Note that this denormalizes the matrix
-	CVector turnvec = m_vecTurnSpeed*CTimer::GetTimeStep();
-	GetRight() += CrossProduct(turnvec, GetRight());
-	GetForward() += CrossProduct(turnvec, GetForward());
-	GetUp() += CrossProduct(turnvec, GetUp());
+	if(bIsFrozen){
+		m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+	}else{
+		// Move the coordinate axes by their speed
+		// Note that this denormalizes the matrix
+		CVector turnvec = m_vecTurnSpeed*CTimer::GetTimeStep();
+		GetRight() += CrossProduct(turnvec, GetRight());
+		GetForward() += CrossProduct(turnvec, GetForward());
+		GetUp() += CrossProduct(turnvec, GetUp());
+	}
 }
 
 void
@@ -472,6 +478,23 @@ CPhysical::ApplySpringCollision(float springConst, CVector &springDir, CVector &
 	return true;
 }
 
+bool
+CPhysical::ApplySpringCollisionAlt(float springConst, CVector &springDir, CVector &point, float springRatio, float bias, CVector &forceDir)
+{
+	float compression = 1.0f - springRatio;
+	if(compression > 0.0f){
+		if(DotProduct(springDir, forceDir) > 0.0f)
+			forceDir *= -1.0f;
+		float step = Min(CTimer::GetTimeStep(), 3.0f);
+		float impulse = GRAVITY*m_fMass*step * springConst * compression * bias*2.0f;
+		if(bIsHeavy)
+			impulse *= 0.75f;
+		ApplyMoveForce(forceDir*impulse);
+		ApplyTurnForce(forceDir*impulse, point);
+	}
+	return true;
+}
+
 // What exactly is speed?
 bool
 CPhysical::ApplySpringDampening(float damping, CVector &springDir, CVector &point, CVector &speed)
@@ -480,6 +503,8 @@ CPhysical::ApplySpringDampening(float damping, CVector &springDir, CVector &poin
 	float speedB = DotProduct(GetSpeed(point), springDir);
 	float step = Min(CTimer::GetTimeStep(), 3.0f);
 	float impulse = -damping * (speedA + speedB)/2.0f * m_fMass * step * 0.53f;
+	if(bIsHeavy)
+		impulse *= 2.0f;
 
 	// what is this?
 	float a = m_fTurnMass / ((point.MagnitudeSqr() + 1.0f) * 2.0f * m_fMass);
@@ -513,9 +538,11 @@ void
 CPhysical::ApplyAirResistance(void)
 {
 	if(m_fAirResistance > 0.1f){
-		float f = Pow(m_fAirResistance, CTimer::GetTimeStep());
-		m_vecMoveSpeed *= f;
-		m_vecTurnSpeed *= f;
+		if(GetStatus() != STATUS_GHOST){ 
+			float f = Pow(m_fAirResistance, CTimer::GetTimeStep());
+			m_vecMoveSpeed *= f;
+			m_vecTurnSpeed *= f;
+		}
 	}else{
 		float f = Pow(1.0f/(m_fAirResistance*0.5f*m_vecMoveSpeed.MagnitudeSqr() + 1.0f), CTimer::GetTimeStep());
 		m_vecMoveSpeed *= f;
@@ -523,7 +550,6 @@ CPhysical::ApplyAirResistance(void)
 	}
 }
 
-
 bool
 CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, float &impulseB)
 {
@@ -531,6 +557,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 	CPhysical *A = this;
 	CObject *Bobj = (CObject*)B;
 
+	bool foo = false;	// TODO: what does this mean?
 	bool ispedcontactA = false;
 	bool ispedcontactB = false;
 
@@ -546,7 +573,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 	if(A->bPedPhysics){
 		if(A->IsPed() && ((CPed*)A)->IsPlayer() && B->IsVehicle() &&
 		   (B->GetStatus() == STATUS_ABANDONED || B->GetStatus() == STATUS_WRECKED || A->bHasHitWall))
-			massFactorB = 2200.0f / B->m_fMass;
+			massFactorB = 1.0f/(Max(B->m_fMass - 2000.0f, 0.0f)/5000.0f + 1.0f);
 		else
 			massFactorB = 10.0f;
 
@@ -555,8 +582,13 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 	}else
 		massFactorB = B->bIsHeavy ? 2.0f : 1.0f;
 
+	if(B->bInfiniteMass && !B->m_phy_flagA08){
+		ispedcontactB = false;
+		foo = true;
+	}
+
 	float speedA, speedB;
-	if(B->IsStatic()){
+	if(B->IsStatic() && !foo){
 		if(A->bPedPhysics){
 			speedA = DotProduct(A->m_vecMoveSpeed, colpoint.normal);
 			if(speedA < 0.0f){
@@ -566,8 +598,11 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 					if(impulseA > Bobj->m_fUprootLimit){
 						if(IsGlass(B->GetModelIndex()))
 							CGlass::WindowRespondsToCollision(B, impulseA, A->m_vecMoveSpeed, colpoint.point, false);
-						else if(!B->bInfiniteMass)
+						else if(!B->bInfiniteMass){
 							B->bIsStatic = false;
+							CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 2;
+							CStats::PropertyDestroyed += CGeneral::GetRandomNumberInRange(30, 60);
+						}
 					}else{
 						if(IsGlass(B->GetModelIndex()))
 							CGlass::WindowRespondsToSoftCollision(B, impulseA);
@@ -619,6 +654,9 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 						if(model == MI_FIRE_HYDRANT && !Bobj->bHasBeenDamaged){
 							CParticleObject::AddObject(POBJECT_FIRE_HYDRANT, B->GetPosition() - CVector(0.0f, 0.0f, 0.5f), true);
 							Bobj->bHasBeenDamaged = true;
+						}else if(model == MI_PARKINGMETER || model == MI_PARKINGMETER2){
+							CPickups::CreateSomeMoney(GetPosition(), CGeneral::GetRandomNumber()%100);
+							Bobj->bHasBeenDamaged = true;
 						}else if(B->IsObject() && !IsExplosiveThingModel(model))
 							Bobj->bHasBeenDamaged = true;
 					}else{
@@ -641,7 +679,7 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 	
 		if(B->IsStatic())
 			return false;
-		if(!B->bInfiniteMass)
+		if(!B->bInfiniteMass && !B->m_phy_flagA08)
 			B->AddToMovingList();
 	}
 
@@ -651,19 +689,36 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 		// negative if A is moving towards B
 		speedA = DotProduct(A->m_vecMoveSpeed, colpoint.normal);
 		// positive if B is moving towards A
-		// not interested in how much B moves into A apparently?
-		// only interested in cases where A collided into B
-		speedB = DotProduct(B->m_vecMoveSpeed, colpoint.normal);
-		float speedSum = Max(0.0f, DotProduct(B->m_vecMoveSpeed, colpoint.normal));
-		// A has moved into B
+		float speedB = DotProduct(B->m_vecMoveSpeed, colpoint.normal);
+
+		bool affectB = false;
+		float mA = A->m_fMass;;
+		float mB = B->m_fMass;;
+		float speedSum;
+		if(((CPed*)A)->GetPedState() == PED_FOLLOW_PATH){
+			affectB = true;	
+			speedSum = (2.0f*mA*speedA + mB*speedB)/(2.0f*mA + mB);
+		}else{
+			speedSum = Max(speedB, 0.0f);
+		}
+
 		if(speedA < speedSum){
 			if(A->bHasHitWall)
 				eA = speedSum;
 			else
 				eA = speedSum - (speedA - speedSum) * (A->m_fElasticity+B->m_fElasticity)/2.0f;
-			impulseA = (eA-speedA) * A->m_fMass * massFactorA;
+			impulseA = (eA-speedA) * mA;
 			if(!A->bInfiniteMass)
-				A->ApplyMoveForce(colpoint.normal*(impulseA/massFactorA));
+				A->ApplyMoveForce(colpoint.normal*impulseA);
+			if(affectB && speedB < speedSum){
+				if(B->bHasHitWall)
+					eB = speedSum;
+				else
+					eB = speedSum - (speedB - speedSum) * (A->m_fElasticity+B->m_fElasticity)/2.0f;
+				impulseB = -(eB-speedB) * mB;
+				if(!B->bInfiniteMass)
+					B->ApplyMoveForce(colpoint.normal*-impulseB);
+			}
 			return true;
 		}
 	}else if(A->bPedPhysics){
@@ -673,7 +728,11 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 
 		float mA = A->m_fMass*massFactorA;
 		float mB = B->GetMassTweak(pointposB, colpoint.normal, massFactorB);
-		float speedSum = (mB*speedB + mA*speedA)/(mA + mB);
+		float speedSum;
+		if(foo)
+			speedSum = speedB;
+		else
+			speedSum = (mB*speedB + mA*speedA)/(mA + mB);
 		if(speedA < speedSum){
 			if(A->bHasHitWall)
 				eA = speedSum;
@@ -804,13 +863,52 @@ CPhysical::ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, fl
 }
 
 bool
+CPhysical::ApplyCollision(CColPoint &colpoint, float &impulse)
+{
+	float speed;
+	if(bPedPhysics){
+		speed = DotProduct(m_vecMoveSpeed, colpoint.normal);
+		if(speed < 0.0f){
+			impulse = -speed * m_fMass;
+			ApplyMoveForce(colpoint.normal*impulse);
+			return true;
+		}
+	}else{
+		CVector pointpos = colpoint.point - GetPosition();
+		speed = DotProduct(GetSpeed(pointpos), colpoint.normal);
+
+		if(speed < 0.0f){
+			float mass = GetMass(pointpos, colpoint.normal);
+			impulse = -(m_fElasticity + 1.0f) * speed * mass;
+			CVector f = colpoint.normal*impulse;
+			if(IsVehicle()){
+				f.x *= 1.4f;
+				f.y *= 1.4f;
+				if(colpoint.normal.z < 0.7f)
+					f.z *= 0.3f;
+			}
+			if(!bInfiniteMass){
+				ApplyMoveForce(f);
+				if(!IsVehicle() || !CWorld::bNoMoreCollisionTorque)
+					ApplyTurnForce(f, pointpos);
+			}
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool
 CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CVector &moveSpeed, CVector &turnSpeed)
 {
 	float normalSpeed;
-	float e;
 	CVector speed;
 	CVector vImpulse;
 
+	if(GetModelIndex() == MI_BEACHBALL && B != (CEntity*)FindPlayerPed())
+		((CObject*)this)->m_nBeachballBounces = 0;
+
 	if(bPedPhysics){
 		normalSpeed = DotProduct(m_vecMoveSpeed, colpoint.normal);
 		if(normalSpeed < 0.0f){
@@ -823,28 +921,61 @@ CPhysical::ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CV
 		speed = GetSpeed(pointpos);
 		normalSpeed = DotProduct(speed, colpoint.normal);
 		if(normalSpeed < 0.0f){
-			float minspeed = 1.3f*GRAVITY * CTimer::GetTimeStep();
-#ifdef GTA3_1_1_PATCH
-			if ((IsObject() || IsVehicle() && (GetUp().z < -0.3f || ((CVehicle*)this)->IsBike() && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED))) &&
-#else
-			if((IsObject() || IsVehicle() && GetUp().z < -0.3f) &&
-#endif
-			   !bHasContacted &&
+			int16 elasticityType = 0;
+			float mass = GetMass(pointpos, colpoint.normal);
+			float minspeed = GRAVITY * CTimer::GetTimeStep();
+
+			if(IsObject())
+				elasticityType = 1;
+			else if(IsVehicle() && !bIsInWater){
+				if(((CVehicle*)this)->IsBike() && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED)){
+					minspeed *= 1.3f;
+					elasticityType = 3;
+				}else if(((CVehicle*)this)->IsBoat()){
+					minspeed *= 1.2f;
+					elasticityType = 4;
+				}else if(GetUp().z < -0.3f){
+					minspeed *= 1.1f;
+					elasticityType = 2;
+				}
+			}
+
+			if(elasticityType == 1 && !bHasContacted &&
 			   Abs(m_vecMoveSpeed.x) < minspeed &&
 			   Abs(m_vecMoveSpeed.y) < minspeed &&
 			   Abs(m_vecMoveSpeed.z) < minspeed*2.0f)
-				e = -1.0f;
+				impulse = -0.98f * normalSpeed * mass;
+			if(elasticityType == 3 &&
+			   Abs(m_vecMoveSpeed.x) < minspeed &&
+			   Abs(m_vecMoveSpeed.y) < minspeed &&
+			   Abs(m_vecMoveSpeed.z) < minspeed*2.0f)
+				impulse = -0.8f * normalSpeed * mass;
+			else if(elasticityType == 2 &&
+			   Abs(m_vecMoveSpeed.x) < minspeed &&
+			   Abs(m_vecMoveSpeed.y) < minspeed &&
+			   Abs(m_vecMoveSpeed.z) < minspeed*2.0f)
+				impulse = -0.92f * normalSpeed * mass;
+			else if(elasticityType == 4 &&
+			   Abs(m_vecMoveSpeed.x) < minspeed &&
+			   Abs(m_vecMoveSpeed.y) < minspeed &&
+			   Abs(m_vecMoveSpeed.z) < minspeed*2.0f)
+				impulse = -0.8f * normalSpeed * mass;
+			else if(IsVehicle() && ((CVehicle*)this)->IsBoat() &&
+			   colpoint.surfaceB == SURFACE_WOOD_SOLID && colpoint.normal.z < 0.5f)
+				impulse = -(2.0f * m_fElasticity + 1.0f) * normalSpeed * mass;
 			else
-				e = -(m_fElasticity + 1.0f);
-			impulse = normalSpeed * e * GetMass(pointpos, colpoint.normal);
+				impulse = -(m_fElasticity + 1.0f) * normalSpeed * mass;
 
 			// ApplyMoveForce
 			vImpulse = colpoint.normal*impulse;
-			if(IsVehicle() &&
-			   (!bHasHitWall ||
-			    !(m_vecMoveSpeed.MagnitudeSqr() > 0.1 || !(B->IsBuilding() || ((CPhysical*)B)->bInfiniteMass))))
-				moveSpeed += vImpulse * 1.2f * (1.0f/m_fMass);
-			else
+			if(IsVehicle()){
+				if(!bHasHitWall ||
+				   !(m_vecMoveSpeed.MagnitudeSqr() > 0.1 || !(B->IsBuilding() || ((CPhysical*)B)->bInfiniteMass)))
+					moveSpeed += vImpulse * 1.2f * (1.0f/m_fMass);
+				else
+					moveSpeed += vImpulse * (1.0f/m_fMass);
+				vImpulse *= 0.8f;
+			}else
 				moveSpeed += vImpulse * (1.0f/m_fMass);
 
 			// ApplyTurnForce
@@ -1074,7 +1205,7 @@ CPhysical::ProcessShiftSectorList(CPtrList *lists)
 				canshift = true;
 			else
 				canshift = A->IsPed() &&
-					B->IsObject() && B->bIsStatic && !Bobj->bHasBeenDamaged;
+					B->IsObject() && B->IsStatic() && !Bobj->bHasBeenDamaged;
 			if(B == A ||
 			   B->m_scanCode == CWorld::GetCurrentScanCode() ||
 			   !B->bUsesCollision ||
@@ -1086,13 +1217,13 @@ CPhysical::ProcessShiftSectorList(CPtrList *lists)
 
 			if(B->IsBuilding())
 				skipShift = false;
-			else if(IsStreetLight(A->GetModelIndex()) &&
+			else if(IsLightWithoutShift(A->GetModelIndex()) &&
 			  (B->IsVehicle() || B->IsPed()) &&
 			  A->GetUp().z < 0.66f)
 				skipShift = true;
 			else if((A->IsVehicle() || A->IsPed()) &&
 			  B->GetUp().z < 0.66f &&
-			  IsStreetLight(B->GetModelIndex()))
+			  IsLightWithoutShift(B->GetModelIndex()))
 				skipShift = true;
 			else if(A->IsObject() && B->IsVehicle()){
 				CObject *Aobj = (CObject*)A;
@@ -1212,6 +1343,9 @@ CPhysical::ProcessCollisionSectorList_SimpleCar(CPtrList *lists)
 
 	A = (CPhysical*)this;
 
+	if(!A->bUsesCollision)
+		return false;
+
 	radius = A->GetBoundRadius();
 	A->GetBoundCentre(center);
 
@@ -1230,6 +1364,7 @@ CPhysical::ProcessCollisionSectorList_SimpleCar(CPtrList *lists)
 		for(listnode = list->first; listnode; listnode = listnode->next){
 			B = (CPhysical*)listnode->item;
 			if(B != A &&
+			   !(B->IsObject() && ((CObject*)B)->bIsStreetLight && B->GetUp().z < 0.66f) &&
 			   B->m_scanCode != CWorld::GetCurrentScanCode() &&
 			   B->bUsesCollision &&
 			   B->GetIsTouching(center, radius)){
@@ -1373,6 +1508,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 	int numResponses;
 	int i, j;
 	bool skipCollision, altcollision;
+	bool ret = false;
 	float impulseA = -1.0f;
 	float impulseB = -1.0f;
 
@@ -1393,9 +1529,9 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 			Bped = (CPed*)B;
 
 			bool isTouching = true;
-			if(B == A ||
+			if(!B->bUsesCollision ||
 			   B->m_scanCode == CWorld::GetCurrentScanCode() ||
-			   !B->bUsesCollision ||
+			   B == A ||			   
 			   !(isTouching = B->GetIsTouching(center, radius))){
 				if(!isTouching){
 					if(A->IsObject() && Aobj->m_pCollidingEntity == B)
@@ -1416,27 +1552,27 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 
 			if(B->IsBuilding())
 				skipCollision = false;
-			else if(IsStreetLight(A->GetModelIndex()) &&
+			else if(A->IsObject() && Aobj->bIsStreetLight &&
 			  (B->IsVehicle() || B->IsPed()) &&
 			  A->GetUp().z < 0.66f){
 				skipCollision = true;
 				A->bSkipLineCol = true;
 				Aobj->m_pCollidingEntity = B;
-			}else if((A->IsVehicle() || A->IsPed()) &&
-			  B->GetUp().z < 0.66f &&
-			  IsStreetLight(B->GetModelIndex())){
+			}else if(B->IsObject() && Bobj->bIsStreetLight &&
+			  (A->IsVehicle() || A->IsPed()) &&
+			  B->GetUp().z < 0.66f){
 				skipCollision = true;
 				A->bSkipLineCol = true;
 				Bobj->m_pCollidingEntity = A;
 			}else if(A->IsObject() && B->IsVehicle()){
-				if(A->GetModelIndex() == MI_CAR_BUMPER || A->GetModelIndex() == MI_FILES)
+				if(A->GetModelIndex() == MI_CAR_BUMPER)
 					skipCollision = true;
 				else if(Aobj->ObjectCreatedBy == TEMP_OBJECT ||
 				   Aobj->bHasBeenDamaged ||
 				   !Aobj->IsStatic()){
 					if(Aobj->m_pCollidingEntity == B)
 						skipCollision = true;
-					else{
+					else if(Aobj->m_nCollisionDamageEffect < DAMAGE_EFFECT_SMASH_COMPLETELY){
 						CMatrix inv;
 						CVector size = CModelInfo::GetModelInfo(A->GetModelIndex())->GetColModel()->boundingBox.GetSize();
 						size = A->GetMatrix() * size;
@@ -1448,14 +1584,14 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 					}
 				}
 			}else if(B->IsObject() && A->IsVehicle()){
-				if(B->GetModelIndex() == MI_CAR_BUMPER || B->GetModelIndex() == MI_FILES)
+				if(B->GetModelIndex() == MI_CAR_BUMPER)
 					skipCollision = true;
 				else if(Bobj->ObjectCreatedBy == TEMP_OBJECT ||
 				   Bobj->bHasBeenDamaged ||
 				   !Bobj->IsStatic()){
 					if(Bobj->m_pCollidingEntity == A)
 						skipCollision = true;
-					else{
+					else if(Bobj->m_nCollisionDamageEffect < DAMAGE_EFFECT_SMASH_COMPLETELY){
 						CMatrix inv;
 						CVector size = CModelInfo::GetModelInfo(B->GetModelIndex())->GetColModel()->boundingBox.GetSize();
 						size = B->GetMatrix() * size;
@@ -1465,14 +1601,16 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 						}
 					}
 				}
-			}else if(IsBodyPart(A->GetModelIndex()) && B->IsPed()){
+			}else if(A->GetModelIndex() == MI_GRENADE && B->IsPed() &&
+			  A->GetPosition().z < B->GetPosition().z){
 				skipCollision = true;
-			}else if(A->IsPed() && IsBodyPart(B->GetModelIndex())){
+			}else if(B->GetModelIndex() == MI_GRENADE && A->IsPed() &&
+			  B->GetPosition().z < A->GetPosition().z){
 				skipCollision = true;
 				A->bSkipLineCol = true;
 			}else if(A->IsPed() && Aped->m_pCollidingEntity == B){
 				skipCollision = true;
-				if(!Aped->bKnockedUpIntoAir)
+				if(!Aped->bKnockedUpIntoAir || Aped->b158_4)
 					A->bSkipLineCol = true;
 			}else if(B->IsPed() && Bped->m_pCollidingEntity == A){
 				skipCollision = true;
@@ -1487,7 +1625,11 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 
 			if(!A->bUsesCollision || skipCollision){
 				B->m_scanCode = CWorld::GetCurrentScanCode();
-				A->ProcessEntityCollision(B, aColPoints);
+				numCollisions = A->ProcessEntityCollision(B, aColPoints);
+				if(A->bJustCheckCollision && numCollisions > 0)
+					return true;
+				if(numCollisions == 0 && A == (CEntity*)FindPlayerPed() && Aped->m_pCollidingEntity == B)
+					Aped->m_pCollidingEntity = nil;
 			}else if(B->IsBuilding() || B->bIsStuck || B->bInfiniteMass || altcollision){
 
 				// This is the case where B doesn't move
@@ -1499,6 +1641,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 
 				CVector moveSpeed = { 0.0f, 0.0f, 0.0f };
 				CVector turnSpeed = { 0.0f, 0.0f, 0.0f };
+				float maxImpulseA = 0.0f;
 				numResponses = 0;
 				if(A->bHasContacted){
 					for(i = 0; i < numCollisions; i++){
@@ -1506,20 +1649,35 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 							continue;
 
 						numResponses++;
+						if(impulseA > maxImpulseA) maxImpulseA = impulseA;
 
-						if(impulseA > A->m_fDamageImpulse)
-							A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
+						if(A->IsVehicle()){
+							if(!(((CVehicle*)A)->IsBoat() && aColPoints[i].surfaceB == SURFACE_WOOD_SOLID) &&
+							   impulseA > A->m_fDamageImpulse)
+								A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
+
+							if(CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_SAND)
+								aColPoints[i].surfaceB = SURFACE_SAND;
 
-						float imp = impulseA;
-						if(A->IsVehicle() && A->GetUp().z < -0.6f &&
-						   Abs(A->m_vecMoveSpeed.x) < 0.05f &&
-						   Abs(A->m_vecMoveSpeed.y) < 0.05f)
-							imp *= 0.1f;
+							float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
+							float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
 
-						float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
-						float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
+							if(A->GetUp().z < -0.6f &&
+							   Abs(A->m_vecMoveSpeed.x) < 0.05f &&
+							   Abs(A->m_vecMoveSpeed.y) < 0.05f)
+								DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, 0.1f*impulseA, Max(turnSpeedDiff, moveSpeedDiff));
+							else
+								DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, impulseA, Max(turnSpeedDiff, moveSpeedDiff));
+
+						}else{
+							if(impulseA > A->m_fDamageImpulse)
+								A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
 
-						DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, imp, Max(turnSpeedDiff, moveSpeedDiff));
+							float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
+							float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
+
+							DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, impulseA, Max(turnSpeedDiff, moveSpeedDiff));
+						}
 					}
 				}else{
 					for(i = 0; i < numCollisions; i++){
@@ -1527,38 +1685,52 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 							continue;
 
 						numResponses++;
+						if(impulseA > maxImpulseA) maxImpulseA = impulseA;
+						float adhesion = CSurfaceTable::GetAdhesiveLimit(aColPoints[i]) / numCollisions;
 
-						if(impulseA > A->m_fDamageImpulse)
-							A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
-
-						float imp = impulseA;
-						if(A->IsVehicle() && A->GetUp().z < -0.6f &&
-						   Abs(A->m_vecMoveSpeed.x) < 0.05f &&
-						   Abs(A->m_vecMoveSpeed.y) < 0.05f)
-							imp *= 0.1f;
-
-						float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
-						float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
+						if(A->IsVehicle()){
+							if(((CVehicle*)A)->IsBoat() && aColPoints[i].surfaceB == SURFACE_WOOD_SOLID)
+								adhesion = 0.0f;
+							else if(impulseA > A->m_fDamageImpulse)
+								A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
 
-						DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, imp, Max(turnSpeedDiff, moveSpeedDiff));
+							if(CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_SAND)
+								aColPoints[i].surfaceB = SURFACE_SAND;
 
-						float adhesion = CSurfaceTable::GetAdhesiveLimit(aColPoints[i]) / numCollisions;
+							float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
+							float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
 
-						if(A->GetModelIndex() == MI_RCBANDIT)
-							adhesion *= 0.2f;
-						else if(IsBoatModel(A->GetModelIndex())){
-							if(aColPoints[i].normal.z > 0.6f){
-								if(CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_LOOSE)
-									adhesion *= 3.0f;
-							}else
-								adhesion = 0.0f;
-						}else if(A->IsVehicle()){
-							if(A->GetStatus() == STATUS_WRECKED)
+							if(A->GetUp().z < -0.6f &&
+							   Abs(A->m_vecMoveSpeed.x) < 0.05f &&
+							   Abs(A->m_vecMoveSpeed.y) < 0.05f)
+								DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, 0.1f*impulseA, Max(turnSpeedDiff, moveSpeedDiff));
+							else
+								DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, impulseA, Max(turnSpeedDiff, moveSpeedDiff));
+
+
+							if(A->GetModelIndex() == MI_RCBANDIT)
+								adhesion *= 0.2f;
+							else if(((CVehicle*)A)->IsBoat()){
+								if(aColPoints[i].normal.z > 0.6f){
+									if(CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_LOOSE ||
+									   CSurfaceTable::GetAdhesionGroup(aColPoints[i].surfaceB) == ADHESIVE_SAND)
+										adhesion *= 3.0f;
+								}else
+									adhesion = 0.0f;
+							}else if(A->GetStatus() == STATUS_WRECKED)
 								adhesion *= 3.0f;
 							else if(A->GetUp().z > 0.3f)
 								adhesion = 0.0f;
 							else
 								adhesion *= Min(5.0f, 0.03f*impulseA + 1.0f);
+						}else{
+							if(impulseA > A->m_fDamageImpulse)
+								A->SetDamagedPieceRecord(aColPoints[i].pieceA, impulseA, B, aColPoints[i].normal);
+
+							float turnSpeedDiff = A->m_vecTurnSpeed.MagnitudeSqr();
+							float moveSpeedDiff = A->m_vecMoveSpeed.MagnitudeSqr();
+
+							DMAudio.ReportCollision(A, B, aColPoints[i].surfaceA, aColPoints[i].surfaceB, impulseA, Max(turnSpeedDiff, moveSpeedDiff));
 						}
 
 						if(A->ApplyFriction(adhesion, aColPoints[i]))
@@ -1577,7 +1749,13 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 						A->m_vecMoveFriction.y += moveSpeed.y * -0.3f / numCollisions;
 						A->m_vecTurnFriction += turnSpeed * -0.3f / numCollisions;
 					}
-					return true;
+
+					if(B->IsObject() && Bobj->m_nCollisionDamageEffect && maxImpulseA > 20.0f)
+						Bobj->ObjectDamage(maxImpulseA);
+
+					if(!CWorld::bSecondShift)
+						return true;
+					ret = true;
 				}
 			}else{
 
@@ -1717,9 +1895,25 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 					// BUG? not impulseA?
 					if(Bobj->m_nCollisionDamageEffect && maxImpulseB > 20.0f)
 						Bobj->ObjectDamage(maxImpulseB);
+					else if(Bobj->m_nCollisionDamageEffect >= DAMAGE_EFFECT_SMASH_COMPLETELY){
+						CMatrix inv;
+						CVector size = CModelInfo::GetModelInfo(B->GetModelIndex())->GetColModel()->boundingBox.GetSize();
+						size = B->GetMatrix() * size;
+						if(size.z < B->GetPosition().z ||
+						   (Invert(A->GetMatrix(), inv) * size).z < 0.0f)
+							Bobj->ObjectDamage(50.0f);
+					}
 				}else if(A->IsObject() && A->bUsesCollision && B->IsVehicle()){
 					if(Aobj->m_nCollisionDamageEffect && maxImpulseB > 20.0f)
 						Aobj->ObjectDamage(maxImpulseB);
+					else if(Aobj->m_nCollisionDamageEffect >= DAMAGE_EFFECT_SMASH_COMPLETELY){
+						CMatrix inv;
+						CVector size = CModelInfo::GetModelInfo(A->GetModelIndex())->GetColModel()->boundingBox.GetSize();
+						size = A->GetMatrix() * size;
+						if(size.z < A->GetPosition().z ||
+						   (Invert(B->GetMatrix(), inv) * size).z < 0.0f)
+							Aobj->ObjectDamage(50.0f);
+					}
 				}
 
 				if(B->GetStatus() == STATUS_SIMPLE){
@@ -1728,13 +1922,15 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
 						CCarCtrl::SwitchVehicleToRealPhysics((CVehicle*)B);
 				}
 
-				return true;
+				if(!CWorld::bSecondShift)
+					return true;
+				ret = true;
 			}
 			
 		}
 	}
 
-	return false;
+	return ret;
 }
 
 bool
@@ -1763,6 +1959,8 @@ CPhysical::CheckCollision_SimpleCar(void)
 	return false;
 }
 
+float PHYSICAL_SHIFT_SPEED_DAMP = 0.707f;
+
 void
 CPhysical::ProcessShift(void)
 {
@@ -1772,6 +1970,13 @@ CPhysical::ProcessShift(void)
 		bIsInSafePosition = true;
 		RemoveAndAdd();
 	}else{
+		CPhysical *surf;
+		if(bHasHitWall && IsPed() && (surf = ((CPed*)this)->m_pCurrentPhysSurface, surf == nil || !surf->bInfiniteMass || surf->m_phy_flagA08) ||
+		   CWorld::bSecondShift){
+			m_vecMoveSpeed *= Pow(PHYSICAL_SHIFT_SPEED_DAMP, CTimer::GetTimeStep());
+			m_vecTurnSpeed *= Pow(PHYSICAL_SHIFT_SPEED_DAMP, CTimer::GetTimeStep());
+		}
+
 		CMatrix matrix(GetMatrix());
 		ApplyMoveSpeed();
 		ApplyTurnSpeed();
@@ -1789,11 +1994,19 @@ CPhysical::ProcessShift(void)
 		m_bIsVehicleBeingShifted = false;
 		if(hasshifted){
 			CWorld::AdvanceCurrentScanCode();
+			bool hadCollision = false;
 			for(node = m_entryInfoList.first; node; node = node->next)
 				if(ProcessCollisionSectorList(node->sector->m_lists)){
-					GetMatrix() = matrix;
-					return;
+					if(!CWorld::bSecondShift){
+						GetMatrix() = matrix;
+						return;
+					}
+					hadCollision = true;
 				}
+			if(hadCollision){
+				GetMatrix() = matrix;
+				return;
+			}
 		}
 		bIsStuck = false;
 		bIsInSafePosition = true;
@@ -1805,6 +2018,9 @@ CPhysical::ProcessShift(void)
 // x is the number of units (m) we would like to step
 #define NUMSTEPS(x) ceil(Sqrt(distSq) * (1.0f/(x)))
 
+float HIGHSPEED_ELASTICITY_MULT_PED = 2.0f;
+float HIGHSPEED_ELASTICITY_MULT_COPCAR = 2.0f;
+
 void
 CPhysical::ProcessCollision(void)
 {
@@ -1836,31 +2052,78 @@ CPhysical::ProcessCollision(void)
 
 	// Save current state
 	CMatrix savedMatrix(GetMatrix());
+	float savedElasticity = m_fElasticity;
+	CVector savedMoveSpeed = m_vecMoveSpeed;
 	float savedTimeStep = CTimer::GetTimeStep();
 
 	int8 n = 1;	// The number of steps we divide the time step into
 	float step = 0.0f;	// divided time step
 	float distSq = m_vecMoveSpeed.MagnitudeSqr() * sq(CTimer::GetTimeStep());
 
-	if(IsPed() && (distSq >= sq(0.2f) || ped->IsPlayer())){
-		if(ped->IsPlayer())
-			n = Max(NUMSTEPS(0.2f), 2.0f);
-		else
-			n = NUMSTEPS(0.3f);
+	if(IsPed() && (distSq >= sq(0.3f) || ped->IsPlayer())){
+		if(ped->IsPlayer()){
+			if(ped->m_pCurrentPhysSurface)
+				n = Max(NUMSTEPS(0.15f), 4.0f);
+			else
+				n = Max(NUMSTEPS(0.3f), 2.0f);
+		}else
+			n = NUMSTEPS(0.45f);
 		step = savedTimeStep / n;
+		if(!ped->IsPlayer())
+			ped->m_fElasticity *= HIGHSPEED_ELASTICITY_MULT_PED;
 	}else if(IsVehicle() && distSq >= sq(0.4f)){
 		if(GetStatus() == STATUS_PLAYER)
 			n = NUMSTEPS(0.2f);
 		else
 			n = distSq > 0.32f ? NUMSTEPS(0.3f) : NUMSTEPS(0.4f);
 		step = savedTimeStep / n;
-	}else if(IsObject()){
+
+		CVector bbox = GetColModel()->boundingBox.GetSize();
+		float relDistX = Abs(DotProduct(m_vecMoveSpeed, GetRight())) * CTimer::GetTimeStep() / bbox.x;
+		float relDistY = Abs(DotProduct(m_vecMoveSpeed, GetForward())) * CTimer::GetTimeStep() / bbox.y;
+		float relDistZ = Abs(DotProduct(m_vecMoveSpeed, GetUp())) * CTimer::GetTimeStep() / bbox.z;
+		if(Max(relDistX, Max(relDistY, relDistZ)) < 1.0f){
+			// check if we can get away with simplified processing
+
+			ApplyMoveSpeed();
+			ApplyTurnSpeed();
+			GetMatrix().Reorthogonalise();
+			bSkipLineCol = false;
+			m_bIsVehicleBeingShifted = false;
+
+			bJustCheckCollision = true;
+			bUsesCollision = false;
+			if(!CheckCollision()){
+				bJustCheckCollision = false;
+				bUsesCollision = true;
+				if(IsVehicle())
+					((CVehicle*)this)->bVehicleColProcessed = true;
+
+				bHitByTrain = false;
+				m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude();
+				bSkipLineCol = false;
+
+				bIsStuck = false;
+				bIsInSafePosition = true;
+				m_fElasticity = savedElasticity;
+				RemoveAndAdd();
+				return;
+			}
+			bJustCheckCollision = false;
+			bUsesCollision = true;
+			GetMatrix() = savedMatrix;
+			m_vecMoveSpeed = savedMoveSpeed;
+			if(IsVehicle() && ((CVehicle*)this)->bIsLawEnforcer)
+				m_fElasticity *= HIGHSPEED_ELASTICITY_MULT_COPCAR;
+		}
+	}else if(IsObject() && ((CObject*)this)->ObjectCreatedBy != TEMP_OBJECT){
 		int responsecase = ((CObject*)this)->m_nSpecialCollisionResponseCases;
 		if(responsecase == COLLRESPONSE_LAMPOST){
 			CVector speedUp = { 0.0f, 0.0f, 0.0f };
 			CVector speedDown = { 0.0f, 0.0f, 0.0f };
-			speedUp.z = GetBoundRadius();
-			speedDown.z = -speedUp.z;
+			CColModel *colModel = GetColModel();
+			speedUp.z = colModel->boundingBox.max.z;
+			speedDown.z = colModel->boundingBox.min.z;
 			speedUp = Multiply3x3(GetMatrix(), speedUp);
 			speedDown = Multiply3x3(GetMatrix(), speedDown);
 			speedUp = GetSpeed(speedUp);
@@ -1900,6 +2163,7 @@ CPhysical::ProcessCollision(void)
 				savedMatrix.GetPosition().z = GetPosition().z;
 			GetMatrix() = savedMatrix;
 			CTimer::SetTimeStep(savedTimeStep);
+			m_fElasticity = savedElasticity;
 			return;
 		}
 		if(IsPed() && m_vecMoveSpeed.z == 0.0f &&
@@ -1917,7 +2181,11 @@ CPhysical::ProcessCollision(void)
 				car->m_aSuspensionSpringRatio[2] = 1.0f;
 				car->m_aSuspensionSpringRatio[3] = 1.0f;
 			}else if(veh->m_vehType == VEHICLE_TYPE_BIKE){
-				assert(0 && "TODO - but unused");
+				CBike *bike = (CBike*)this;
+				bike->m_aSuspensionSpringRatio[0] = 1.0f;
+				bike->m_aSuspensionSpringRatio[1] = 1.0f;
+				bike->m_aSuspensionSpringRatio[2] = 1.0f;
+				bike->m_aSuspensionSpringRatio[3] = 1.0f;
 			}
 		}
 	}
@@ -1929,15 +2197,15 @@ CPhysical::ProcessCollision(void)
 	bSkipLineCol = false;
 	if(!m_vecMoveSpeed.IsZero() ||
 	   !m_vecTurnSpeed.IsZero() ||
-#ifdef GTA_TRAIN
 	   bHitByTrain ||
-#endif
 	   GetStatus() == STATUS_PLAYER ||
+	   IsVehicle() && ((CVehicle*)this)->bRestingOnPhysical ||
 	   IsPed() && ped->IsPlayer()){
 		if(IsVehicle())
 			((CVehicle*)this)->bVehicleColProcessed = true;
 		if(CheckCollision()){
 			GetMatrix() = savedMatrix;
+			m_fElasticity = savedElasticity;
 			return;
 		}
 	}
@@ -1947,5 +2215,6 @@ CPhysical::ProcessCollision(void)
 
 	bIsStuck = false;
 	bIsInSafePosition = true;
+	m_fElasticity = savedElasticity;
 	RemoveAndAdd();
 }
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index f8921a5c..926b9762 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -19,7 +19,6 @@ public:
 
 	int32 m_audioEntityId;
 	float m_phys_unused1;
-	CTreadable *m_treadable[2];	// car and ped
 	uint32 m_nLastTimeCollided;
 	CVector m_vecMoveSpeed;		// velocity
 	CVector m_vecTurnSpeed;		// angular velocity
@@ -40,7 +39,6 @@ public:
 	int8 m_phys_unused2;
 	uint8 m_nStaticFrames;
 	uint8 m_nCollisionRecords;
-	bool m_bIsVehicleBeingShifted;
 	CEntity *m_aCollisionRecords[PHYSICAL_MAX_COLLISIONRECORDS];
 
 	float m_fDistanceTravelled;
@@ -54,12 +52,17 @@ public:
 	uint8 bIsHeavy : 1;
 	uint8 bAffectedByGravity : 1;
 	uint8 bInfiniteMass : 1;
+	uint8 m_phy_flagA08 : 1;
 	uint8 bIsInWater : 1;
-	uint8 m_phy_flagA10 : 1; // unused
 	uint8 m_phy_flagA20 : 1; // unused
 	uint8 bHitByTrain : 1;
 	uint8 bSkipLineCol : 1;
 
+	uint8 bIsFrozen : 1;
+	uint8 bDontLoadCollision : 1;
+	uint8 m_bIsVehicleBeingShifted : 1;	// wrong name - also used on but never set for peds
+	uint8 bJustCheckCollision : 1;	// just see if there is a collision
+
 	uint8 m_nSurfaceTouched;
 	int8 m_nZoneLevel;
 
@@ -116,6 +119,17 @@ public:
 	void SetMoveSpeed(const CVector& speed) {
 		m_vecMoveSpeed = speed;
 	}
+	void AddToMoveSpeed(float x, float y, float z) {
+		m_vecMoveSpeed.x += x;
+		m_vecMoveSpeed.y += y;
+		m_vecMoveSpeed.z += z;
+	}
+	void AddToMoveSpeed(const CVector& addition) {
+		m_vecMoveSpeed += addition;
+	}
+	void AddToMoveSpeed(const CVector2D& addition) {
+		m_vecMoveSpeed += CVector(addition.x, addition.y, 0.0f);
+	}
 	const CVector &GetTurnSpeed() { return m_vecTurnSpeed; }
 	void SetTurnSpeed(float x, float y, float z) {
 		m_vecTurnSpeed.x = x;
@@ -144,11 +158,13 @@ public:
 	void ApplyFrictionTurnForce(const CVector &j, const CVector &p) { ApplyFrictionTurnForce(j.x, j.y, j.z, p.x, p.y, p.z); }
 	// springRatio: 1.0 fully extended, 0.0 fully compressed
 	bool ApplySpringCollision(float springConst, CVector &springDir, CVector &point, float springRatio, float bias);
+	bool ApplySpringCollisionAlt(float springConst, CVector &springDir, CVector &point, float springRatio, float bias, CVector &forceDir);
 	bool ApplySpringDampening(float damping, CVector &springDir, CVector &point, CVector &speed);
 	void ApplyGravity(void);
 	void ApplyFriction(void);
 	void ApplyAirResistance(void);
 	bool ApplyCollision(CPhysical *B, CColPoint &colpoint, float &impulseA, float &impulseB);
+	bool ApplyCollision(CColPoint &colpoint, float &impulse);
 	bool ApplyCollisionAlt(CEntity *B, CColPoint &colpoint, float &impulse, CVector &moveSpeed, CVector &turnSpeed);
 	bool ApplyFriction(CPhysical *B, float adhesiveLimit, CColPoint &colpoint);
 	bool ApplyFriction(float adhesiveLimit, CColPoint &colpoint);
@@ -159,5 +175,3 @@ public:
 	bool CheckCollision(void);
 	bool CheckCollision_SimpleCar(void);
 };
-
-VALIDATE_SIZE(CPhysical, 0x128);
diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h
index c3160f47..c3ab755e 100644
--- a/src/entities/Treadable.h
+++ b/src/entities/Treadable.h
@@ -8,10 +8,5 @@ public:
 	static void *operator new(size_t);
 	static void operator delete(void*, size_t);
 
-	int16 m_nodeIndices[2][12];	// first car, then ped
-
 	bool GetIsATreadable(void) { return true; }
 };
-
-VALIDATE_SIZE(CTreadable, 0x94);
-
diff --git a/src/extras/frontendoption.cpp b/src/extras/frontendoption.cpp
deleted file mode 100644
index 6ab2801c..00000000
--- a/src/extras/frontendoption.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "common.h"
-
-#ifdef CUSTOM_FRONTEND_OPTIONS
-#include "frontendoption.h"
-
-int numCustomFrontendOptions = 0;
-FrontendOption *customFrontendOptions;
-
-int optionCursor = -1;
-eMenuScreen currentMenu;
-
-void ChangeScreen(eMenuScreen screen, int option, bool fadeIn)
-{
-	FrontEndMenuManager.m_nPrevScreen = FrontEndMenuManager.m_nCurrScreen;
-	FrontEndMenuManager.m_nCurrScreen = screen;
-	FrontEndMenuManager.m_nCurrOption = option;
-	if (fadeIn)
-		FrontEndMenuManager.m_nMenuFadeAlpha = 0;
-}
-
-void GoBack(bool fadeIn)
-{
-	int screen = !FrontEndMenuManager.m_bGameNotLoaded ?
-		aScreens[FrontEndMenuManager.m_nCurrScreen].m_PreviousPage[1] : aScreens[FrontEndMenuManager.m_nCurrScreen].m_PreviousPage[0];
-	int option = !FrontEndMenuManager.m_bGameNotLoaded ?
-		aScreens[FrontEndMenuManager.m_nCurrScreen].m_ParentEntry[1] : aScreens[FrontEndMenuManager.m_nCurrScreen].m_ParentEntry[0];
-
-	FrontEndMenuManager.ThingsToDoBeforeGoingBack();
-
-	ChangeScreen((eMenuScreen)screen, option, fadeIn);
-}
-
-uint8
-GetNumberOfMenuOptions(int screen)
-{
-	uint8 Rows = 0;
-	for (int i = 0; i < NUM_MENUROWS; i++) {
-		if (aScreens[screen].m_aEntries[i].m_Action == MENUACTION_NOTHING)
-			break;
-
-		++Rows;
-	}
-	return Rows;
-}
-
-// Used before reloading in InitialiseChangedLanguageSettings and debugmenu
-void
-RemoveCustomFrontendOptions()
-{
-	for (int i = 0; i < MENUPAGES; i++) {
-		for (int j = 0; j < NUM_MENUROWS; j++) {
-			if (aScreens[i].m_aEntries[j].m_Action == MENUACTION_TRIGGERFUNC) {
-				int k;
-				for (k = j; k < NUM_MENUROWS-1; k++) {
-					memcpy(&aScreens[i].m_aEntries[k], &aScreens[i].m_aEntries[k+1], sizeof(CMenuScreen::CMenuEntry));
-				}
-				aScreens[i].m_aEntries[k].m_Action = MENUACTION_NOTHING;
-				aScreens[i].m_aEntries[k].m_EntryName[0] = '\0';
-				j--;
-			}
-		}
-	}
-	free(customFrontendOptions);
-	numCustomFrontendOptions = 0;
-}
-
-int8 RegisterNewOption(int screen)
-{
-	numCustomFrontendOptions++;
-	if (numCustomFrontendOptions == 1)
-		customFrontendOptions = (FrontendOption*)malloc(numCustomFrontendOptions * sizeof(FrontendOption));
-	else
-		customFrontendOptions = (FrontendOption*)realloc(customFrontendOptions, numCustomFrontendOptions * sizeof(FrontendOption));
-
-	uint8 nth = GetNumberOfMenuOptions(screen);
-	if (optionCursor < 0) {
-		if (optionCursor == -1) {
-			if (!strcmp(aScreens[screen].m_aEntries[nth - 1].m_EntryName, "FEDS_TB") || !strcmp(aScreens[screen].m_aEntries[nth - 1].m_EntryName, "FESZ_CA")) {
-				// Move back button one below
-				memcpy(&aScreens[screen].m_aEntries[nth], &aScreens[screen].m_aEntries[nth - 1], sizeof(CMenuScreen::CMenuEntry));
-				nth--;
-			}
-		}
-	} else {
-		if (aScreens[screen].m_aEntries[optionCursor].m_Action != MENUACTION_NOTHING) {
-			for (int i = nth - 1; i >= optionCursor; i--) {
-				memcpy(&aScreens[screen].m_aEntries[i + 1], &aScreens[screen].m_aEntries[i], sizeof(CMenuScreen::CMenuEntry));
-			}
-		}
-		nth = optionCursor;
-		optionCursor++;
-	}
-
-	aScreens[screen].m_aEntries[nth].m_Action = MENUACTION_TRIGGERFUNC;
-	aScreens[screen].m_aEntries[nth].m_TargetMenu = numCustomFrontendOptions - 1;
-	aScreens[screen].m_aEntries[nth].m_EntryName[0] = 1; // just something to fool it
-	return nth;
-}
-
-void FrontendOptionSetPosition(eMenuScreen screen, int8 option)
-{
-	currentMenu = screen;
-	optionCursor = option;
-}
-
-void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc)
-{
-	int8 screenOptionOrder = RegisterNewOption(currentMenu);
-
-	FrontendOption& option = customFrontendOptions[numCustomFrontendOptions - 1];
-	option.screen = currentMenu;
-	option.type = FEOPTION_SELECT;
-	option.leftText = leftText;
-	option.rightTexts = rightTexts;
-	option.numRightTexts = numRightTexts;
-	option.value = var;
-	option.displayedValue = *var;
-	option.onlyApplyOnEnter = onlyApplyOnEnter;
-	option.changeFunc = changeFunc;
-	option.screenOptionOrder = screenOptionOrder;
-	option.returnPrevPageFunc = returnPrevPageFunc;
-}
-
-void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc drawFunc, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc)
-{
-	int8 screenOptionOrder = RegisterNewOption(currentMenu);
-
-	FrontendOption& option = customFrontendOptions[numCustomFrontendOptions - 1];
-	option.screen = currentMenu;
-	option.type = FEOPTION_DYNAMIC;
-	option.drawFunc = drawFunc;
-	option.buttonPressFunc = buttonPressFunc;
-	option.leftText = leftText;
-	option.onlyApplyOnEnter = false;
-	option.screenOptionOrder = screenOptionOrder;
-	option.returnPrevPageFunc = returnPrevPageFunc;
-}
-
-void FrontendOptionAddRedirect(const wchar* text, eMenuScreen to, int8 selectedOption, bool fadeIn)
-{
-	int8 screenOptionOrder = RegisterNewOption(currentMenu);
-
-	FrontendOption &option = customFrontendOptions[numCustomFrontendOptions - 1];
-	option.screen = currentMenu;
-	option.type = FEOPTION_REDIRECT;
-	option.to = to;
-	option.option = selectedOption;
-	option.fadeIn = fadeIn;
-	option.leftText = text;
-	option.onlyApplyOnEnter = false;
-	option.screenOptionOrder = screenOptionOrder;
-	option.returnPrevPageFunc = nil;
-}
-
-void FrontendOptionAddBackButton(const wchar* text, bool fadeIn)
-{
-	int8 screenOptionOrder = RegisterNewOption(currentMenu);
-
-	FrontendOption& option = customFrontendOptions[numCustomFrontendOptions - 1];
-	option.screen = currentMenu;
-	option.type = FEOPTION_GOBACK;
-	option.fadeIn = fadeIn;
-	option.leftText = text;
-	option.onlyApplyOnEnter = false;
-	option.screenOptionOrder = screenOptionOrder;
-	option.returnPrevPageFunc = nil;
-}
-#endif
\ No newline at end of file
diff --git a/src/extras/frontendoption.h b/src/extras/frontendoption.h
deleted file mode 100644
index 7cfc09a7..00000000
--- a/src/extras/frontendoption.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-#include "common.h"
-
-#ifdef CUSTOM_FRONTEND_OPTIONS
-#include "Frontend.h"
-
-// Warning: All of the code relies on that you won't use more then NUM_MENUROWS(18) options on one page. Also congrats if you can make 18 options visible at once.
-
-
-// Static/select:	User allocates variable, passes it to function and it's set automatically from input among the strings given to function,
-//					then you can handle ChangeFunc and ReturnPrevPageFunc if needed.
-//
-// Dynamic:			Function doesn't accept value pointer, user should do operations with handling ButtonPressFunc.
-//					Right-side text can be set via DrawFunc, which is called on every draw. ReturnPrevPageFunc is also here if needed.
-
-#define FEOPTION_SELECT 0
-#define FEOPTION_DYNAMIC 1
-#define FEOPTION_REDIRECT 2
-#define FEOPTION_GOBACK 3
-
-#define FEOPTION_ACTION_LEFT 0
-#define FEOPTION_ACTION_RIGHT 1
-#define FEOPTION_ACTION_SELECT 2
-#define FEOPTION_ACTION_FOCUSLOSS 3
-
-void RemoveCustomFrontendOptions();
-void CustomFrontendOptionsPopulate();
-
-// for static and dynamic options
-typedef void (*ReturnPrevPageFunc)();
-
-// for static options
-typedef void (*ChangeFunc)(int8 displayedValue); // called before updating the value
-
-// for dynamic options
-typedef wchar* (*DrawFunc)(bool* disabled); // should return pointer to right text. *disabled = true will make it dark yellow
-typedef void (*ButtonPressFunc)(int8 action); // see FEOPTION_ACTIONs above
-
-struct FrontendOption
-{
-	int8 type;
-	int8 screenOptionOrder;
-	eMenuScreen screen;
-	const wchar* leftText;
-	ReturnPrevPageFunc returnPrevPageFunc;
-	
-	union {
-		// Only for dynamic
-		struct {
-			DrawFunc drawFunc;
-			ButtonPressFunc buttonPressFunc;
-		};
-
-		// Only for static/select
-		struct {
-			const wchar** rightTexts;
-			int8 numRightTexts;
-			int8 *value;
-			int8 displayedValue; // if onlyApplyOnEnter enabled
-			bool onlyApplyOnEnter;
-			ChangeFunc changeFunc;
-		};
-
-		// Only for redirect
-		struct {
-			eMenuScreen to;
-			int8 option;
-			bool fadeIn;
-		};
-	};
-};
-
-extern int numCustomFrontendOptions;
-extern FrontendOption* customFrontendOptions;
-
-// To be used in ButtonPressFunc / ChangeFunc(but that would be weird):
-void ChangeScreen(eMenuScreen screen, int option = 0, bool fadeIn = true);
-void GoBack(bool fadeIn = true);
-
-// If option is positive number, all calls will increase it before using it (you can think it as cursor). -1 means before the back button, -2 is end of page
-void FrontendOptionSetPosition(eMenuScreen screen, int8 option = -1);
-
-void FrontendOptionAddSelect(const wchar* leftText, const wchar** rightTexts, int8 numRightTexts, int8 *var, bool onlyApplyOnEnter, ChangeFunc changeFunc, ReturnPrevPageFunc returnPrevPageFunc);
-void FrontendOptionAddDynamic(const wchar* leftText, DrawFunc rightTextDrawFunc, ButtonPressFunc buttonPressFunc, ReturnPrevPageFunc returnPrevPageFunc);
-void FrontendOptionAddRedirect(const wchar* text, eMenuScreen to, int8 selectedOption = 0, bool fadeIn = true);
-void FrontendOptionAddBackButton(const wchar* text, bool fadeIn = true);
-#endif
\ No newline at end of file
diff --git a/src/math/Matrix.h b/src/math/Matrix.h
index d8920a65..2d721e93 100644
--- a/src/math/Matrix.h
+++ b/src/math/Matrix.h
@@ -82,7 +82,8 @@ public:
 		return *this;
 	}
 
-	CVector &GetPosition(void){ return *(CVector*)&m_matrix.pos; }
+	const CVector &GetPosition(void) const { return *(CVector*)&m_matrix.pos; }
+	CVector& GetPosition(void) { return *(CVector*)&m_matrix.pos; }
 	CVector &GetRight(void) { return *(CVector*)&m_matrix.right; }
 	CVector &GetForward(void) { return *(CVector*)&m_matrix.up; }
 	CVector &GetUp(void) { return *(CVector*)&m_matrix.at; }
@@ -133,13 +134,18 @@ public:
 	{
 		float *pFloatMatrix = (float*)&m_matrix;
 		for (int i = 0; i < 3; i++)
-#ifdef FIX_BUGS // BUGFIX from VC
 			for (int j = 0; j < 3; j++)
-#else
-			for (int j = 0; j < 4; j++)
-#endif
 				pFloatMatrix[i * 4 + j] *= scale;
 	}
+	void Scale(float sx, float sy, float sz)
+	{
+		float *pFloatMatrix = (float*)&m_matrix;
+		for (int i = 0; i < 3; i++){
+			pFloatMatrix[i * 4 + 0] *= sx;
+			pFloatMatrix[i * 4 + 1] *= sy;
+			pFloatMatrix[i * 4 + 2] *= sz;
+		}
+	}
 
 
 	void SetRotateXOnly(float angle){
@@ -259,6 +265,14 @@ public:
 		m_matrix.at.y = 0.0f;
 		m_matrix.at.z = 1.0f;
 	}
+	void SetTranslateOnly(float x, float y, float z) {
+		m_matrix.pos.x = x;
+		m_matrix.pos.y = y;
+		m_matrix.pos.z = z;
+	}
+	void SetTranslateOnly(const CVector& pos) {
+		SetTranslateOnly(pos.x, pos.y, pos.z);
+	}
 };
 
 
diff --git a/src/math/Vector2D.h b/src/math/Vector2D.h
index 0885a5d2..7bfccae6 100644
--- a/src/math/Vector2D.h
+++ b/src/math/Vector2D.h
@@ -11,9 +11,7 @@ public:
 	float Magnitude(void) const { return Sqrt(x*x + y*y); }
 	float MagnitudeSqr(void) const { return x*x + y*y; }
 
-	void Normalise(void);
-
-	void NormaliseSafe(void) {
+	void Normalise(void) {
 		float sq = MagnitudeSqr();
 		if(sq > 0.0f){
 			float invsqrt = RecipSqrt(sq);
diff --git a/src/math/math.cpp b/src/math/math.cpp
index 0cfc2ce9..0661dcac 100644
--- a/src/math/math.cpp
+++ b/src/math/math.cpp
@@ -5,19 +5,6 @@
 // TODO: move more stuff into here
 
 void
-CVector2D::Normalise(void)
-{
-	float sq = MagnitudeSqr();
-	assert(sq != 0.0f);	// just be safe here
-	//if(sq > 0.0f){
-		float invsqrt = RecipSqrt(sq);
-		x *= invsqrt;
-		y *= invsqrt;
-	//}else
-	//	x = 1.0f;
-}
-
-void
 CMatrix::SetRotate(float xAngle, float yAngle, float zAngle)
 {
 	float cX = Cos(xAngle);
diff --git a/src/modelinfo/BaseModelInfo.cpp b/src/modelinfo/BaseModelInfo.cpp
index a2779107..31bb2500 100644
--- a/src/modelinfo/BaseModelInfo.cpp
+++ b/src/modelinfo/BaseModelInfo.cpp
@@ -4,12 +4,14 @@
 #include "TxdStore.h"
 #include "2dEffect.h"
 #include "BaseModelInfo.h"
+#include "ModelInfo.h"
 
+//--MIAMI: file done
 
 CBaseModelInfo::CBaseModelInfo(ModelInfoType type)
 {
 	m_colModel = nil;
-	m_twodEffects = nil;
+	m_2dEffectsID = -1;
 	m_objectId = -1;
 	m_refCount = 0;
 	m_txdSlot = -1;
@@ -23,7 +25,7 @@ CBaseModelInfo::Shutdown(void)
 {
 	DeleteCollisionModel();
 	DeleteRwObject();
-	m_twodEffects = nil;
+	m_2dEffectsID = -1;
 	m_num2dEffects = 0;
 	m_txdSlot = -1;
 }
@@ -76,17 +78,17 @@ CBaseModelInfo::RemoveTexDictionaryRef(void)
 void
 CBaseModelInfo::Init2dEffects(void)
 {
-	m_twodEffects = nil;
+	m_2dEffectsID = -1;
 	m_num2dEffects = 0;
 }
 
 void
 CBaseModelInfo::Add2dEffect(C2dEffect *fx)
 {
-	if(m_twodEffects)
+	if(m_2dEffectsID >= 0)
 		m_num2dEffects++;
 	else{
-		m_twodEffects = fx;
+		m_2dEffectsID = CModelInfo::Get2dEffectStore().getIndex(fx);
 		m_num2dEffects = 1;
 	}
 }
@@ -94,8 +96,8 @@ CBaseModelInfo::Add2dEffect(C2dEffect *fx)
 C2dEffect*
 CBaseModelInfo::Get2dEffect(int n)
 {
-	if(m_twodEffects)
-		return &m_twodEffects[n];
+	if(m_2dEffectsID >= 0)
+		return CModelInfo::Get2dEffectStore().getItem(m_2dEffectsID+n);
 	else
 		return nil;
 }
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 783f871f..e7dd9e4b 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -2,18 +2,20 @@
 
 #include "Collision.h"
 
-#define MAX_MODEL_NAME (24)
+#define MAX_MODEL_NAME (21)
 
 enum ModelInfoType : uint8
 {
-	MITYPE_NA        = 0,
-	MITYPE_SIMPLE    = 1,
-	MITYPE_MLO       = 2,
-	MITYPE_TIME      = 3,
-	MITYPE_CLUMP     = 4,
-	MITYPE_VEHICLE   = 5,
-	MITYPE_PED       = 6,
-	MITYPE_XTRACOMPS = 7,
+	MITYPE_NA,
+	MITYPE_SIMPLE,
+	MITYPE_MLO,	// unused but still in enum
+	MITYPE_TIME,
+	MITYPE_WEAPON,
+	MITYPE_CLUMP,
+	MITYPE_VEHICLE,
+	MITYPE_PED,
+	MITYPE_XTRACOMPS,	// unused but still in enum
+	MITYPE_HAND	// xbox and mobile
 };
 VALIDATE_SIZE(ModelInfoType, 1);
 
@@ -23,14 +25,14 @@ class CBaseModelInfo
 {
 protected:
 	char         m_name[MAX_MODEL_NAME];
+	ModelInfoType m_type;
+	uint8        m_num2dEffects;
+	bool         m_bOwnsColModel;
 	CColModel   *m_colModel;
-	C2dEffect   *m_twodEffects;
+	int16        m_2dEffectsID;
 	int16        m_objectId;
 	uint16       m_refCount;
 	int16        m_txdSlot;
-	ModelInfoType m_type;
-	uint8        m_num2dEffects;
-	bool         m_bOwnsColModel;
 
 public:
 	CBaseModelInfo(ModelInfoType type);
@@ -40,13 +42,15 @@ public:
 	virtual RwObject *CreateInstance(RwMatrix *) = 0;
 	virtual RwObject *CreateInstance(void) = 0;
 	virtual RwObject *GetRwObject(void) = 0;
+	virtual void SetAnimFile(const char *file) {}
+	virtual void ConvertAnimFileIndex(void) {}
+	virtual int GetAnimFileIndex(void) { return -1; }
 
 	// one day it becomes virtual
 	ModelInfoType GetModelType() const { return m_type; }
-	bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
-	bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE ||
-		m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS;	// unused but what the heck
-	}
+	bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
+	bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; }
+	bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE;	}
 	char *GetName(void) { return m_name; }
 	void SetName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
 	void SetColModel(CColModel *col, bool owns = false){
@@ -69,5 +73,3 @@ public:
 	uint8 GetNum2dEffects() const { return m_num2dEffects; }
 	uint16 GetNumRefs() const { return m_refCount; }
 };
-
-VALIDATE_SIZE(CBaseModelInfo, 0x30);
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp
index 49198437..3fa9a36f 100644
--- a/src/modelinfo/ClumpModelInfo.cpp
+++ b/src/modelinfo/ClumpModelInfo.cpp
@@ -5,6 +5,9 @@
 #include "NodeName.h"
 #include "VisibilityPlugins.h"
 #include "ModelInfo.h"
+#include "AnimManager.h"
+
+//--MIAMI: file done
 
 void
 CClumpModelInfo::DeleteRwObject(void)
@@ -13,17 +16,17 @@ CClumpModelInfo::DeleteRwObject(void)
 		RpClumpDestroy(m_clump);
 		m_clump = nil;
 		RemoveTexDictionaryRef();
+		if(GetAnimFileIndex() != -1)
+			CAnimManager::RemoveAnimBlockRef(GetAnimFileIndex());
 	}
 }
 
-#ifdef PED_SKIN
 static RpAtomic*
 SetHierarchyForSkinAtomic(RpAtomic *atomic, void *data)
 {
 	RpSkinAtomicSetHAnimHierarchy(atomic, (RpHAnimHierarchy*)data);
 	return nil;
 }
-#endif
 
 RwObject*
 CClumpModelInfo::CreateInstance(void)
@@ -31,24 +34,17 @@ CClumpModelInfo::CreateInstance(void)
 	if(m_clump == nil)
 		return nil;
 	RpClump *clone = RpClumpClone(m_clump);
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clone)){
 		RpHAnimHierarchy *hier;
 		RpHAnimAnimation *anim;
 
 		hier = GetAnimHierarchyFromClump(clone);
 		assert(hier);
-		// This seems dangerous as only the first atomic will get a hierarchy
-		// can we guarantee this if hands and head are also in the clump?
 		RpClumpForAllAtomics(clone, SetHierarchyForSkinAtomic, hier);
 		anim = HAnimAnimationCreateForHierarchy(hier);
 		RpHAnimHierarchySetCurrentAnim(hier, anim);
 		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
-		// the rest is xbox only:
-		// RpSkinGetNumBones(RpSkinGeometryGetSkin(RpAtomicGetGeometry(IsClumpSkinned(clone))));
-		RpHAnimHierarchyUpdateMatrices(hier);
 	}
-#endif
 	return (RwObject*)clone;
 }
 
@@ -76,27 +72,18 @@ CClumpModelInfo::SetClump(RpClump *clump)
 	m_clump = clump;
 	CVisibilityPlugins::SetClumpModelInfo(m_clump, this);
 	AddTexDictionaryRef();
-	RpClumpForAllAtomics(clump, SetAtomicRendererCB, nil);
-
-#ifdef PED_SKIN
+	if(GetAnimFileIndex() != -1)
+		CAnimManager::AddAnimBlockRef(GetAnimFileIndex());
 	if(IsClumpSkinned(clump)){
 		int i;
 		RpHAnimHierarchy *hier;
 		RpAtomic *skinAtomic;
 		RpSkin *skin;
 
-		// mobile:
-//		hier = nil;
-//		RwFrameForAllChildren(RpClumpGetFrame(clump), GetHierarchyFromChildNodesCB, &hier);
-//		assert(hier);
-//		RpClumpForAllAtomics(clump, SetHierarchyForSkinAtomic, hier);
-//		skinAtomic = GetFirstAtomic(clump);
-
-		// xbox:
 		hier = GetAnimHierarchyFromClump(clump);
 		assert(hier);
-		RpSkinAtomicSetHAnimHierarchy(IsClumpSkinned(clump), hier);
-		skinAtomic = IsClumpSkinned(clump);
+		RpClumpForAllAtomics(clump, SetHierarchyForSkinAtomic, hier);
+		skinAtomic = GetFirstAtomic(clump);
 
 		assert(skinAtomic);
 		skin = RpSkinGeometryGetSkin(RpAtomicGetGeometry(skinAtomic));
@@ -110,12 +97,28 @@ CClumpModelInfo::SetClump(RpClump *clump)
 			weights->w3 /= sum;
 		}
 		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
-	}else
-#endif
-		// do not set on skinned clip because cutscene head is not compatible with player head
-		if(strncmp(GetName(), "playerh", 8) == 0)
-			RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
+	}
+}
 
+void
+CClumpModelInfo::SetAnimFile(const char *file)
+{
+	if(strcasecmp(file, "null") == 0)
+		return;
+
+	m_animFileName = new char[strlen(file)+1];
+	strcpy(m_animFileName, file);
+}
+
+void
+CClumpModelInfo::ConvertAnimFileIndex(void)
+{
+	if(m_animFileIndex != -1){
+		// we have a string pointer in that union
+		int32 index = CAnimManager::GetAnimationBlockIndex(m_animFileName);
+		delete[] m_animFileName;
+		m_animFileIndex = index;
+	}
 }
 
 void
@@ -147,6 +150,7 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data)
 	return assoc->frame ? nil : frame;
 }
 
+//--MIAMI: unused
 RwFrame*
 CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data)
 {
diff --git a/src/modelinfo/ClumpModelInfo.h b/src/modelinfo/ClumpModelInfo.h
index 58b6de11..0113d340 100644
--- a/src/modelinfo/ClumpModelInfo.h
+++ b/src/modelinfo/ClumpModelInfo.h
@@ -30,9 +30,13 @@ class CClumpModelInfo : public CBaseModelInfo
 {
 public:
 	RpClump *m_clump;
+	union {
+		int32 m_animFileIndex;
+		char *m_animFileName;
+	};
 
-	CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) {}
-	CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
+	CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) { m_animFileIndex = -1; }
+	CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) { m_animFileIndex = -1; }
 	~CClumpModelInfo() {}
 	void DeleteRwObject(void);
 	RwObject *CreateInstance(void);
@@ -40,6 +44,9 @@ public:
 	RwObject *GetRwObject(void) { return (RwObject*)m_clump; }
 
 	virtual void SetClump(RpClump *);
+	virtual void SetAnimFile(const char *file);
+	virtual void ConvertAnimFileIndex(void);
+	virtual int GetAnimFileIndex(void) { return m_animFileIndex; }
 
 	static RpAtomic *SetAtomicRendererCB(RpAtomic *atomic, void *data);
 	void SetFrameIds(RwObjectNameIdAssocation *assocs);
@@ -50,5 +57,4 @@ public:
 	static RwFrame *FillFrameArrayCB(RwFrame *frame, void *data);
 	static RwFrame *GetFrameFromId(RpClump *clump, int32 id);
 };
-
-VALIDATE_SIZE(CClumpModelInfo, 0x34);
+//static_assert(sizeof(CClumpModelInfo) == 0x34, "CClumpModelInfo: error");
diff --git a/src/modelinfo/MloModelInfo.cpp b/src/modelinfo/MloModelInfo.cpp
deleted file mode 100644
index 7535e6c5..00000000
--- a/src/modelinfo/MloModelInfo.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "common.h"
-
-#include "VisibilityPlugins.h"
-#include "ModelInfo.h"
-
-void
-CMloModelInfo::ConstructClump()
-{
-	m_clump = RpClumpCreate();
-	RwFrame *mainFrame = RwFrameCreate();
-	RwFrameSetIdentity(mainFrame);
-	RpClumpSetFrame(m_clump, mainFrame);
-
-	for (int i = firstInstance; i < lastInstance; i++) {
-		int modelId = CModelInfo::GetMloInstanceStore().store[i].m_modelIndex;
-		RwMatrix *attMat = CModelInfo::GetMloInstanceStore().store[i].GetMatrix().m_attachment;
-		CSimpleModelInfo *minfo = (CSimpleModelInfo*)CModelInfo::GetModelInfo(modelId);
-
-		if (minfo->m_atomics[0] != nil) {
-			RpAtomic *newAtomic = RpAtomicClone(minfo->m_atomics[0]);
-			RwFrame *newFrame = RwFrameCreate();
-			if (newAtomic != nil && newFrame != nil) {
-				*RwFrameGetMatrix(newFrame) = *attMat;
-				RpAtomicSetFrame(newAtomic, newFrame);
-				RwFrameAddChild(mainFrame, newFrame);
-				RpClumpAddAtomic(m_clump, newAtomic);
-			} else {
-				debug("Failed to allocate memory while creating template MLO.\n");
-			}
-		}
-	}
-
-	if (RpClumpGetNumAtomics(m_clump) != 0) {
-		CVisibilityPlugins::SetClumpModelInfo(m_clump, this);
-	} else {
-		RpClumpDestroy(m_clump);
-		m_clump = nil;
-	}
-}
\ No newline at end of file
diff --git a/src/modelinfo/MloModelInfo.h b/src/modelinfo/MloModelInfo.h
deleted file mode 100644
index d4344706..00000000
--- a/src/modelinfo/MloModelInfo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "ClumpModelInfo.h"
-
-class CMloModelInfo : public CClumpModelInfo
-{
-public:
-	float field_34; // draw distance?
-	int firstInstance;
-	int lastInstance;
-public:
-	CMloModelInfo(void) : CClumpModelInfo(MITYPE_MLO) {}
-	void ConstructClump();
-};
\ No newline at end of file
diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index c0f01929..ad7b4aaf 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -1,13 +1,9 @@
 #pragma once
 
+#include "ModelInfo.h"
+
 #define MODELINDICES \
 	X("fire_hydrant",	MI_FIRE_HYDRANT) \
-	X("bagelstnd02",	MI_BAGELSTAND2) \
-	X("fish01",		MI_FISHSTALL01) \
-	X("fishstall02",	MI_FISHSTALL02) \
-	X("fishstall03",	MI_FISHSTALL03) \
-	X("fishstall04",	MI_FISHSTALL04) \
-	X("taxisign",		MI_TAXISIGN) \
 	X("phonesign",		MI_PHONESIGN) \
 	X("noparkingsign1",	MI_NOPARKINGSIGN1) \
 	X("bussign1",		MI_BUSSIGN1) \
@@ -20,97 +16,62 @@
 	X("wastebin",		MI_WASTEBIN) \
 	X("phonebooth1",	MI_PHONEBOOTH1) \
 	X("parkingmeter",	MI_PARKINGMETER) \
+	X("parkingmeterg",	MI_PARKINGMETER2) \
+	X("mall_fans",		MI_MALLFAN) \
+	X("htl_fan_rotate_nt",	MI_HOTELFAN_NIGHT) \
+	X("htl_fan_rotate_dy",	MI_HOTELFAN_DAY) \
+	X("hotroomfan",		MI_HOTROOMFAN) \
 	X("trafficlight1",	MI_TRAFFICLIGHTS) \
+	X("MTraffic4",		MI_TRAFFICLIGHTS_VERTICAL) \
+	X("MTraffic1",		MI_TRAFFICLIGHTS_MIAMI) \
+	X("MTraffic2",		MI_TRAFFICLIGHTS_TWOVERTICAL) \
 	X("lamppost1",		MI_SINGLESTREETLIGHTS1) \
 	X("lamppost2",		MI_SINGLESTREETLIGHTS2) \
 	X("lamppost3",		MI_SINGLESTREETLIGHTS3) \
 	X("doublestreetlght1",	MI_DOUBLESTREETLIGHTS) \
-	X("rd_Road2A10",	MI_ROADSFORROADBLOCKSSTART) \
-	X("rd_Road1A30",	MI_ROADSFORROADBLOCKSEND) \
-	X("veg_tree1",		MI_TREE1) \
+	X("Streetlamp1",	MI_STREETLAMP1) \
+	X("Streetlamp2",	MI_STREETLAMP2) \
 	X("veg_tree3",		MI_TREE2) \
 	X("veg_treea1",		MI_TREE3) \
-	X("veg_treenew01",	MI_TREE4) \
-	X("veg_treenew05",	MI_TREE5) \
 	X("veg_treeb1",		MI_TREE6) \
-	X("veg_treenew10",	MI_TREE7) \
 	X("veg_treea3",		MI_TREE8) \
-	X("veg_treenew09",	MI_TREE9) \
-	X("veg_treenew08",	MI_TREE10) \
-	X("veg_treenew03",	MI_TREE11) \
-	X("veg_treenew16",	MI_TREE12) \
-	X("veg_treenew17",	MI_TREE13) \
-	X("veg_treenew06",	MI_TREE14) \
 	X("doc_crane_cab",	MODELID_CRANE_1) \
-	X("cranetopb",		MODELID_CRANE_2) \
-	X("cranetopa",		MODELID_CRANE_3) \
+	X("doc_crane_cab01",	MODELID_CRANE_2) \
+	X("doc_crane_cab02",	MODELID_CRANE_3) \
+	X("doc_crane_cab03",	MODELID_CRANE_4) \
+	X("boatcranelg0",	MODELID_CRANE_5) \
+	X("LODnetopa0",		MODELID_CRANE_6) \
 	X("package1",		MI_COLLECTABLE1) \
 	X("Money",		MI_MONEY) \
 	X("barrel1",		MI_CARMINE) \
-	X("oddjgaragdoor",	MI_GARAGEDOOR1) \
-	X("bombdoor",		MI_GARAGEDOOR2) \
-	X("door_bombshop",	MI_GARAGEDOOR3) \
-	X("vheistlocdoor",	MI_GARAGEDOOR4) \
-	X("door2_garage",	MI_GARAGEDOOR5) \
-	X("ind_slidedoor",	MI_GARAGEDOOR6) \
-	X("bankjobdoor",	MI_GARAGEDOOR7) \
-	X("door_jmsgrage",	MI_GARAGEDOOR9) \
-	X("jamesgrge_kb",	MI_GARAGEDOOR10) \
-	X("door_sfehousegrge",	MI_GARAGEDOOR11) \
-	X("shedgaragedoor",	MI_GARAGEDOOR12) \
-	X("door4_garage",	MI_GARAGEDOOR13) \
-	X("door_col_compnd_01",	MI_GARAGEDOOR14) \
-	X("door_col_compnd_02",	MI_GARAGEDOOR15) \
-	X("door_col_compnd_03",	MI_GARAGEDOOR16) \
-	X("door_col_compnd_04",	MI_GARAGEDOOR17) \
-	X("door_col_compnd_05",	MI_GARAGEDOOR18) \
-	X("impex_door",		MI_GARAGEDOOR19) \
-	X("SalvGarage",		MI_GARAGEDOOR20) \
-	X("door3_garage",	MI_GARAGEDOOR21) \
-	X("leveldoor2",		MI_GARAGEDOOR22) \
-	X("double_garage_dr",	MI_GARAGEDOOR23) \
-	X("amcogaragedoor",	MI_GARAGEDOOR24) \
-	X("towergaragedoor1",	MI_GARAGEDOOR25) \
-	X("towergaragedoor2",	MI_GARAGEDOOR26) \
-	X("towergaragedoor3",	MI_GARAGEDOOR27) \
-	X("plysve_gragedoor",	MI_GARAGEDOOR28) \
-	X("impexpsubgrgdoor",	MI_GARAGEDOOR29) \
-	X("Sub_sprayshopdoor",	MI_GARAGEDOOR30) \
-	X("ind_plyrwoor",	MI_GARAGEDOOR31) \
-	X("8ballsuburbandoor",	MI_GARAGEDOOR32) \
+	X("dk_paynspraydoor",	MI_GARAGEDOOR2) \
+	X("dk_waretankdoor1",	MI_GARAGEDOOR3) \
+	X("hav_garagedoor1",	MI_GARAGEDOOR4) \
+	X("hav_garagedoor02",	MI_GARAGEDOOR5) \
+	X("hav_garagedoor03",	MI_GARAGEDOOR6) \
+	X("hav_garagedoor04",	MI_GARAGEDOOR7) \
+	X("lh_showdoor03",	MI_GARAGEDOOR9) \
+	X("lh_showdoor1",	MI_GARAGEDOOR10) \
+	X("lhtankdoor",		MI_GARAGEDOOR11) \
+	X("nbtgardoor",		MI_GARAGEDOOR12) \
+	X("dk_camjonesdoor",	MI_GARAGEDOOR13) \
+	X("nbtgardoor02",	MI_GARAGEDOOR14) \
+	X("dt_savedra",		MI_GARAGEDOOR15) \
+	X("dt_savedrb",		MI_GARAGEDOOR16) \
+	X("dk_bombdoor",	MI_GARAGEDOOR18) \
+	X("haiwshpnsdoor",	MI_GARAGEDOOR19) \
+	X("wshpnsdoor",		MI_GARAGEDOOR20) \
+	X("nbecpnsdoor",	MI_GARAGEDOOR21) \
+	X("nbtgardoor03",	MI_GARAGEDOOR22) \
+	X("dt_savedrc",		MI_GARAGEDOOR23) \
+	X("dt_savedrd",		MI_GARAGEDOOR24) \
+	X("man_frntstepGD",	MI_GARAGEDOOR25) \
+	X("svegrgedoor",	MI_GARAGEDOOR26) \
 	X("barrel2",		MI_NAUTICALMINE) \
-	X("crushercrush",	MI_CRUSHERBODY) \
-	X("crushertop",		MI_CRUSHERLID) \
-	X("donkeymag",		MI_DONKEYMAG) \
-	X("bullion",		MI_BULLION) \
-	X("floatpackge1",	MI_FLOATPACKAGE1) \
 	X("briefcase",		MI_BRIEFCASE) \
-	X("chinabanner1",	MI_CHINABANNER1) \
-	X("chinabanner2",	MI_CHINABANNER2) \
-	X("chinabanner3",	MI_CHINABANNER3) \
-	X("chinabanner4",	MI_CHINABANNER4) \
-	X("iten_chinatown5",	MI_CHINABANNER5) \
-	X("iten_chinatown7",	MI_CHINABANNER6) \
-	X("iten_chinatown3",	MI_CHINABANNER7) \
-	X("iten_chinatown2",	MI_CHINABANNER8) \
-	X("iten_chinatown4",	MI_CHINABANNER9) \
-	X("iten_washline01",	MI_CHINABANNER10) \
-	X("iten_washline02",	MI_CHINABANNER11) \
-	X("iten_washline03",	MI_CHINABANNER12) \
-	X("chinalanterns",	MI_CHINALANTERN) \
-	X("glassfx1",		MI_GLASS1) \
-	X("glassfx2",		MI_GLASS2) \
-	X("glassfx3",		MI_GLASS3) \
-	X("glassfx4",		MI_GLASS4) \
-	X("glassfx55",		MI_GLASS5) \
-	X("glassfxsub1",	MI_GLASS6) \
-	X("glassfxsub2",	MI_GLASS7) \
+	X("wglasssmash",	MI_GLASS1) \
 	X("glassfx_composh",	MI_GLASS8) \
-	X("bridge_liftsec",	MI_BRIDGELIFT) \
-	X("bridge_liftweight",	MI_BRIDGEWEIGHT) \
-	X("subbridge_lift",	MI_BRIDGEROADSEGMENT) \
 	X("barrel4",		MI_EXPLODINGBARREL) \
-	X("flagsitaly",		MI_ITALYBANNER1) \
 	X("adrenaline",		MI_PICKUP_ADRENALINE) \
 	X("bodyarmour",		MI_PICKUP_BODYARMOUR) \
 	X("info",		MI_PICKUP_INFO) \
@@ -119,44 +80,65 @@
 	X("bribe",		MI_PICKUP_BRIBE) \
 	X("killfrenzy",		MI_PICKUP_KILLFRENZY) \
 	X("camerapickup",	MI_PICKUP_CAMERA) \
+	X("bigdollar",		MI_PICKUP_REVENUE) \
+	X("pickupsave",		MI_PICKUP_SAVEGAME) \
+	X("property_locked",	MI_PICKUP_PROPERTY) \
+	X("property_fsale",	MI_PICKUP_PROPERTY_FORSALE) \
+	X("clothesp",		MI_PICKUP_CLOTHES) \
 	X("bollardlight",	MI_BOLLARDLIGHT) \
-	X("magnet",		MI_MAGNET) \
-	X("streetlamp1",	MI_STREETLAMP1) \
-	X("streetlamp2",	MI_STREETLAMP2) \
-	X("railtrax_lo4b",	MI_RAILTRACKS) \
 	X("bar_barrier10",	MI_FENCE) \
 	X("bar_barrier12",	MI_FENCE2) \
 	X("petrolpump",		MI_PETROLPUMP) \
-	X("bodycast",		MI_BODYCAST) \
-	X("backdoor",		MI_BACKDOOR) \
-	X("coffee",		MI_COFFEE) \
+	X("washgaspump",	MI_PETROLPUMP2) \
 	X("bouy",		MI_BUOY) \
 	X("parktable1",		MI_PARKTABLE) \
-	X("sbwy_tunl_start",	MI_SUBWAY1) \
-	X("sbwy_tunl_bit",	MI_SUBWAY2) \
-	X("sbwy_tunl_bend",	MI_SUBWAY3) \
-	X("sbwy_tunl_cstm6",	MI_SUBWAY4) \
-	X("sbwy_tunl_cstm7",	MI_SUBWAY5) \
-	X("sbwy_tunl_cstm8",	MI_SUBWAY6) \
-	X("sbwy_tunl_cstm10",	MI_SUBWAY7) \
-	X("sbwy_tunl_cstm9",	MI_SUBWAY8) \
-	X("sbwy_tunl_cstm11",	MI_SUBWAY9) \
-	X("sbwy_tunl_cstm1",	MI_SUBWAY10) \
-	X("sbwy_tunl_cstm2",	MI_SUBWAY11) \
-	X("sbwy_tunl_cstm4",	MI_SUBWAY12) \
-	X("sbwy_tunl_cstm3",	MI_SUBWAY13) \
-	X("sbwy_tunl_cstm5",	MI_SUBWAY14) \
-	X("subplatform_n2",	MI_SUBWAY15) \
-	X("suby_tunl_start",	MI_SUBWAY16) \
-	X("sbwy_tunl_start2",	MI_SUBWAY17) \
-	X("indy_tunl_start",	MI_SUBWAY18) \
-	X("indsubway03",	MI_SUBPLATFORM_IND) \
-	X("comerside_subway",	MI_SUBPLATFORM_COMS) \
-	X("subplatform",	MI_SUBPLATFORM_COMS2) \
-	X("subplatform_n",	MI_SUBPLATFORM_COMN) \
-	X("Otherside_subway",	MI_SUBPLATFORM_SUB) \
-	X("subplatform_sub",	MI_SUBPLATFORM_SUB2) \
-	X("files",		MI_FILES)
+	X("lamppost1",		MI_LAMPPOST1) \
+	X("veg_palm04",		MI_VEG_PALM01) \
+	X("veg_palwee02",	MI_VEG_PALM02) \
+	X("veg_palmkbb11",	MI_VEG_PALM03) \
+	X("veg_palmkb4",	MI_VEG_PALM04) \
+	X("veg_palm02",		MI_VEG_PALM05) \
+	X("veg_palmkb3",	MI_VEG_PALM06) \
+	X("veg_palmbig14",	MI_VEG_PALM07) \
+	X("veg_palm01",		MI_VEG_PALM08) \
+	X("mlamppost",		MI_MLAMPPOST) \
+	X("roadworkbarrier1",	MI_BARRIER1) \
+	X("littleha_police",	MI_LITTLEHA_POLICE) \
+	X("telgrphpole02",	MI_TELPOLE02) \
+	X("trafficlight1",	MI_TRAFFICLIGHT01) \
+	X("parkbench1",		MI_PARKBENCH) \
+	X("plc_stinger",	MI_PLC_STINGER) \
+	X("od_lightbeam",	MI_LIGHTBEAM) \
+	X("ap_radar1_01",	MI_AIRPORTRADAR) \
+	X("rcbomb",		MI_RCBOMB) \
+	X("beachball",		MI_BEACHBALL) \
+	X("sandcastle1",	MI_SANDCASTLE1) \
+	X("sandcastle2",	MI_SANDCASTLE2) \
+	X("jellyfish",		MI_JELLYFISH) \
+	X("jellyfish01",	MI_JELLYFISH01) \
+	X("fish1single",	MI_FISH1SINGLE) \
+	X("fish1s",		MI_FISH1S) \
+	X("fish2single",	MI_FISH2SINGLE) \
+	X("fish2s",		MI_FISH2S) \
+	X("fish3single",	MI_FISH3SINGLE) \
+	X("fish3s",		MI_FISH3S) \
+	X("turtle",		MI_TURTLE) \
+	X("dolphin",		MI_DOLPHIN) \
+	X("shark",		MI_SHARK) \
+	X("submarine",		MI_SUBMARINE) \
+	X("Esc_step",		MI_ESCALATORSTEP) \
+	X("lounge_wood_up",	MI_LOUNGE_WOOD_UP) \
+	X("lounge_towel_up",	MI_LOUNGE_TOWEL_UP) \
+	X("lounge_wood_dn",	MI_LOUNGE_WOOD_DN) \
+	X("lotion",		MI_LOTION) \
+	X("beachtowel01",	MI_BEACHTOWEL01) \
+	X("beachtowel02",	MI_BEACHTOWEL02) \
+	X("beachtowel03",	MI_BEACHTOWEL03) \
+	X("beachtowel04",	MI_BEACHTOWEL04) \
+	X("blimp_night",	MI_BLIMP_NIGHT) \
+	X("blimp_day",		MI_BLIMP_DAY) \
+	X("yt_main_body",	MI_YT_MAIN_BODY) \
+	X("yt_main_body2",	MI_YT_MAIN_BODY2)
 
 #define X(name, var) extern int16 var;
 	MODELINDICES
@@ -174,88 +156,45 @@ enum
 	MI_MEDIC,
 	MI_FIREMAN,
 	MI_MALE01,
-	MI_TAXI_D,
-	MI_PIMP,
-	MI_GANG01,
-	MI_GANG02,
-	MI_GANG03,
-	MI_GANG04,
-	MI_GANG05,
-	MI_GANG06,
-	MI_GANG07,
-	MI_GANG08,
-	MI_GANG09,
-	MI_GANG10,
-	MI_GANG11,
-	MI_GANG12,
-	MI_GANG13,
-	MI_GANG14,
-	MI_CRIMINAL01,
-	MI_CRIMINAL02,
-	MI_SPECIAL01,
-	MI_SPECIAL02,
-	MI_SPECIAL03,
-	MI_SPECIAL04,
-	MI_MALE02,
-	MI_MALE03,
-	MI_FATMALE01,
-	MI_FATMALE02,
-	MI_FEMALE01,
-	MI_FEMALE02,
-	MI_FEMALE03,
-	MI_FATFEMALE01,
-	MI_FATFEMALE02,
-	MI_PROSTITUTE,
-	MI_PROSTITUTE2,
-	MI_P_MAN1,
-	MI_P_MAN2,
-	MI_P_WOM1,
-	MI_P_WOM2,
-	MI_CT_MAN1,
-	MI_CT_MAN2,
-	MI_CT_WOM1,
-	MI_CT_WOM2,
-	MI_LI_MAN1,
-	MI_LI_MAN2,
-	MI_LI_WOM1,
-	MI_LI_WOM2,
-	MI_DOCKER1,
-	MI_DOCKER2,
-	MI_SCUM_MAN,
-	MI_SCUM_WOM,
-	MI_WORKER1,
-	MI_WORKER2,
-	MI_B_MAN1,
-	MI_B_MAN2,
-	MI_B_MAN3,
-	MI_B_WOM1,
-	MI_B_WOM2,
-	MI_B_WOM3,
-	MI_MOD_MAN,
-	MI_MOD_WOM,
-	MI_ST_MAN,
-	MI_ST_WOM,
-	MI_FAN_MAN1,
-	MI_FAN_MAN2,
-	MI_FAN_WOM,
-	MI_HOS_MAN,
-	MI_HOS_WOM,
-	MI_CONST1,
-	MI_CONST2,
-	MI_SHOPPER1,
-	MI_SHOPPER2,
-	MI_SHOPPER3,
-	MI_STUD_MAN,
-	MI_STUD_WOM,
-	MI_CAS_MAN,
-	MI_CAS_WOM,
-	MI_BUSKER1,
-	MI_BUSKER2,
-	MI_BUSKER3,
-	MI_BUSKER4,
-	// three more peds possible
 
-	MI_LAST_PED = 89,
+	MI_TAXI_D = 28,	// HMOCA
+
+	MI_BMYBB = 47,
+	MI_WMOST = 52,
+	MI_WMYBE = 58,
+	MI_WFOBE,
+	MI_WMOBE,
+
+	MI_WFOGO = 63,
+	MI_WMOGO = 64,
+
+	MI_CBA = 83,
+	MI_CBB,
+	MI_HNA,
+	MI_HNB,
+	MI_SGA,
+	MI_SGB,
+	MI_CLA,
+	MI_CLB,
+	MI_GDA,
+	MI_GDB,
+	MI_BKA,
+	MI_BKB,
+	MI_PGA,
+	MI_PGB,
+	MI_VICE1,
+	MI_VICE2,
+	MI_VICE3,
+	MI_VICE4,
+	MI_VICE5,
+	MI_VICE6,
+	MI_VICE7,
+	MI_VICE8,
+	MI_WFYG2 = 106,	// last regular ped
+	MI_SPECIAL01 = 109,
+	MI_SPECIAL21 = 129,
+
+	MI_LAST_PED = MI_SPECIAL21,
 	MI_FIRST_VEHICLE,
 
 	MI_LANDSTAL = MI_FIRST_VEHICLE,
@@ -264,13 +203,13 @@ enum
 	MI_LINERUN,
 	MI_PEREN,
 	MI_SENTINEL,
-	MI_PATRIOT,
+	MI_RIO,
 	MI_FIRETRUCK,
 	MI_TRASH,
 	MI_STRETCH,
 	MI_MANANA,
 	MI_INFERNUS,
-	MI_BLISTA,
+	MI_VOODOO,
 	MI_PONY,
 	MI_MULE,
 	MI_CHEETAH,
@@ -279,11 +218,11 @@ enum
 	MI_MOONBEAM,
 	MI_ESPERANT,
 	MI_TAXI,
-	MI_KURUMA,
+	MI_WASHING,
 	MI_BOBCAT,
 	MI_MRWHOOP,
 	MI_BFINJECT,
-	MI_CORPSE,
+	MI_HUNTER,
 	MI_POLICE,
 	MI_ENFORCER,
 	MI_SECURICA,
@@ -292,61 +231,127 @@ enum
 	MI_BUS,
 	MI_RHINO,
 	MI_BARRACKS,
-	MI_TRAIN,
+	MI_CUBAN,
 	MI_CHOPPER,
-	MI_DODO,
+	MI_ANGEL,
 	MI_COACH,
 	MI_CABBIE,
 	MI_STALLION,
 	MI_RUMPO,
 	MI_RCBANDIT,
-	MI_BELLYUP,
-	MI_MRWONGS,
-	MI_MAFIA,
-	MI_YARDIE,
-	MI_YAKUZA,
-	MI_DIABLOS,
-	MI_COLUMB ,
-	MI_HOODS,
+	MI_ROMERO,
+	MI_PACKER,
+	MI_SENTXS,
+	MI_ADMIRAL,
+	MI_SQUALO,
+	MI_SEASPAR,
+	MI_PIZZABOY,
+	MI_GANGBUR,
 	MI_AIRTRAIN,
 	MI_DEADDODO,
 	MI_SPEEDER,
 	MI_REEFER,
-	MI_PANLANT,
+	MI_TROPIC,
 	MI_FLATBED,
 	MI_YANKEE,
-	MI_ESCAPE,
-	MI_BORGNINE,
-	MI_TOYZ,
-	MI_GHOST,
-
-	// leftovers on PC
-	MI_MIAMI_RCBARON = 154,
-	MI_MIAMI_RCRAIDER = 155,
-	MI_MIAMI_SPARROW = 159,
+	MI_CADDY,
+	MI_ZEBRA,
+	MI_TOPFUN,
+	MI_SKIMMER,
+	MI_PCJ600,
+	MI_FAGGIO,
+	MI_FREEWAY,
+	MI_RCBARON,
+	MI_RCRAIDER,
+	MI_GLENDALE,
+	MI_OCEANIC,
+	MI_SANCHEZ,
+	MI_SPARROW,
+	MI_PATRIOT,
+	MI_LOVEFIST,
+	MI_COASTG,
+	MI_DINGHY,
+	MI_HERMES,
+	MI_SABRE,
+	MI_SABRETUR,
+	MI_PHEONIX,
+	MI_WALTON,
+	MI_REGINA,
+	MI_COMET,
+	MI_DELUXO,
+	MI_BURRITO,
+	MI_SPAND,
+	MI_MARQUIS,
+	MI_BAGGAGE,
+	MI_KAUFMAN,
+	MI_MAVERICK,
+	MI_VCNMAV,
+	MI_RANCHER,
+	MI_FBIRANCH,
+	MI_VIRGO,
+	MI_GREENWOO,
+	MI_JETMAX,
+	MI_HOTRING,
+	MI_SANDKING,
+	MI_BLISTAC,
+	MI_POLMAV,
+	MI_BOXVILLE,
+	MI_BENSON,
+	MI_MESA,
+	MI_RCGOBLIN,
+	MI_HOTRINA,
+	MI_HOTRINB,
+	MI_BLOODRA,
+	MI_BLOODRB,
+	MI_VICECHEE,
+	// HACK
+	MI_TRAIN = -1,
+	MI_DODO = -2,
 
-	MI_GRENADE = 170,
-	MI_AK47,
+	MI_BRASS_KNUCKLES = 259,
+	MI_SCREWDRIVER,
+	MI_GOLFCLUB,
+	MI_NIGHTSTICK,
+	MI_KNIFE,
 	MI_BASEBALL_BAT,
-	MI_COLT,
+	MI_HAMMER,
+	MI_MEAT_CLEAVER,
+	MI_MACHETE,
+	MI_KATANA,
+	MI_CHAINSAW,
+	MI_GRENADE,
+	MI_TEARGAS,
 	MI_MOLOTOV,
-	MI_ROCKETLAUNCHER,
+	MI_MISSILE,
+	MI_COLT45,
+	MI_PYTHON,
+	MI_RUGER,
 	MI_SHOTGUN,
-	MI_SNIPER,
+	MI_SPAS12_SHOTGUN,
+	MI_STUBBY_SHOTGUN,
+	MI_M4,
+	MI_TEC9,
 	MI_UZI,
-	MI_MISSILE,
-	MI_M16,
+	MI_SILENCEDINGRAM,
+	MI_MP5,
+	MI_SNIPERRIFLE,
+	MI_LASERSCOPE,
+	MI_ROCKETLAUNCHER,
 	MI_FLAMETHROWER,
+	MI_M60,
+	MI_MINIGUN,
 	MI_BOMB,
+	MI_CAMERA,
 	MI_FINGERS,
+	MI_MINIGUN2,
 
-	MI_CUTOBJ01 = 185,
+	MI_CUTOBJ01 = 295,
 	MI_CUTOBJ02,
 	MI_CUTOBJ03,
 	MI_CUTOBJ04,
 	MI_CUTOBJ05,
 
-	MI_CAR_DOOR = 190,
+	MI_CAR_DOOR = 240,
 	MI_CAR_BUMPER,
 	MI_CAR_PANEL,
 	MI_CAR_BONNET,
@@ -355,10 +360,10 @@ enum
 	MI_BODYPARTA,
 	MI_BODYPARTB,
 
-	MI_AIRTRAIN_VLO = 198,
-	MI_LOPOLYGUY,
+	MI_AIRTRAIN_VLO = 257,
+	MI_MOBILE = 258,
 
-	NUM_DEFAULT_MODELS
+	NUM_DEFAULT_MODELS = 300
 };
 
 enum{
@@ -373,18 +378,21 @@ void TestModelIndices(void);
 inline bool
 IsGlass(int16 id)
 {
-	return id == MI_GLASS1 ||
-		id == MI_GLASS2 ||
-		id == MI_GLASS3 ||
-		id == MI_GLASS4 ||
-		id == MI_GLASS5 ||
-		id == MI_GLASS6 ||
-		id == MI_GLASS7 ||
-		id == MI_GLASS8;
+	CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
+	return mi->IsBuilding() && (mi->m_isCodeGlass || mi->m_isArtistGlass);
 }
 
 inline bool
-IsStreetLight(int16 id)
+IsTrafficLight(int16 id)
+{
+	return id == MI_TRAFFICLIGHTS ||
+		id == MI_TRAFFICLIGHTS_VERTICAL ||
+		id == MI_TRAFFICLIGHTS_MIAMI ||
+		id == MI_TRAFFICLIGHTS_TWOVERTICAL;
+}
+
+inline bool
+IsLightWithoutShift(int16 id)
 {
 	return id == MI_TRAFFICLIGHTS ||
 		id == MI_SINGLESTREETLIGHTS1 ||
@@ -394,86 +402,72 @@ IsStreetLight(int16 id)
 }
 
 inline bool
-IsBodyPart(int16 id)
+IsLightWithPreRenderEffects(int16 id)
 {
-	return id == MI_BODYPARTA || id == MI_BODYPARTB;
+	return IsTrafficLight(id) ||
+		id == MI_SINGLESTREETLIGHTS1 ||
+		id == MI_SINGLESTREETLIGHTS2 ||
+		id == MI_SINGLESTREETLIGHTS3 ||
+		id == MI_DOUBLESTREETLIGHTS;
 }
 
-// This is bad and should perhaps not be used
 inline bool
-IsBoatModel(int16 id)
+IsLightThatNeedsRepositioning(int16 id)
 {
-	return id == MI_PREDATOR ||
-		id == MI_REEFER ||
-		id == MI_SPEEDER ||
-		id == MI_GHOST;
+	return id == MI_SINGLESTREETLIGHTS1 ||
+		id == MI_SINGLESTREETLIGHTS2 ||
+		id == MI_SINGLESTREETLIGHTS3 ||
+		id == MI_TRAFFICLIGHTS_MIAMI ||
+		id == MI_TRAFFICLIGHTS_TWOVERTICAL ||
+		id == MI_MLAMPPOST ||
+		id == MI_STREETLAMP1 ||
+		id == MI_STREETLAMP2;
 }
 
 inline bool
-IsPedModel(int16 id)
+IsLightObject(int16 id)
 {
-	return id >= MI_PLAYER && id <= MI_LAST_PED;
+	return id == MI_TRAFFICLIGHTS_MIAMI ||
+		id == MI_MLAMPPOST ||
+		id == MI_SINGLESTREETLIGHTS1 ||
+		id == MI_SINGLESTREETLIGHTS2 ||
+		id == MI_SINGLESTREETLIGHTS3 ||
+		id == MI_DOUBLESTREETLIGHTS ||
+		id == MI_TRAFFICLIGHTS_TWOVERTICAL;
 }
 
 inline bool
-IsTreeModel(int16 id)
+IsBodyPart(int16 id)
 {
-	return id == MI_TREE1 ||
-		id == MI_TREE2 ||
-		id == MI_TREE3 ||
-		id == MI_TREE4 ||
-		id == MI_TREE5 ||
-		id == MI_TREE6 ||
-		id == MI_TREE7 ||
-		id == MI_TREE8 ||
-		id == MI_TREE9 ||
-		id == MI_TREE10 ||
-		id == MI_TREE11 ||
-		id == MI_TREE12 ||
-		id == MI_TREE13 ||
-		id == MI_TREE14;
+	return id == MI_BODYPARTA || id == MI_BODYPARTB;
 }
 
 inline bool
-IsBannerModel(int16 id)
+IsPedModel(int16 id)
 {
-	return id == MI_CHINABANNER1 ||
-		id == MI_CHINABANNER2 ||
-		id == MI_CHINABANNER3 ||
-		id == MI_CHINABANNER4 ||
-		id == MI_CHINABANNER5 ||
-		id == MI_CHINABANNER6 ||
-		id == MI_CHINABANNER7 ||
-		id == MI_CHINABANNER8 ||
-		id == MI_CHINABANNER9 ||
-		id == MI_CHINABANNER10 ||
-		id == MI_CHINABANNER11 ||
-		id == MI_CHINABANNER12 ||
-		id == MI_ITALYBANNER1 ||
-		id == MI_CHINALANTERN;
+	return id >= MI_PLAYER && id <= MI_LAST_PED;
 }
 inline bool
-IsPickupModel(int16 id)
+IsPalmTreeModel(int16 id)
 {
-	return id == MI_GRENADE ||
-		id == MI_AK47 ||
-		id == MI_BASEBALL_BAT ||
-		id == MI_COLT ||
-		id == MI_MOLOTOV ||
-		id == MI_ROCKETLAUNCHER ||
-		id == MI_SHOTGUN ||
-		id == MI_SNIPER ||
-		id == MI_UZI ||
-		id == MI_M16 ||
-		id == MI_FLAMETHROWER ||
-		id == MI_PICKUP_ADRENALINE ||
-		id == MI_PICKUP_BODYARMOUR ||
-		id == MI_PICKUP_INFO ||
-		id == MI_PICKUP_HEALTH ||
-		id == MI_PICKUP_BONUS ||
-		id == MI_PICKUP_BRIBE ||
-		id == MI_PICKUP_KILLFRENZY ||
-		id == MI_PICKUP_CAMERA;
+	return	id == MI_VEG_PALM01 ||
+		id == MI_VEG_PALM02 ||
+		id == MI_VEG_PALM03 ||
+		id == MI_VEG_PALM04 ||
+		id == MI_VEG_PALM05 ||
+		id == MI_VEG_PALM06 ||
+		id == MI_VEG_PALM07 ||
+		id == MI_VEG_PALM08;
+}
+
+inline bool
+IsTreeModel(int16 id)
+{
+	return	id == MI_TREE2 ||
+		id == MI_TREE3 ||
+		id == MI_TREE6 ||
+		id == MI_TREE8 ||
+		IsPalmTreeModel(id);
 }
 
 inline bool
@@ -498,7 +492,8 @@ inline bool
 IsExplosiveThingModel(int16 id)
 {
 	return id == MI_EXPLODINGBARREL ||
-		id == MI_PETROLPUMP;
+		id == MI_PETROLPUMP ||
+		id == MI_PETROLPUMP2;
 }
 
 inline bool 
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index da09bdfa..3dc048c9 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -8,13 +8,11 @@
 CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
 
 CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;
-CStore<CMloModelInfo, MLOMODELSIZE> CModelInfo::ms_mloModelStore;
-CStore<CInstance, MLOINSTANCESIZE> CModelInfo::ms_mloInstanceStore;
 CStore<CTimeModelInfo, TIMEMODELSIZE> CModelInfo::ms_timeModelStore;
+CStore<CWeaponModelInfo, WEAPONMODELSIZE> CModelInfo::ms_weaponModelStore;
 CStore<CClumpModelInfo, CLUMPMODELSIZE> CModelInfo::ms_clumpModelStore;
 CStore<CPedModelInfo, PEDMODELSIZE> CModelInfo::ms_pedModelStore;
 CStore<CVehicleModelInfo, VEHICLEMODELSIZE> CModelInfo::ms_vehicleModelStore;
-CStore<CXtraCompsModelInfo, XTRACOMPSMODELSIZE> CModelInfo::ms_xtraCompsModelStore;
 CStore<C2dEffect, TWODFXSIZE> CModelInfo::ms_2dEffectStore;
 
 void
@@ -26,11 +24,9 @@ CModelInfo::Initialise(void)
 	for(i = 0; i < MODELINFOSIZE; i++)
 		ms_modelInfoPtrs[i] = nil;
 	ms_2dEffectStore.clear();
-	ms_mloInstanceStore.clear();
-	ms_xtraCompsModelStore.clear();
 	ms_simpleModelStore.clear();
 	ms_timeModelStore.clear();
-	ms_mloModelStore.clear();
+	ms_weaponModelStore.clear();
 	ms_clumpModelStore.clear();
 	ms_pedModelStore.clear();
 	ms_vehicleModelStore.clear();
@@ -90,29 +86,23 @@ CModelInfo::ShutDown(void)
 	int i;
 	for(i = 0; i < ms_simpleModelStore.allocPtr; i++)
 		ms_simpleModelStore.store[i].Shutdown();
-	for(i = 0; i < ms_mloInstanceStore.allocPtr; i++)
-		ms_mloInstanceStore.store[i].Shutdown();
 	for(i = 0; i < ms_timeModelStore.allocPtr; i++)
 		ms_timeModelStore.store[i].Shutdown();
+	for(i = 0; i < ms_weaponModelStore.allocPtr; i++)
+		ms_weaponModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_clumpModelStore.allocPtr; i++)
 		ms_clumpModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_vehicleModelStore.allocPtr; i++)
 		ms_vehicleModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_pedModelStore.allocPtr; i++)
 		ms_pedModelStore.store[i].Shutdown();
-	for(i = 0; i < ms_xtraCompsModelStore.allocPtr; i++)
-		ms_xtraCompsModelStore.store[i].Shutdown();
-	for(i = 0; i < ms_mloInstanceStore.allocPtr; i++)
-		ms_mloInstanceStore.store[i].Shutdown();
 	for(i = 0; i < ms_2dEffectStore.allocPtr; i++)
 		ms_2dEffectStore.store[i].Shutdown();
 
 	ms_2dEffectStore.clear();
 	ms_simpleModelStore.clear();
-	ms_mloInstanceStore.clear();
-	ms_mloModelStore.clear();
-	ms_xtraCompsModelStore.clear();
 	ms_timeModelStore.clear();
+	ms_weaponModelStore.clear();
 	ms_pedModelStore.clear();
 	ms_clumpModelStore.clear();
 	ms_vehicleModelStore.clear();
@@ -128,23 +118,21 @@ CModelInfo::AddSimpleModel(int id)
 	return modelinfo;
 }
 
-CMloModelInfo *
-CModelInfo::AddMloModel(int id)
+CTimeModelInfo*
+CModelInfo::AddTimeModel(int id)
 {
-	CMloModelInfo *modelinfo;
-	modelinfo = CModelInfo::ms_mloModelStore.alloc();
+	CTimeModelInfo *modelinfo;
+	modelinfo = CModelInfo::ms_timeModelStore.alloc();
 	CModelInfo::ms_modelInfoPtrs[id] = modelinfo;
-	modelinfo->m_clump = nil;
-	modelinfo->firstInstance = 0;
-	modelinfo->lastInstance = 0;
+	modelinfo->Init();
 	return modelinfo;
 }
 
-CTimeModelInfo*
-CModelInfo::AddTimeModel(int id)
+CWeaponModelInfo*
+CModelInfo::AddWeaponModel(int id)
 {
-	CTimeModelInfo *modelinfo;
-	modelinfo = CModelInfo::ms_timeModelStore.alloc();
+	CWeaponModelInfo *modelinfo;
+	modelinfo = CModelInfo::ms_weaponModelStore.alloc();
 	CModelInfo::ms_modelInfoPtrs[id] = modelinfo;
 	modelinfo->Init();
 	return modelinfo;
@@ -200,6 +188,18 @@ CModelInfo::GetModelInfo(const char *name, int *id)
 	return nil;
 }
 
+CBaseModelInfo*
+CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex)
+{
+	CBaseModelInfo *modelinfo;
+	for(int i = minIndex; i <= maxIndex; i++){
+		modelinfo = CModelInfo::ms_modelInfoPtrs[i];
+	 	if(modelinfo && !CGeneral::faststricmp(modelinfo->GetName(), name))
+			return modelinfo;
+	}
+	return nil;
+}
+
 bool
 CModelInfo::IsBoatModel(int32 id)
 {
@@ -214,28 +214,11 @@ CModelInfo::IsBikeModel(int32 id)
 		((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_BIKE;
 }
 
-void
-CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level)
-{
-	int i;
-	CBaseModelInfo *mi;
-	CColModel *colmodel;
-
-	for(i = 0; i < MODELINFOSIZE; i++){
-		mi = GetModelInfo(i);
-		if(mi){
-			colmodel = mi->GetColModel();
-			if(colmodel && colmodel->level != LEVEL_NONE && colmodel->level != level)
-				colmodel->RemoveCollisionVolumes();
-		}
-	}
-}
-
-void
-CModelInfo::ConstructMloClumps()
+bool
+CModelInfo::IsCarModel(int32 id)
 {
-	for (int i = 0; i < ms_mloModelStore.allocPtr; i++)
-		ms_mloModelStore.store[i].ConstructClump();
+	return GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
+		((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_CAR;
 }
 
 void
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index 65cfa4e7..a24ba797 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -3,49 +3,45 @@
 #include "2dEffect.h"
 #include "BaseModelInfo.h"
 #include "SimpleModelInfo.h"
-#include "MloModelInfo.h"
 #include "TimeModelInfo.h"
+#include "WeaponModelInfo.h"
 #include "ClumpModelInfo.h"
 #include "PedModelInfo.h"
 #include "VehicleModelInfo.h"
-#include "XtraCompsModelInfo.h"
 #include "Instance.h"
 
 class CModelInfo
 {
 	static CBaseModelInfo *ms_modelInfoPtrs[MODELINFOSIZE];
 	static CStore<CSimpleModelInfo, SIMPLEMODELSIZE> ms_simpleModelStore;
-	static CStore<CMloModelInfo, MLOMODELSIZE> ms_mloModelStore;
-	static CStore<CInstance, MLOINSTANCESIZE> ms_mloInstanceStore;
 	static CStore<CTimeModelInfo, TIMEMODELSIZE> ms_timeModelStore;
+	static CStore<CWeaponModelInfo, WEAPONMODELSIZE> ms_weaponModelStore;
 	static CStore<CClumpModelInfo, CLUMPMODELSIZE> ms_clumpModelStore;
 	static CStore<CPedModelInfo, PEDMODELSIZE> ms_pedModelStore;
 	static CStore<CVehicleModelInfo, VEHICLEMODELSIZE> ms_vehicleModelStore;
 	static CStore<C2dEffect, TWODFXSIZE> ms_2dEffectStore;
-	static CStore<CXtraCompsModelInfo, XTRACOMPSMODELSIZE> ms_xtraCompsModelStore;
 
 public:
 	static void Initialise(void);
 	static void ShutDown(void);
 
 	static CSimpleModelInfo *AddSimpleModel(int id);
-	static CMloModelInfo *AddMloModel(int id);
 	static CTimeModelInfo *AddTimeModel(int id);
+	static CWeaponModelInfo *AddWeaponModel(int id);
 	static CClumpModelInfo *AddClumpModel(int id);
 	static CPedModelInfo *AddPedModel(int id);
 	static CVehicleModelInfo *AddVehicleModel(int id);
 
 	static CStore<C2dEffect, TWODFXSIZE> &Get2dEffectStore(void) { return ms_2dEffectStore; }
-	static CStore<CInstance, MLOINSTANCESIZE> &GetMloInstanceStore(void) { return ms_mloInstanceStore; }
 
 	static CBaseModelInfo *GetModelInfo(const char *name, int *id);
 	static CBaseModelInfo *GetModelInfo(int id){
 		return ms_modelInfoPtrs[id];
 	}
+	static CBaseModelInfo *GetModelInfo(const char *name, int minIndex, int maxIndex);
 
 	static bool IsBoatModel(int32 id);
 	static bool IsBikeModel(int32 id);
-	static void RemoveColModelsFromOtherLevels(eLevelName level);
-	static void ConstructMloClumps();
+	static bool IsCarModel(int32 id);
 	static void ReInit2dEffects();
 };
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 1d8aa4dc..a9caa867 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -9,36 +9,18 @@
 #include "VisibilityPlugins.h"
 #include "ModelInfo.h"
 
+//--MIAMI: file done
+
 void
 CPedModelInfo::DeleteRwObject(void)
 {
+	CClumpModelInfo::DeleteRwObject();
 	if(m_hitColModel)
 		delete m_hitColModel;
 	m_hitColModel = nil;
-#ifdef PED_SKIN
-	RwFrame *frame;
-	if(m_head){
-		frame = RpAtomicGetFrame(m_head);
-		RpAtomicDestroy(m_head);
-		RwFrameDestroy(frame);
-		m_head = nil;
-	}
-	if(m_lhand){
-		frame = RpAtomicGetFrame(m_lhand);
-		RpAtomicDestroy(m_lhand);
-		RwFrameDestroy(frame);
-		m_lhand = nil;
-	}
-	if(m_rhand){
-		frame = RpAtomicGetFrame(m_rhand);
-		RpAtomicDestroy(m_rhand);
-		RwFrameDestroy(frame);
-		m_rhand = nil;
-	}
-#endif
-	CClumpModelInfo::DeleteRwObject();	// PC calls this first
 }
 
+// leftover...
 RwObjectNameIdAssocation CPedModelInfo::m_pPedIds[PED_NODE_MAX] = {
 	{ "Smid",	PED_MID, 0, },	// that is strange...
 	{ "Shead",	PED_HEAD, 0, },
@@ -54,131 +36,16 @@ RwObjectNameIdAssocation CPedModelInfo::m_pPedIds[PED_NODE_MAX] = {
 	{ nil,	0, 0, },
 };
 
-#ifdef PED_SKIN
-struct LimbCBarg
-{
-	CPedModelInfo *mi;
-	RpClump *clump;
-	int32 frameIDs[3];
-};
-
-RpAtomic*
-CPedModelInfo::findLimbsCb(RpAtomic *atomic, void *data)
-{
-	LimbCBarg *limbs = (LimbCBarg*)data;
-	RwFrame *frame = RpAtomicGetFrame(atomic);
-	const char *name = GetFrameNodeName(frame);
-	if(CGeneral::faststricmp(name, "Shead01") == 0){
-		limbs->frameIDs[0] = RpHAnimFrameGetID(frame);
-		limbs->mi->m_head = atomic;
-		RpClumpRemoveAtomic(limbs->clump, atomic);
-		RwFrameRemoveChild(frame);
-	}else if(CGeneral::faststricmp(name, "SLhand01") == 0){
-		limbs->frameIDs[1] = RpHAnimFrameGetID(frame);
-		limbs->mi->m_lhand = atomic;
-		RpClumpRemoveAtomic(limbs->clump, atomic);
-		RwFrameRemoveChild(frame);
-	}else if(CGeneral::faststricmp(name, "SRhand01") == 0){
-		limbs->frameIDs[2] = RpHAnimFrameGetID(frame);
-		limbs->mi->m_rhand = atomic;
-		RpClumpRemoveAtomic(limbs->clump, atomic);
-		RwFrameRemoveChild(frame);
-	}
-	return atomic;
-}
-#endif
-
 void
 CPedModelInfo::SetClump(RpClump *clump)
 {
-#ifdef PED_SKIN
-
-	// CB has to be set here before atomics are detached from clump
-	if(strncmp(GetName(), "player", 7) == 0)
-		RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
-	if(IsClumpSkinned(clump)){
-		LimbCBarg limbs = { this, clump, { 0, 0, 0 } };
-		RpClumpForAllAtomics(clump, findLimbsCb, &limbs);
-	}
-	CClumpModelInfo::SetClump(clump);
-	SetFrameIds(m_pPedIds);
-	if(m_hitColModel == nil && !IsClumpSkinned(clump))
-		CreateHitColModel();
-	// And again because CClumpModelInfo resets it
-	if(strncmp(GetName(), "player", 7) == 0)
-		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
-	else if(IsClumpSkinned(clump))
-		// skinned peds have no low detail version, so they don't have the right render Cb
-		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedCB);
-#else
 	CClumpModelInfo::SetClump(clump);
-	SetFrameIds(m_pPedIds);
+	SetFrameIds(m_pPedIds);	// not needed in VC actually
 	if(m_hitColModel == nil)
-		CreateHitColModel();
-	if(strncmp(GetName(), "player", 7) == 0)
+		CreateHitColModelSkinned(clump);
+	RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedCB);
+	if(strcmp(GetName(), "player") == 0)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
-#endif
-}
-
-RpAtomic*
-CountAtomicsCB(RpAtomic *atomic, void *data)
-{
-	(*(int32*)data)++;
-	return atomic;
-}
-
-RpAtomic*
-GetAtomicListCB(RpAtomic *atomic, void *data)
-{
-	**(RpAtomic***)data = atomic;
-	(*(RpAtomic***)data)++;
-	return atomic;
-}
-
-RwFrame*
-FindPedFrameFromNameCB(RwFrame *frame, void *data)
-{
-	RwObjectNameAssociation *assoc = (RwObjectNameAssociation*)data;
-
-	if(CGeneral::faststricmp(GetFrameNodeName(frame)+1, assoc->name+1)){
-		RwFrameForAllChildren(frame, FindPedFrameFromNameCB, assoc);
-		return assoc->frame ? nil : frame;
-	}else{
-		assoc->frame = frame;
-		return nil;
-	}
-}
-
-void
-CPedModelInfo::SetLowDetailClump(RpClump *lodclump)
-{
-	RpAtomic *atomics[16];
-	RpAtomic **pAtm;
-	int32 numAtm, numLodAtm;
-	int i;
-	RwObjectNameAssociation assoc;
-
-	numAtm = 0;
-	numLodAtm = 0;
-	RpClumpForAllAtomics(m_clump, CountAtomicsCB, &numAtm);		// actually unused
-	RpClumpForAllAtomics(lodclump, CountAtomicsCB, &numLodAtm);
-
-	RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedHiDetailCB);
-	RpClumpForAllAtomics(lodclump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPedLowDetailCB);
-
-	pAtm = atomics;
-	RpClumpForAllAtomics(lodclump, GetAtomicListCB, &pAtm);
-
-	for(i = 0; i < numLodAtm; i++){
-		assoc.name = GetFrameNodeName(RpAtomicGetFrame(atomics[i]));
-		assoc.frame = nil;
-		RwFrameForAllChildren(RpClumpGetFrame(m_clump), FindPedFrameFromNameCB, &assoc);
-		if(assoc.frame){
-			RpAtomicSetFrame(atomics[i], assoc.frame);
-			RpClumpRemoveAtomic(lodclump, atomics[i]);
-			RpClumpAddAtomic(m_clump, atomics[i]);
-		}
-	}
 }
 
 struct ColNodeInfo
@@ -190,126 +57,20 @@ struct ColNodeInfo
 	float radius;
 };
 
-#define NUMPEDINFONODES 8
+#define NUMPEDINFONODES 10
 ColNodeInfo m_pColNodeInfos[NUMPEDINFONODES] = {
-	{ nil,          PED_HEAD,		PEDPIECE_HEAD,  0.0f,   0.05f, 0.2f },
-	{ "Storso",     0,				PEDPIECE_TORSO,  0.0f,   0.15f, 0.2f },
-	{ "Storso",     0,				PEDPIECE_TORSO,  0.0f,  -0.05f, 0.3f },
-	{ nil,          PED_MID,		PEDPIECE_MID,  0.0f,  -0.07f, 0.3f },
-	{ nil,          PED_UPPERARML,	PEDPIECE_LEFTARM,  0.07f, -0.1f,  0.2f },
-	{ nil,          PED_UPPERARMR,	PEDPIECE_RIGHTARM, -0.07f, -0.1f,  0.2f },
-	{ "Slowerlegl", 0,				PEDPIECE_LEFTLEG,  0.0f,   0.07f, 0.25f },
-	{ nil,          PED_LOWERLEGR,	PEDPIECE_RIGHTLEG,  0.0f,   0.07f, 0.25f },
+	{ nil, PED_HEAD,	PEDPIECE_HEAD,	0.0f,   0.05f, 0.15f },
+	{ nil, PED_MID,		PEDPIECE_TORSO,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_MID,		PEDPIECE_TORSO,	0.0f,  -0.05f, 0.25f },
+	{ nil, PED_MID,		PEDPIECE_MID,	0.0f,  -0.25f, 0.25f },
+	{ nil, PED_UPPERARML,	PEDPIECE_LEFTARM,	0.03f, -0.05f,  0.16f },
+	{ nil, PED_UPPERARMR,	PEDPIECE_RIGHTARM,	-0.03f, -0.05f,  0.16f },
+	{ nil, PED_LOWERLEGL,	PEDPIECE_LEFTLEG,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_LOWERLEGR,	PEDPIECE_RIGHTLEG,	0.0f,   0.15f, 0.2f },
+	{ nil, PED_FOOTL,	PEDPIECE_LEFTLEG,	0.0f,   0.15f, 0.15f },
+	{ nil, PED_FOOTR,	PEDPIECE_RIGHTLEG,	0.0f,   0.15f, 0.15f },
 };
 
-RwObject*
-FindHeadRadiusCB(RwObject *object, void *data)
-{
-	RpAtomic *atomic = (RpAtomic*)object;
-	*(float*)data = RpAtomicGetBoundingSphere(atomic)->radius;
-	return nil;
-}
-
-void
-CPedModelInfo::CreateHitColModel(void)
-{
-	RwObjectNameAssociation nameAssoc;
-	RwObjectIdAssociation idAssoc;
-	CVector center;
-	RwFrame *nodeFrame;
-	CColModel *colmodel = new CColModel;
-	CColSphere *spheres = (CColSphere*)RwMalloc(NUMPEDINFONODES*sizeof(CColSphere));
-	RwFrame *root = RpClumpGetFrame(m_clump);
-	RwMatrix *mat = RwMatrixCreate();
-	for(int i = 0; i < NUMPEDINFONODES; i++){
-		nodeFrame = nil;
-		if(m_pColNodeInfos[i].name){
-			nameAssoc.name = m_pColNodeInfos[i].name;
-			nameAssoc.frame = nil;
-			RwFrameForAllChildren(root, FindFrameFromNameCB, &nameAssoc);
-			nodeFrame = nameAssoc.frame;
-		}else{
-			idAssoc.id = m_pColNodeInfos[i].pedNode;
-			idAssoc.frame = nil;
-			RwFrameForAllChildren(root, FindFrameFromIdCB, &idAssoc);
-			nodeFrame = idAssoc.frame;
-		}
-		if(nodeFrame){
-			float radius = m_pColNodeInfos[i].radius;
-			if(m_pColNodeInfos[i].pieceType == PEDPIECE_HEAD)
-				RwFrameForAllObjects(nodeFrame, FindHeadRadiusCB, &radius);
-			RwMatrixTransform(mat, RwFrameGetMatrix(nodeFrame), rwCOMBINEREPLACE);
-			const char *name = GetFrameNodeName(nodeFrame);
-			for(nodeFrame = RwFrameGetParent(nodeFrame);
-			    nodeFrame; 
-			    nodeFrame = RwFrameGetParent(nodeFrame)){
-				name = GetFrameNodeName(nodeFrame);
-				RwMatrixTransform(mat, RwFrameGetMatrix(nodeFrame), rwCOMBINEPOSTCONCAT);
-				if(RwFrameGetParent(nodeFrame) == root)
-					break;
-			}
-			center.x = mat->pos.x + m_pColNodeInfos[i].x;
-			center.y = mat->pos.y + 0.0f;
-			center.z = mat->pos.z + m_pColNodeInfos[i].z;
-			spheres[i].Set(radius, center, SURFACE_PED, m_pColNodeInfos[i].pieceType);
-		}
-	}
-	RwMatrixDestroy(mat);
-	colmodel->spheres = spheres;
-	colmodel->numSpheres = NUMPEDINFONODES;
-	center.x = center.y = center.z = 0.0f;
-	colmodel->boundingSphere.Set(2.0f, center, 0, 0);
-	CVector min, max;
-	min.x = min.y = -0.5f;
-	min.z = -1.2f;
-	max.x = max.y = 0.5f;
-	max.z = 1.2f;
-	colmodel->boundingBox.Set(min, max, 0, 0);
-	colmodel->level = LEVEL_NONE;
-	m_hitColModel = colmodel;
-}
-
-CColModel*
-CPedModelInfo::AnimatePedColModel(CColModel* colmodel, RwFrame* frame)
-{
-	RwObjectNameAssociation nameAssoc;
-	RwObjectIdAssociation idAssoc;
-	RwMatrix* mat = RwMatrixCreate();
-	CColSphere* spheres = colmodel->spheres;
-
-	for (int i = 0; i < NUMPEDINFONODES; i++) {
-		RwFrame* f = nil;
-		if (m_pColNodeInfos[i].name) {
-			nameAssoc.name = m_pColNodeInfos[i].name;
-			nameAssoc.frame = nil;
-			RwFrameForAllChildren(frame, FindFrameFromNameCB, &nameAssoc);
-			f = nameAssoc.frame;
-		}
-		else {
-			idAssoc.id = m_pColNodeInfos[i].pedNode;
-			idAssoc.frame = nil;
-			RwFrameForAllChildren(frame, FindFrameFromIdCB, &idAssoc);
-			f = idAssoc.frame;
-		}
-		if (f) {
-			RwMatrixCopy(mat, RwFrameGetMatrix(f));
-
-			for (f = RwFrameGetParent(f); f; f = RwFrameGetParent(f)) {
-				RwMatrixTransform(mat, RwFrameGetMatrix(f), rwCOMBINEPOSTCONCAT);
-				if (RwFrameGetParent(f) == frame)
-					break;
-			}
-
-			spheres[i].center.x = mat->pos.x + m_pColNodeInfos[i].x;
-			spheres[i].center.y = mat->pos.y + 0.0f;
-			spheres[i].center.z = mat->pos.z + m_pColNodeInfos[i].z;
-		}
-	}
-
-	return colmodel;
-}
-
-#ifdef PED_SKIN
 void
 CPedModelInfo::CreateHitColModelSkinned(RpClump *clump)
 {
@@ -342,13 +103,13 @@ CPedModelInfo::CreateHitColModelSkinned(RpClump *clump)
 	colmodel->spheres = spheres;
 	colmodel->numSpheres = NUMPEDINFONODES;
 	center.x = center.y = center.z = 0.0f;
-	colmodel->boundingSphere.Set(2.0f, center, 0, 0);
+	colmodel->boundingSphere.Set(2.0f, center);
 	CVector min, max;
 	min.x = min.y = -0.5f;
 	min.z = -1.2f;
 	max.x = max.y = 0.5f;
 	max.z = 1.2f;
-	colmodel->boundingBox.Set(min, max, 0, 0);
+	colmodel->boundingBox.Set(min, max);
 	colmodel->level = LEVEL_NONE;
 	m_hitColModel = colmodel;
 }
@@ -385,4 +146,26 @@ CPedModelInfo::AnimatePedColModelSkinned(RpClump *clump)
 	return m_hitColModel;
 }
 
-#endif
+CColModel*
+CPedModelInfo::AnimatePedColModelSkinnedWorld(RpClump *clump)
+{
+	if(m_hitColModel == nil)
+		CreateHitColModelSkinned(clump);
+	CColSphere *spheres = m_hitColModel->spheres;
+	RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(clump);
+	RwMatrix *mat;
+
+	for(int i = 0; i < NUMPEDINFONODES; i++){
+		int id = ConvertPedNode2BoneTag(m_pColNodeInfos[i].pedNode);
+		int idx = RpHAnimIDGetIndex(hier, id);
+
+		mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
+		RwV3d pos = { 0.0f, 0.0f, 0.0f };
+		RwV3dTransformPoints(&pos, &pos, 1, mat);
+
+		spheres[i].center.x = pos.x + m_pColNodeInfos[i].x;
+		spheres[i].center.y = pos.y + 0.0f;
+		spheres[i].center.z = pos.z + m_pColNodeInfos[i].z;
+	}
+	return m_hitColModel;
+}
diff --git a/src/modelinfo/PedModelInfo.h b/src/modelinfo/PedModelInfo.h
index d73d3646..e878a59b 100644
--- a/src/modelinfo/PedModelInfo.h
+++ b/src/modelinfo/PedModelInfo.h
@@ -5,8 +5,8 @@
 #include "PedStats.h"
 
 enum PedNode {
-	PED_TORSO,
-	PED_MID,	// Smid on PS2/PC, Storso on mobile/xbox
+	PED_TORSO = 0,	// has no bone!
+	PED_MID,
 	PED_HEAD,
 	PED_UPPERARML,
 	PED_UPPERARMR,
@@ -17,7 +17,15 @@ enum PedNode {
 	PED_FOOTL,
 	PED_FOOTR,
 	PED_LOWERLEGR,
-	PED_NODE_MAX// Not valid: PED_LOWERLEGL
+	PED_LOWERLEGL,
+
+	PED_FOREARML,
+	PED_FOREARMR,
+	PED_CLAVICLEL,
+	PED_CLAVICLER,
+	PED_NECK,
+
+	PED_NODE_MAX
 };
 
 class CPedModelInfo : public CClumpModelInfo
@@ -28,40 +36,17 @@ public:
 	ePedStats m_pedStatType;
 	uint32 m_carsCanDrive;
 	CColModel *m_hitColModel;
-#ifdef PED_SKIN
-	RpAtomic *m_head;
-	RpAtomic *m_lhand;
-	RpAtomic *m_rhand;
-#endif
+	int8 radio1, radio2;
 
 	static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX];
 
-	CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) {
-		m_hitColModel = nil;
-#ifdef PED_SKIN
-		m_head = nil;
-		m_lhand = nil;
-		m_rhand = nil;
-#endif
-	}
+	CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { m_hitColModel = nil; }
 	~CPedModelInfo(void) { delete m_hitColModel; }
 	void DeleteRwObject(void);
 	void SetClump(RpClump *);
 
-	void SetLowDetailClump(RpClump*);
-	void CreateHitColModel(void);
 	void CreateHitColModelSkinned(RpClump *clump);
 	CColModel *GetHitColModel(void) { return m_hitColModel; }
-	static CColModel *AnimatePedColModel(CColModel* colmodel, RwFrame* frame);
 	CColModel *AnimatePedColModelSkinned(RpClump *clump);
-
-#ifdef PED_SKIN
-	static RpAtomic *findLimbsCb(RpAtomic *atomic, void *data);
-	RpAtomic *getHead(void) { return m_head; }
-	RpAtomic *getLeftHand(void) { return m_lhand; }
-	RpAtomic *getRightHand(void) { return m_rhand; }
-#endif
+	CColModel *AnimatePedColModelSkinnedWorld(RpClump *clump);
 };
-#ifndef PED_SKIN
-VALIDATE_SIZE(CPedModelInfo, 0x48);
-#endif
\ No newline at end of file
diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp
index 32204500..a7e6d56c 100644
--- a/src/modelinfo/SimpleModelInfo.cpp
+++ b/src/modelinfo/SimpleModelInfo.cpp
@@ -3,6 +3,9 @@
 #include "General.h"
 #include "Camera.h"
 #include "ModelInfo.h"
+#include "AnimManager.h"
+
+//--MIAMI: file done
 
 #define LOD_DISTANCE (300.0f)
 
@@ -18,6 +21,8 @@ CSimpleModelInfo::DeleteRwObject(void)
 			RwFrameDestroy(f);
 			m_atomics[i] = nil;
 			RemoveTexDictionaryRef();
+			if(GetAnimFileIndex() != -1)
+				CAnimManager::RemoveAnimBlockRef(GetAnimFileIndex());
 		}
 }
 
@@ -55,7 +60,7 @@ CSimpleModelInfo::Init(void)
 	m_atomics[2] = nil;
 	m_numAtomics = 0;
 	m_firstDamaged  = 0;
-	m_normalCull    = 0;
+	m_wetRoadReflection    = 0;
 	m_isDamaged     = 0;
 	m_isBigBuilding = 0;
 	m_noFade        = 0;
@@ -64,6 +69,10 @@ CSimpleModelInfo::Init(void)
 	m_isSubway      = 0;
 	m_ignoreLight   = 0;
 	m_noZwrite      = 0;
+	m_noShadows     = 0;
+	m_ignoreDrawDist  = 0;
+	m_isCodeGlass     = 0;
+	m_isArtistGlass   = 0;
 }
 
 void
@@ -71,10 +80,14 @@ CSimpleModelInfo::SetAtomic(int n, RpAtomic *atomic)
 {
 	AddTexDictionaryRef();
 	m_atomics[n] = atomic;
-	if(m_ignoreLight){
-		RpGeometry *geo = RpAtomicGetGeometry(atomic);
+	if(GetAnimFileIndex() != -1)
+		CAnimManager::AddAnimBlockRef(GetAnimFileIndex());
+	RpGeometry *geo = RpAtomicGetGeometry(atomic);
+	if(m_ignoreLight)
 		RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) & ~rpGEOMETRYLIGHT);
-	}
+	if(RpGeometryGetFlags(geo) & rpGEOMETRYNORMALS &&
+	   RpGeometryGetNumTriangles(geo) > 200)
+		debug("%s has %d polys\n", m_name, RpGeometryGetNumTriangles(geo));
 }
 
 void
@@ -130,12 +143,20 @@ CSimpleModelInfo::GetAtomicFromDistance(float dist)
 	return nil;
 }
 
+RpAtomic*
+CSimpleModelInfo::GetFirstAtomicFromDistance(float dist)
+{
+	if(dist < m_lodDistances[0] * TheCamera.LODDistMultiplier)
+		return m_atomics[0];
+	return nil;
+}
+
 void
-CSimpleModelInfo::FindRelatedModel(void)
+CSimpleModelInfo::FindRelatedModel(int32 minID, int32 maxID)
 {
 	int i;
 	CBaseModelInfo *mi;
-	for(i = 0; i < MODELINFOSIZE; i++){
+	for(i = minID; i <= maxID; i++){
 		mi = CModelInfo::GetModelInfo(i);
 		if(mi && mi != this &&
 		   !CGeneral::faststrcmp(GetName()+3, mi->GetName()+3)){
@@ -146,24 +167,23 @@ CSimpleModelInfo::FindRelatedModel(void)
 	}
 }
 
+#define NEAR_DRAW_DIST 0.0f	// 100.0f in liberty city
+
 void
-CSimpleModelInfo::SetupBigBuilding(void)
+CSimpleModelInfo::SetupBigBuilding(int32 minID, int32 maxID)
 {
 	CSimpleModelInfo *related;
 	if(m_lodDistances[0] > LOD_DISTANCE && GetRelatedModel() == nil){
 		m_isBigBuilding = 1;
-		FindRelatedModel();
+		FindRelatedModel(minID, maxID);
 		related = GetRelatedModel();
-		if(related)
+		if(related){
 			m_lodDistances[2] = related->GetLargestLodDistance()/TheCamera.LODDistMultiplier;
-		else
-#ifdef FIX_BUGS
-		if(toupper(m_name[0]) == 'L' && toupper(m_name[1]) == 'O' && toupper(m_name[2]) == 'D')
-			m_lodDistances[2] = 100.0f;
-		else
-			m_lodDistances[2] = 0.0f;
-#else
-			m_lodDistances[2] = 100.0f;
-#endif
+			if(m_drawLast){
+				m_drawLast = false;
+				debug("%s was draw last\n", GetName());
+			}
+		}else
+			m_lodDistances[2] = NEAR_DRAW_DIST;
 	}
 }
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index ee63f24b..986cb886 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -14,15 +14,22 @@ public:
 	uint16 m_firstDamaged   : 2; // 0: no damage model
 	                         // 1: 1 and 2 are damage models
 	                         // 2: 2 is damage model
-	uint16  m_normalCull    : 1;
+	uint16  m_wetRoadReflection    : 1;
 	uint16  m_isDamaged     : 1;
+
 	uint16  m_isBigBuilding : 1;
 	uint16  m_noFade        : 1;
 	uint16  m_drawLast      : 1;
 	uint16  m_additive      : 1;
+
 	uint16  m_isSubway      : 1;
 	uint16  m_ignoreLight   : 1;
 	uint16  m_noZwrite      : 1;
+	uint16  m_noShadows     : 1;
+
+	uint16  m_ignoreDrawDist   : 1;
+	uint16  m_isCodeGlass      : 1;
+	uint16  m_isArtistGlass    : 1;
 
 	CSimpleModelInfo(void) : CBaseModelInfo(MITYPE_SIMPLE) {}
 	CSimpleModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
@@ -32,16 +39,18 @@ public:
 	RwObject *CreateInstance(RwMatrix *);
 	RwObject *GetRwObject(void) { return (RwObject*)m_atomics[0]; }
 
+	virtual void SetAtomic(int n, RpAtomic *atomic);
+
 	void Init(void);
 	void IncreaseAlpha(void);
-	void SetAtomic(int n, RpAtomic *atomic);
 	void SetLodDistances(float *dist);
 	float GetLodDistance(int i);
 	float GetNearDistance(void);
 	float GetLargestLodDistance(void);
 	RpAtomic *GetAtomicFromDistance(float dist);
-	void FindRelatedModel(void);
-	void SetupBigBuilding(void);
+	RpAtomic *GetFirstAtomicFromDistance(float dist);
+	void FindRelatedModel(int32 minID, int32 maxID);
+	void SetupBigBuilding(int32 minID, int32 maxID);
 
 	void SetNumAtomics(int n) { m_numAtomics = n; }
 	CSimpleModelInfo *GetRelatedModel(void){
@@ -49,5 +58,4 @@ public:
 	void SetRelatedModel(CSimpleModelInfo *m){
 		m_atomics[2] = (RpAtomic*)m; }
 };
-
-VALIDATE_SIZE(CSimpleModelInfo, 0x4C);
+//static_assert(sizeof(CSimpleModelInfo) == 0x4C, "CSimpleModelInfo: error");
diff --git a/src/modelinfo/TimeModelInfo.h b/src/modelinfo/TimeModelInfo.h
index 73b6ab26..6e3c64fb 100644
--- a/src/modelinfo/TimeModelInfo.h
+++ b/src/modelinfo/TimeModelInfo.h
@@ -17,5 +17,4 @@ public:
 	void SetOtherTimeModel(int32 other) { m_otherTimeModelID = other; }
 	CTimeModelInfo *FindOtherTimeModel(void);
 };
-
-VALIDATE_SIZE(CTimeModelInfo, 0x58);
+//static_assert(sizeof(CTimeModelInfo) == 0x58, "CTimeModelInfo: error");
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index d8b388d5..d1994c06 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -20,9 +20,10 @@
 #include "ModelIndices.h"
 #include "ModelInfo.h"
 
+//--MIAMI: done
+
 int8 CVehicleModelInfo::ms_compsToUse[2] = { -2, -2 };
 int8 CVehicleModelInfo::ms_compsUsed[2];
-RwTexture *CVehicleModelInfo::ms_pEnvironmentMaps[NUM_VEHICLE_ENVMAPS];
 RwRGBA CVehicleModelInfo::ms_vehicleColourTable[256];
 RwTexture *CVehicleModelInfo::ms_colourTextureTable[256];
 
@@ -82,9 +83,13 @@ RwObjectNameIdAssocation carIds[] = {
 };
 
 RwObjectNameIdAssocation boatIds[] = {
-	{ "boat_moving_hi",	BOAT_MOVING,	VEHICLE_FLAG_COLLAPSE },
-	{ "boat_rudder_hi",	BOAT_RUDDER,	VEHICLE_FLAG_COLLAPSE },
-	{ "windscreen",		BOAT_WINDSCREEN,	VEHICLE_FLAG_WINDSCREEN | VEHICLE_FLAG_COLLAPSE },
+	{ "boat_moving_hi",	BOAT_MOVING,	0 },
+	{ "boat_rudder_hi",	BOAT_RUDDER,	0 },
+	{ "boat_flap_left",	BOAT_FLAP_LEFT,	0 },
+	{ "boat_flap_right",	BOAT_FLAP_RIGHT,	0 },
+	{ "boat_rearflap_left",	BOAT_REARFLAP_LEFT,	0 },
+	{ "boat_rearflap_right",	BOAT_REARFLAP_RIGHT,	0 },
+	{ "windscreen_hi_ok",		BOAT_WINDSCREEN,	VEHICLE_FLAG_WINDSCREEN | VEHICLE_FLAG_DRAWLAST },
 	{ "ped_frontseat",	BOAT_POS_FRONTSEAT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ nil, 0, 0 }
 };
@@ -127,7 +132,9 @@ RwObjectNameIdAssocation bikeIds[] = {
 	{ "wheel_front",	BIKE_WHEEL_FRONT,	0 },
 	{ "wheel_rear",		BIKE_WHEEL_REAR,	0 },
 	{ "mudguard",		BIKE_MUDGUARD,	0 },
+	{ "handlebars",		BIKE_HANDLEBARS,	0 },
 	{ "ped_frontseat",	CAR_POS_FRONTSEAT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
+	{ "ped_backseat",	CAR_POS_BACKSEAT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "headlights",		CAR_POS_HEADLIGHTS,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "taillights",		CAR_POS_TAILLIGHTS,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "exhaust",		CAR_POS_EXHAUST,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
@@ -149,6 +156,8 @@ RwObjectNameIdAssocation *CVehicleModelInfo::ms_vehicleDescs[] = {
 	bikeIds
 };
 
+bool gbBlackCars;
+bool gbPinkCars;
 
 CVehicleModelInfo::CVehicleModelInfo(void)
  : CClumpModelInfo(MITYPE_VEHICLE)
@@ -160,6 +169,7 @@ CVehicleModelInfo::CVehicleModelInfo(void)
 		m_positions[i].z = 0.0f;
 	}
 	m_numColours = 0;
+	m_animFileIndex = -1;
 }
 
 void
@@ -229,10 +239,30 @@ CVehicleModelInfo::SetClump(RpClump *clump)
 	SetFrameIds(ms_vehicleDescs[m_vehicleType]);
 	PreprocessHierarchy();
 	FindEditableMaterialList();
-	m_envMap = nil;
 	SetEnvironmentMap();
 }
 
+void
+CVehicleModelInfo::SetAnimFile(const char *file)
+{
+	if(strcasecmp(file, "null") == 0)
+		return;
+
+	m_animFileName = new char[strlen(file)+1];
+	strcpy(m_animFileName, file);
+}
+
+void
+CVehicleModelInfo::ConvertAnimFileIndex(void)
+{
+	if(m_animFileIndex != -1){
+		// we have a string pointer in that union
+		int32 index = CAnimManager::GetAnimationBlockIndex(m_animFileName);
+		delete[] m_animFileName;
+		m_animFileIndex = index;
+	}
+}
+
 RwFrame*
 CVehicleModelInfo::CollapseFramesCB(RwFrame *frame, void *data)
 {
@@ -385,30 +415,68 @@ CVehicleModelInfo::SetAtomicRendererCB_Boat(RpAtomic *atomic, void *data)
 RpAtomic*
 CVehicleModelInfo::SetAtomicRendererCB_Heli(RpAtomic *atomic, void *data)
 {
-	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+	char *name;
+
+	name = GetFrameNodeName(RpAtomicGetFrame(atomic));
+	if(strncmp(name, "toprotor", 8) == 0)
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleRotorAlphaCB);
+	else if(strncmp(name, "rearrotor", 9) == 0)
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleTailRotorAlphaCB);
+	else
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+	return atomic;
+}
+
+RpAtomic*
+CVehicleModelInfo::SetAtomicRendererCB_RealHeli(RpAtomic *atomic, void *data)
+{
+	RpClump *clump;
+	char *name;
+	bool alpha;
+
+	clump = (RpClump*)data;
+	name = GetFrameNodeName(RpAtomicGetFrame(atomic));
+	alpha = false;
+	RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), HasAlphaMaterialCB, &alpha);
+	if(strncmp(name, "toprotor", 8) == 0)
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleRotorAlphaCB);
+	else if(strncmp(name, "rearrotor", 9) == 0)
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleTailRotorAlphaCB);
+	else if(strstr(name, "_hi") || strncmp(name, "extra", 5) == 0){
+		if(alpha || strncmp(name, "windscreen", 10) == 0)
+			CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleHiDetailAlphaCB);
+		else
+			CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleHiDetailCB);
+	}else if(strstr(name, "_lo")){
+		RpClumpRemoveAtomic(clump, atomic);
+		RpAtomicDestroy(atomic);
+		return atomic;		// BUG: not done by gta
+	}else if(strstr(name, "_vlo"))
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderVehicleReallyLowDetailCB);
+	else
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
+	HideDamagedAtomicCB(atomic, nil);
 	return atomic;
 }
 
 void
 CVehicleModelInfo::SetAtomicRenderCallbacks(void)
 {
-	switch(m_vehicleType){
-	case VEHICLE_TYPE_TRAIN:
+#ifdef GTA_TRAIN
+	if(m_vehicleType == VEHICLE_TYPE_TRAIN)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_Train, nil);
-		break;
-	case VEHICLE_TYPE_HELI:
+	else
+#endif
+	if(m_vehicleType == VEHICLE_TYPE_HELI)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_Heli, nil);
-		break;
-	case VEHICLE_TYPE_PLANE:
+	else if(m_vehicleType == VEHICLE_TYPE_PLANE)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_BigVehicle, nil);
-		break;
-	case VEHICLE_TYPE_BOAT:
+	else if(m_vehicleType == VEHICLE_TYPE_BOAT)
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_Boat, m_clump);
-		break;
-	default:
+	else if(mod_HandlingManager.GetHandlingData((eHandlingId)m_handlingId)->Flags & HANDLING_IS_HELI)
+		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_RealHeli, m_clump);
+	else
 		RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, m_clump);
-		break;
-	}
 }
 
 RwObject*
@@ -605,6 +673,13 @@ ChooseComponent(int32 rule, int32 comps)
 		// only valid in rain
 		n = CGeneral::GetRandomNumberInRange(0, CountCompsInRule(comps));
 		return COMPRULE_COMPN(comps, n);
+	case 3:
+		n = CGeneral::GetRandomNumberInRange(0, 1+CountCompsInRule(comps));
+		if(n != 0)
+			return COMPRULE_COMPN(comps, n-1);
+		return -1;
+	case 4:
+		return CGeneral::GetRandomNumberInRange(0, 5);
 	}
 	return -1;
 }
@@ -731,6 +806,9 @@ CVehicleModelInfo::GetEditableMaterialListCB(RpAtomic *atomic, void *data)
 	return atomic;
 }
 
+static int maxFirstMaterials;
+static int maxSecondMaterials;
+
 void
 CVehicleModelInfo::FindEditableMaterialList(void)
 {
@@ -745,6 +823,8 @@ CVehicleModelInfo::FindEditableMaterialList(void)
 		GetEditableMaterialListCB(m_comps[i], &cbdata);
 	m_materials1[cbdata.numMats1] = nil;
 	m_materials2[cbdata.numMats2] = nil;
+	maxFirstMaterials = Max(maxFirstMaterials, cbdata.numMats1);
+	maxSecondMaterials = Max(maxSecondMaterials, cbdata.numMats2);
 	m_currentColour1 = -1;
 	m_currentColour2 = -1;
 }
@@ -753,35 +833,26 @@ void
 CVehicleModelInfo::SetVehicleColour(uint8 c1, uint8 c2)
 {
 	RwRGBA col, *colp;
-	RwTexture *coltex;
 	RpMaterial **matp;
 
 	if(c1 != m_currentColour1){
 		col = ms_vehicleColourTable[c1];
-		coltex = ms_colourTextureTable[c1];
 		for(matp = m_materials1; *matp; matp++){
-			if(RpMaterialGetTexture(*matp) && RwTextureGetName(RpMaterialGetTexture(*matp))[0] != '@'){
-				colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
-				colp->red = col.red;
-				colp->green = col.green;
-				colp->blue = col.blue;
-			}else
-				RpMaterialSetTexture(*matp, coltex);
+			colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
+			colp->red = col.red;
+			colp->green = col.green;
+			colp->blue = col.blue;
 		}
 		m_currentColour1 = c1;
 	}
 
 	if(c2 != m_currentColour2){
 		col = ms_vehicleColourTable[c2];
-		coltex = ms_colourTextureTable[c2];
 		for(matp = m_materials2; *matp; matp++){
-			if(RpMaterialGetTexture(*matp) && RwTextureGetName(RpMaterialGetTexture(*matp))[0] != '@'){
-				colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
-				colp->red = col.red;
-				colp->green = col.green;
-				colp->blue = col.blue;
-			}else
-				RpMaterialSetTexture(*matp, coltex);
+			colp = (RwRGBA*)RpMaterialGetColor(*matp);	// get rid of const
+			colp->red = col.red;
+			colp->green = col.green;
+			colp->blue = col.blue;
 		}
 		m_currentColour2 = c2;
 	}
@@ -790,9 +861,12 @@ CVehicleModelInfo::SetVehicleColour(uint8 c1, uint8 c2)
 void
 CVehicleModelInfo::ChooseVehicleColour(uint8 &col1, uint8 &col2)
 {
-	if(m_numColours == 0){
+	if(m_numColours == 0 || gbBlackCars){
 		col1 = 0;
 		col2 = 0;
+	}else if(gbPinkCars){
+		col1 = 68;
+		col2 = 68;
 	}else{
 		m_lastColorVariation = (m_lastColorVariation+1) % m_numColours;
 		col1 = m_colours1[m_lastColorVariation];
@@ -815,18 +889,27 @@ CVehicleModelInfo::AvoidSameVehicleColour(uint8 *col1, uint8 *col2)
 {
 	int i, n;
 
-	if(m_numColours > 1)
-		for(i = 0; i < 8; i++){
-			if(*col1 != m_lastColour1 || *col2 != m_lastColour2)
-				break;
-			n = CGeneral::GetRandomNumberInRange(0, m_numColours);
-			*col1 = m_colours1[n];
-			*col2 = m_colours2[n];
-		}
-	m_lastColour1 = *col1;
-	m_lastColour2 = *col2;
+	if(gbBlackCars){
+		*col1 = 0;
+		*col2 = 0;
+	}else if(gbPinkCars){
+		*col1 = 68;
+		*col2 = 68;
+	}else{
+		if(m_numColours > 1)
+			for(i = 0; i < 8; i++){
+				if(*col1 != m_lastColour1 || *col2 != m_lastColour2)
+					break;
+				n = CGeneral::GetRandomNumberInRange(0, m_numColours);
+				*col1 = m_colours1[n];
+				*col2 = m_colours2[n];
+			}
+		m_lastColour1 = *col1;
+		m_lastColour2 = *col2;
+	}
 }
 
+//--MIAMI: unused
 RwTexture*
 CreateCarColourTexture(uint8 r, uint8 g, uint8 b)
 {
@@ -926,7 +1009,6 @@ CVehicleModelInfo::LoadVehicleColours(void)
 			ms_vehicleColourTable[numCols].green = g;
 			ms_vehicleColourTable[numCols].blue = b;
 			ms_vehicleColourTable[numCols].alpha = 0xFF;
-			ms_colourTextureTable[numCols] = CreateCarColourTexture(r, g, b);
 			numCols++;
 		}else if(section == CARS){
 			n = sscanf(&line[start],	// BUG: games doesn't add start
@@ -961,38 +1043,33 @@ CVehicleModelInfo::DeleteVehicleColourTextures(void)
 	for(i = 0; i < 256; i++){
 		if(ms_colourTextureTable[i]){
 			RwTextureDestroy(ms_colourTextureTable[i]);
-#ifdef GTA3_1_1_PATCH
 			ms_colourTextureTable[i] = nil;
-#endif
 		}
 	}
 }
 
 RpMaterial*
-CVehicleModelInfo::HasSpecularMaterialCB(RpMaterial *material, void *data)
+CVehicleModelInfo::GetMatFXEffectMaterialCB(RpMaterial *material, void *data)
 {
-	if(RpMaterialGetSurfaceProperties(material)->specular <= 0.0f)
+	if(RpMatFXMaterialGetEffects(material) == rpMATFXEFFECTNULL)
 		return material;
-	*(bool*)data = true;
+	*(int*)data = RpMatFXMaterialGetEffects(material);
 	return nil;
 }
 
 RpMaterial*
-CVehicleModelInfo::SetEnvironmentMapCB(RpMaterial *material, void *data)
+CVehicleModelInfo::SetDefaultEnvironmentMapCB(RpMaterial *material, void *data)
 {
-	float spec;
-
-	spec = RpMaterialGetSurfaceProperties(material)->specular;
-	if(spec <= 0.0f)
-		RpMatFXMaterialSetEffects(material, rpMATFXEFFECTNULL);
-	else{
+	if(RpMatFXMaterialGetEffects(material) == rpMATFXEFFECTENVMAP){
+		RpMatFXMaterialSetEnvMapFrame(material, pMatFxIdentityFrame);
 		if(RpMaterialGetTexture(material) == nil)
 			RpMaterialSetTexture(material, gpWhiteTexture);
 		RpMatFXMaterialSetEffects(material, rpMATFXEFFECTENVMAP);
 #ifndef PS2_MATFX
-		spec *= 0.5f;	// Tone down a bit for PC
+		float coef = RpMatFXMaterialGetEnvMapCoefficient(material);
+		coef *= 0.25f;	// Tone down a bit for PC
+		RpMatFXMaterialSetEnvMapCoefficient(material, coef);
 #endif
-		RpMatFXMaterialSetupEnvMap(material, (RwTexture*)data, pMatFxIdentityFrame, false, spec);
 	}
 	return material;
 }
@@ -1000,17 +1077,15 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpMaterial *material, void *data)
 RpAtomic*
 CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data)
 {
-	bool hasSpec;
+	int fx;
 	RpGeometry *geo;
 
 	geo = RpAtomicGetGeometry(atomic);
-	hasSpec = 0;
-	RpGeometryForAllMaterials(geo, HasSpecularMaterialCB, &hasSpec);
-	if(hasSpec){
-		RpGeometryForAllMaterials(geo, SetEnvironmentMapCB, data);
-		RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) | rpGEOMETRYMODULATEMATERIALCOLOR);
+	fx = 0;
+	RpGeometryForAllMaterials(geo, GetMatFXEffectMaterialCB, &fx);
+	if(fx != rpMATFXEFFECTNULL){
 		RpMatFXAtomicEnableEffects(atomic);
-		// PS2 sets of PS2Manager lighting CB here
+		RpGeometryForAllMaterials(geo, SetDefaultEnvironmentMapCB, data);
 	}
 	return atomic;
 }
@@ -1022,44 +1097,29 @@ CVehicleModelInfo::SetEnvironmentMap(void)
 	int32 i;
 
 	if(pMatFxIdentityFrame == nil){
+		RwV3d axis = { 1.0f, 0.0f, 0.0f };
 		pMatFxIdentityFrame = RwFrameCreate();
-		RwMatrixSetIdentity(RwFrameGetMatrix(pMatFxIdentityFrame));
+		RwMatrixRotate(RwFrameGetMatrix(pMatFxIdentityFrame), &axis, 60.0f, rwCOMBINEREPLACE);
 		RwFrameUpdateObjects(pMatFxIdentityFrame);
 		RwFrameGetLTM(pMatFxIdentityFrame);
 	}
 
-	if(m_envMap != ms_pEnvironmentMaps[0]){
-		m_envMap = ms_pEnvironmentMaps[0];
-		RpClumpForAllAtomics(m_clump, SetEnvironmentMapCB, m_envMap);
-		if(m_wheelId != -1){
-			wheelmi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(m_wheelId);
-			for(i = 0; i < wheelmi->m_numAtomics; i++)
-				SetEnvironmentMapCB(wheelmi->m_atomics[i], m_envMap);
-		}
+	RpClumpForAllAtomics(m_clump, SetEnvironmentMapCB, nil);
+	if(m_wheelId != -1){
+		wheelmi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(m_wheelId);
+		for(i = 0; i < wheelmi->m_numAtomics; i++)
+			SetEnvironmentMapCB(wheelmi->m_atomics[i], nil);
 	}
 }
 
 void
 CVehicleModelInfo::LoadEnvironmentMaps(void)
 {
-	const char *texnames[] = {
-		"reflection01",		// only one used
-		"reflection02",
-		"reflection03",
-		"reflection04",
-		"reflection05",
-		"reflection06",
-	};
 	int32 txdslot;
-	int32 i;
 
 	txdslot = CTxdStore::FindTxdSlot("particle");
 	CTxdStore::PushCurrentTxd();
 	CTxdStore::SetCurrentTxd(txdslot);
-	for(i = 0; i < NUM_VEHICLE_ENVMAPS; i++){
-		ms_pEnvironmentMaps[i] = RwTextureRead(texnames[i], nil);
-		RwTextureSetFilterMode(ms_pEnvironmentMaps[i], rwFILTERLINEAR);
-	}
 	if(gpWhiteTexture == nil){
 		gpWhiteTexture = RwTextureRead("white", nil);
 		RwTextureGetName(gpWhiteTexture)[0] = '@';
@@ -1071,14 +1131,8 @@ CVehicleModelInfo::LoadEnvironmentMaps(void)
 void
 CVehicleModelInfo::ShutdownEnvironmentMaps(void)
 {
-	int32 i;
-
-	// ignoring "initialised" as that's a PS2 thing only
 	RwTextureDestroy(gpWhiteTexture);
 	gpWhiteTexture = nil;
-	for(i = 0; i < NUM_VEHICLE_ENVMAPS; i++)
-		if(ms_pEnvironmentMaps[i])
-			RwTextureDestroy(ms_pEnvironmentMaps[i]);
 	RwFrameDestroy(pMatFxIdentityFrame);
 	pMatFxIdentityFrame = nil;
 }
@@ -1095,12 +1149,15 @@ CVehicleModelInfo::GetMaximumNumberOfPassengersFromNumberOfDoors(int id)
 	case MI_FIRETRUCK:
 		n = 2;
 		break;
+	case MI_HUNTER:
+		n = 1;
+		break;
 	default:
 		n = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(id))->m_numDoors;
 	}
 
 	if(n == 0)
-		return id == MI_RCBANDIT ? 0 : 1;
+		return id == MI_RCBANDIT || id == MI_PIZZABOY || id == MI_BAGGAGE ? 0 : 1;
 
 	if(id == MI_COACH)
 		return 8;
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index 468ce96d..945bdd92 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -3,10 +3,9 @@
 #include "ClumpModelInfo.h"
 
 enum {
-	NUM_FIRST_MATERIALS = 26,
-	NUM_SECOND_MATERIALS = 26,
+	NUM_FIRST_MATERIALS = 24,
+	NUM_SECOND_MATERIALS = 20,
 	NUM_VEHICLE_COLOURS = 8,
-	NUM_VEHICLE_ENVMAPS = 1
 };
 
 enum {
@@ -41,13 +40,6 @@ enum eCarPositions
 	CAR_POS_TAILLIGHTS,
 	CAR_POS_FRONTSEAT,
 	CAR_POS_BACKSEAT,
-	// these are unused so we don't know the actual values
-	CAR_POS_REVERSELIGHTS,
-	CAR_POS_BRAKELIGHTS,
-	CAR_POS_INDICATORS_FRONT,
-	CAR_POS_INDICATORS_BACK,
-	CAR_POS_STEERWHEEL,
-	//
 	CAR_POS_EXHAUST
 };
 
@@ -73,7 +65,7 @@ enum ePlanePositions
 };
 
 enum {
-	NUM_VEHICLE_POSITIONS = 10
+	NUM_VEHICLE_POSITIONS = 5
 };
 
 class CVehicleModelInfo : public CClumpModelInfo
@@ -81,17 +73,19 @@ class CVehicleModelInfo : public CClumpModelInfo
 public:
 	uint8 m_lastColour1;
 	uint8 m_lastColour2;
-	char m_gameName[32];
+	char m_gameName[10];
 	int32 m_vehicleType;
+	float m_wheelScale;
 	union {
-		int32 m_wheelId;
-		int32 m_planeLodId;
+		int16 m_wheelId;
+		int16 m_planeLodId;
 	};
-	float m_wheelScale;
-	int32 m_numDoors;
-	int32 m_handlingId;
-	int32 m_vehicleClass;
-	int32 m_level;
+	int16 m_handlingId;
+	int8 m_numDoors;
+	int8 m_vehicleClass;
+	int8 m_level;
+	int8 m_numComps;
+	int16 m_frequency;
 	CVector m_positions[NUM_VEHICLE_POSITIONS];
 	uint32 m_compRules;
 	float m_bikeSteerAngle;
@@ -103,13 +97,15 @@ public:
 	uint8 m_lastColorVariation;
 	uint8 m_currentColour1;
 	uint8 m_currentColour2;
-	RwTexture *m_envMap;
 	RpAtomic *m_comps[6];
-	int32 m_numComps;
+	// This is stupid, CClumpModelInfo already has it!
+	union {
+		int32 m_animFileIndex;
+		char *m_animFileName;
+	};
 
 	static int8 ms_compsToUse[2];
 	static int8 ms_compsUsed[2];
-	static RwTexture *ms_pEnvironmentMaps[NUM_VEHICLE_ENVMAPS];
 	static RwRGBA ms_vehicleColourTable[256];
 	static RwTexture *ms_colourTextureTable[256];
 	static RwObjectNameIdAssocation *ms_vehicleDescs[NUM_VEHICLE_TYPES];
@@ -118,6 +114,9 @@ public:
 	void DeleteRwObject(void);
 	RwObject *CreateInstance(void);
 	void SetClump(RpClump *);
+	void SetAnimFile(const char *file);
+	void ConvertAnimFileIndex(void);
+	int GetAnimFileIndex(void) { return m_animFileIndex; }
 
 	static RwFrame *CollapseFramesCB(RwFrame *frame, void *data);
 	static RwObject *MoveObjectsCB(RwObject *object, void *data);
@@ -130,6 +129,7 @@ public:
 	static RpAtomic *SetAtomicRendererCB_Train(RpAtomic *atomic, void *data);
 	static RpAtomic *SetAtomicRendererCB_Boat(RpAtomic *atomic, void *data);
 	static RpAtomic *SetAtomicRendererCB_Heli(RpAtomic *atomic, void *data);
+	static RpAtomic *SetAtomicRendererCB_RealHeli(RpAtomic *atomic, void *data);
 	void SetAtomicRenderCallbacks(void);
 
 	static RwObject *SetAtomicFlagCB(RwObject *object, void *data);
@@ -137,7 +137,7 @@ public:
 	void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
 	void PreprocessHierarchy(void);
 	void GetWheelPosn(int32 n, CVector &pos);
-	CVector &GetFrontSeatPosn(void) { return m_positions[m_vehicleType == VEHICLE_TYPE_BOAT ? BOAT_POS_FRONTSEAT : CAR_POS_FRONTSEAT]; };
+	CVector GetFrontSeatPosn(void) { return m_positions[m_vehicleType == VEHICLE_TYPE_BOAT ? BOAT_POS_FRONTSEAT : CAR_POS_FRONTSEAT]; };
 
 	int32 ChooseComponent(void);
 	int32 ChooseSecondComponent(void);
@@ -152,8 +152,8 @@ public:
 	static void DeleteVehicleColourTextures(void);
 
 	static RpAtomic *SetEnvironmentMapCB(RpAtomic *atomic, void *data);
-	static RpMaterial *SetEnvironmentMapCB(RpMaterial *material, void *data);
-	static RpMaterial *HasSpecularMaterialCB(RpMaterial *material, void *data);
+	static RpMaterial *SetDefaultEnvironmentMapCB(RpMaterial *material, void *data);
+	static RpMaterial *GetMatFXEffectMaterialCB(RpMaterial *material, void *data);
 	void SetEnvironmentMap(void);
 	static void LoadEnvironmentMaps(void);
 	static void ShutdownEnvironmentMaps(void);
@@ -162,4 +162,5 @@ public:
 	static void SetComponentsToUse(int8 c1, int8 c2) { ms_compsToUse[0] = c1; ms_compsToUse[1] = c2; }
 };
 
-VALIDATE_SIZE(CVehicleModelInfo, 0x1F8);
+extern bool gbBlackCars;
+extern bool gbPinkCars;
diff --git a/src/modelinfo/WeaponModelInfo.cpp b/src/modelinfo/WeaponModelInfo.cpp
new file mode 100644
index 00000000..2a79fada
--- /dev/null
+++ b/src/modelinfo/WeaponModelInfo.cpp
@@ -0,0 +1,55 @@
+#include "common.h"
+
+#include "ModelInfo.h"
+#include "AnimManager.h"
+#include "VisibilityPlugins.h"
+
+//--MIAMI: file done
+
+void
+CWeaponModelInfo::SetAnimFile(const char *file)
+{
+	if(strcasecmp(file, "null") == 0)
+		return;
+
+	m_animFileName = new char[strlen(file)+1];
+	strcpy(m_animFileName, file);
+}
+
+void
+CWeaponModelInfo::ConvertAnimFileIndex(void)
+{
+	if(m_animFileIndex != -1){
+		// we have a string pointer in that union
+		int32 index = CAnimManager::GetAnimationBlockIndex(m_animFileName);
+		delete[] m_animFileName;
+		m_animFileIndex = index;
+	}
+}
+
+void
+CWeaponModelInfo::Init(void)
+{
+	CSimpleModelInfo::Init();
+	SetWeaponInfo(0);
+}
+
+void
+CWeaponModelInfo::SetWeaponInfo(int32 weaponId)
+{
+	m_atomics[2] = (RpAtomic*)weaponId;
+}
+
+int32
+CWeaponModelInfo::GetWeaponInfo(void)
+{
+	return (int32)(uintptr)m_atomics[2];
+}
+
+void
+CWeaponModelInfo::SetAtomic(int n, RpAtomic *atomic)
+{
+	CSimpleModelInfo::SetAtomic(n, atomic);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderWeaponCB);
+}
+
diff --git a/src/modelinfo/WeaponModelInfo.h b/src/modelinfo/WeaponModelInfo.h
new file mode 100644
index 00000000..5c690c29
--- /dev/null
+++ b/src/modelinfo/WeaponModelInfo.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "SimpleModelInfo.h"
+
+class CWeaponModelInfo : public CSimpleModelInfo
+{
+	union {
+		int32 m_animFileIndex;
+		char *m_animFileName;
+	};
+public:
+	CWeaponModelInfo(void) : CSimpleModelInfo(MITYPE_WEAPON) { m_animFileIndex = -1; }
+
+	virtual void SetAnimFile(const char *file);
+	virtual void ConvertAnimFileIndex(void);
+	virtual int GetAnimFileIndex(void) { return m_animFileIndex; }
+	virtual void SetAtomic(int n, RpAtomic *atomic);
+	
+	void Init(void);
+	void SetWeaponInfo(int32 weaponId);
+	int32 GetWeaponInfo(void);
+};
diff --git a/src/modelinfo/XtraCompsModelInfo.h b/src/modelinfo/XtraCompsModelInfo.h
deleted file mode 100644
index 9832399c..00000000
--- a/src/modelinfo/XtraCompsModelInfo.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "ClumpModelInfo.h"
-
-class CXtraCompsModelInfo : public CClumpModelInfo
-{
-	int field_34;
-public:
-	CXtraCompsModelInfo(void) : CClumpModelInfo(MITYPE_XTRACOMPS) { field_34 = 0; }
-	void SetClump(RpClump*) {};
-	void Shutdown(void) {};
-};
\ No newline at end of file
diff --git a/src/objects/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp
deleted file mode 100644
index 55e75807..00000000
--- a/src/objects/CutsceneHead.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-#include "common.h"
-#include <rpskin.h>
-
-#include "main.h"
-#include "RwHelper.h"
-#include "RpAnimBlend.h"
-#include "AnimBlendClumpData.h"
-#include "Bones.h"
-#include "Directory.h"
-#include "CutsceneMgr.h"
-#include "Streaming.h"
-#include "CutsceneHead.h"
-#include "CdStream.h"
-
-
-CCutsceneHead::CCutsceneHead(CObject *obj)
-{
-	RpAtomic *atm;
-
-	assert(RwObjectGetType(obj->m_rwObject) == rpCLUMP);
-#ifdef PED_SKIN
-	unk1 = 0;
-	bIsSkinned = false;
-	m_parentObject = (CCutsceneObject*)obj;
-	// Hide original head
-	if(IsClumpSkinned(obj->GetClump())){
-		m_parentObject->SetRenderHead(false);
-		bIsSkinned = true;
-	}else
-#endif
-	{
-		m_pHeadNode = RpAnimBlendClumpFindFrame((RpClump*)obj->m_rwObject, "Shead")->frame;
-		atm = (RpAtomic*)GetFirstObject(m_pHeadNode);
-		if(atm){
-			assert(RwObjectGetType((RwObject*)atm) == rpATOMIC);
-			RpAtomicSetFlags(atm, RpAtomicGetFlags(atm) & ~rpATOMICRENDER);
-		}
-	}
-}
-
-void
-CCutsceneHead::CreateRwObject(void)
-{
-	RpAtomic *atm;
-
-	CEntity::CreateRwObject();
-	assert(RwObjectGetType(m_rwObject) == rpCLUMP);
-	atm = GetFirstAtomic((RpClump*)m_rwObject);
-	RpSkinAtomicSetHAnimHierarchy(atm, RpHAnimFrameGetHierarchy(GetFirstChild(RpClumpGetFrame((RpClump*)m_rwObject))));
-}
-
-void
-CCutsceneHead::DeleteRwObject(void)
-{
-	CEntity::DeleteRwObject();
-}
-
-void
-CCutsceneHead::ProcessControl(void)
-{
-	RpAtomic *atm;
-	RpHAnimHierarchy *hier;
-
-	// android/xbox calls is at the end
-	CPhysical::ProcessControl();
-
-#ifdef PED_SKIN
-	if(bIsSkinned){
-		UpdateRpHAnim();
-		UpdateRwFrame();
-
-		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(m_parentObject->GetClump());
-		int idx = RpHAnimIDGetIndex(hier, BONE_head);
-		RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
-		if(RwV3dLength(&mat->pos) > 100.0f){
-			m_matrix.SetRotateY(PI/2);
-			m_matrix = CMatrix(mat) * m_matrix;
-		}
-	}else
-#endif
-	{
-		m_matrix.SetRotateY(PI/2);
-		m_matrix = CMatrix(RwFrameGetLTM(m_pHeadNode)) * m_matrix;
-		UpdateRwFrame();	// android/xbox don't call this
-	}
-
-	assert(RwObjectGetType(m_rwObject) == rpCLUMP);
-	atm = GetFirstAtomic((RpClump*)m_rwObject);
-	hier = RpSkinAtomicGetHAnimHierarchy(atm);
-	RpHAnimHierarchyAddAnimTime(hier, CTimer::GetTimeStepNonClipped()/50.0f);
-}
-
-void
-CCutsceneHead::Render(void)
-{
-	RpAtomic *atm;
-
-#ifdef PED_SKIN
-	if(bIsSkinned){
-		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(m_parentObject->GetClump());
-		RpHAnimHierarchyUpdateMatrices(hier);
-		int idx = RpHAnimIDGetIndex(hier, BONE_head);
-		RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
-		if(RwV3dLength(&mat->pos) > 100.0f){
-			m_matrix.SetRotateY(PI/2);
-			m_matrix = CMatrix(mat) * m_matrix;
-		}
-		// This is head...it has no limbs
-#ifndef FIX_BUGS
-		RenderLimb(BONE_Lhand);
-		RenderLimb(BONE_Rhand);
-#endif
-	}else
-#endif
-	{
-		m_matrix.SetRotateY(PI/2);
-		m_matrix = CMatrix(RwFrameGetLTM(m_pHeadNode)) * m_matrix;
-	}
-
-	UpdateRwFrame();
-
-	assert(RwObjectGetType(m_rwObject) == rpCLUMP);
-	atm = GetFirstAtomic((RpClump*)m_rwObject);
-	RpHAnimHierarchyUpdateMatrices(RpSkinAtomicGetHAnimHierarchy(atm));
-
-	CObject::Render();
-}
-
-#ifdef PED_SKIN
-void
-CCutsceneHead::RenderLimb(int32 bone)
-{
-	// It's not clear what this is...
-	// modelinfo for this object is not a ped so it also doesn't have any limbs
-#ifndef FIX_BUGS
-	RpAtomic *atomic;
-	RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(m_parentObject->GetClump());
-	int idx = RpHAnimIDGetIndex(hier, bone);
-	RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
-	CPedModelInfo *mi = (CPedModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
-	assert(mi->GetModelType() == MITYPE_PED);
-	switch(bone){
-	case BONE_Lhand:
-		atomic = mi->getLeftHand();
-		break;
-	case BONE_Rhand:
-		atomic = mi->getRightHand();
-		break;
-	default:
-		return;
-	}
-	if(atomic){
-		RwFrame *frame = RpAtomicGetFrame(atomic);
-		RwMatrixTransform(RwFrameGetMatrix(frame), &mats[idx], rwCOMBINEREPLACE);
-		RwFrameUpdateObjects(frame);
-		RpAtomicRender(atomic);
-	}
-#endif
-}
-#endif
-
-void
-CCutsceneHead::PlayAnimation(const char *animName)
-{
-	RpAtomic *atm;
-	RpHAnimHierarchy *hier;
-	RpHAnimAnimation *anim;
-	uint32 offset, size;
-	RwStream *stream;
-
-	assert(RwObjectGetType(m_rwObject) == rpCLUMP);
-	atm = GetFirstAtomic((RpClump*)m_rwObject);
-	hier = RpSkinAtomicGetHAnimHierarchy(atm);
-
-	sprintf(gString, "%s.anm", animName);
-
-	if(CCutsceneMgr::ms_pCutsceneDir->FindItem(gString, offset, size)){
-		stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, "ANIM\\CUTS.IMG");
-		assert(stream);
-
-		CStreaming::MakeSpaceFor(size * CDSTREAM_SECTOR_SIZE);
-		CStreaming::ImGonnaUseStreamingMemory();
-
-		RwStreamSkip(stream, offset*2048);
-		if(RwStreamFindChunk(stream, rwID_HANIMANIMATION, nil, nil)){
-			anim = RpHAnimAnimationStreamRead(stream);
-			RpHAnimHierarchySetCurrentAnim(hier, anim);
-		}
-
-		CStreaming::IHaveUsedStreamingMemory();
-
-		RwStreamClose(stream, nil);
-	}
-}
diff --git a/src/objects/CutsceneHead.h b/src/objects/CutsceneHead.h
deleted file mode 100644
index c931eb01..00000000
--- a/src/objects/CutsceneHead.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "CutsceneObject.h"
-
-class CCutsceneHead : public CCutsceneObject
-{
-public:
-	RwFrame *m_pHeadNode;
-#ifdef PED_SKIN
-	int32 unk1;
-	CCutsceneObject *m_parentObject;
-	int32 unk2;
-	int32 bIsSkinned;
-#endif
-
-	CCutsceneHead(CObject *obj);
-
-	void CreateRwObject(void);
-	void DeleteRwObject(void);
-	void ProcessControl(void);
-	void Render(void);
-	void RenderLimb(int32 bone);
-
-	void PlayAnimation(const char *animName);
-};
-#ifndef PED_SKIN
-VALIDATE_SIZE(CCutsceneHead, 0x19C);
-#endif
diff --git a/src/objects/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp
index 5c10d37d..bf39bd03 100644
--- a/src/objects/CutsceneObject.cpp
+++ b/src/objects/CutsceneObject.cpp
@@ -21,12 +21,6 @@ CCutsceneObject::CCutsceneObject(void)
 	ObjectCreatedBy = CUTSCENE_OBJECT;
 	m_fMass = 1.0f;
 	m_fTurnMass = 1.0f;
-
-#ifdef PED_SKIN
-	bRenderHead = true;
-	bRenderRightHand = true;
-	bRenderLeftHand = true;
-#endif
 }
 
 void
@@ -85,47 +79,9 @@ CCutsceneObject::PreRender(void)
 void
 CCutsceneObject::Render(void)
 {
-#ifdef PED_SKIN
-	if(IsClumpSkinned(GetClump())){
-		if(bRenderLeftHand) RenderLimb(BONE_Lhand);
-		if(bRenderRightHand) RenderLimb(BONE_Rhand);
-		if(bRenderHead) RenderLimb(BONE_head);
-	}
-#endif
 	CObject::Render();
 }
 
-#ifdef PED_SKIN
-void
-CCutsceneObject::RenderLimb(int32 bone)
-{
-	RpAtomic *atomic;
-	CPedModelInfo *mi = (CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex());
-	switch(bone){
-	case BONE_head:
-		atomic = mi->getHead();
-		break;
-	case BONE_Lhand:
-		atomic = mi->getLeftHand();
-		break;
-	case BONE_Rhand:
-		atomic = mi->getRightHand();
-		break;
-	default:
-		return;
-	}
-	if(atomic){
-		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-		int idx = RpHAnimIDGetIndex(hier, bone);
-		RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
-		RwFrame *frame = RpAtomicGetFrame(atomic);
-		*RwFrameGetMatrix(frame) = *mat;
-		RwFrameUpdateObjects(frame);
-		RpAtomicRender(atomic);
-	}
-}
-#endif
-
 bool
 CCutsceneObject::SetupLighting(void)
 {
diff --git a/src/objects/CutsceneObject.h b/src/objects/CutsceneObject.h
index 407adcc7..bb642f3e 100644
--- a/src/objects/CutsceneObject.h
+++ b/src/objects/CutsceneObject.h
@@ -5,29 +5,12 @@
 class CCutsceneObject : public CObject
 {
 public:
-#ifdef PED_SKIN
-	bool bRenderHead;
-	bool bRenderRightHand;
-	bool bRenderLeftHand;
-
-	bool GetRenderHead(void) { return bRenderHead; }
-	bool GetRenderRightHand(void) { return bRenderRightHand; }
-	bool GetRenderLeftHand(void) { return bRenderLeftHand; }
-	void SetRenderHead(bool render) { bRenderHead = render; }
-	void SetRenderRightHand(bool render) { bRenderRightHand = render; }
-	void SetRenderLeftHand(bool render) { bRenderLeftHand = render; }
-#endif
-
 	CCutsceneObject(void);
 
 	void SetModelIndex(uint32 id);
 	void ProcessControl(void);
 	void PreRender(void);
 	void Render(void);
-	void RenderLimb(int32 bone);
 	bool SetupLighting(void);
 	void RemoveLighting(bool reset);
 };
-#ifndef PED_SKIN
-VALIDATE_SIZE(CCutsceneObject, 0x198);
-#endif
diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp
index d5805073..8dd1643d 100644
--- a/src/objects/DummyObject.cpp
+++ b/src/objects/DummyObject.cpp
@@ -10,4 +10,5 @@ CDummyObject::CDummyObject(CObject *obj)
 		AttachToRwObject(obj->m_rwObject);
 	obj->DetachFromRwObject();
 	m_level = obj->m_level;
+	m_area = obj->m_area;
 }
diff --git a/src/objects/DummyObject.h b/src/objects/DummyObject.h
index d6f88335..680df685 100644
--- a/src/objects/DummyObject.h
+++ b/src/objects/DummyObject.h
@@ -10,5 +10,3 @@ public:
 	CDummyObject(void) {}
 	CDummyObject(CObject *obj);
 };
-
-VALIDATE_SIZE(CDummyObject, 0x68);
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index c5f73987..daa48d98 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -14,7 +14,8 @@
 #include "soundlist.h"
 
 int16 CObject::nNoTempObjects;
-int16 CObject::nBodyCastHealth = 1000;
+//int16 CObject::nBodyCastHealth = 1000;
+float CObject::fDistToNearestTree;
 
 void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New();  }
 void *CObject::operator new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);};
@@ -69,6 +70,7 @@ CObject::CObject(CDummyObject *dummy)
 	dummy->DetachFromRwObject();
 	Init();
 	m_level = dummy->m_level;
+	m_area = dummy->m_area;
 }
 
 CObject::~CObject(void)
@@ -160,6 +162,7 @@ CObject::ObjectDamage(float amount)
 		return;
 	static int8 nFrameGen = 0;
 	bool bBodyCastDamageEffect = false;
+#if 0
 	if (GetModelIndex() == MI_BODYCAST) {
 		if (amount > 50.0f)
 			nBodyCastHealth = (int16)(nBodyCastHealth - 0.5f * amount);
@@ -169,6 +172,7 @@ CObject::ObjectDamage(float amount)
 			bBodyCastDamageEffect = true;
 		amount = 0.0f;
 	}
+#endif
 	if ((amount * m_fCollisionDamageMultiplier > 150.0f || bBodyCastDamageEffect) && m_nCollisionDamageEffect) {
 		const CVector& vecPos = m_matrix.GetPosition();
 		const float fDirectionZ = 0.0002f * amount;
@@ -326,6 +330,8 @@ CObject::Init(void)
 	m_colour1 = 0;
 	m_colour2 = 0;
 	m_nBonusValue = 0;
+	bIsWeapon = false;
+// TODO(MIAMI): some new field here
 	m_pCollidingEntity = nil;
 	CColPoint point;
 	CEntity* outEntity = nil;
@@ -334,10 +340,15 @@ CObject::Init(void)
 		m_pCurSurface = outEntity;
 	else
 		m_pCurSurface = nil;
-	if (GetModelIndex() == MI_BODYCAST)
-		nBodyCastHealth = 1000;
-	else if (GetModelIndex() == MI_BUOY)
+
+	if (GetModelIndex() == MI_BUOY)
 		bTouchingWater = true;
+
+	if(CModelInfo::GetModelInfo(GetModelIndex())->GetModelType() == MITYPE_WEAPON)
+		bIsWeapon = true;
+	bIsStreetLight = IsLightObject(GetModelIndex());
+
+	m_area = AREA_EVERYWHERE;
 }
 
 bool
@@ -395,3 +406,18 @@ CObject::DeleteAllTempObjectsInArea(CVector point, float fRadius)
 		}
 	}
 }
+
+bool
+IsObjectPointerValid(CObject* pObject)
+{
+	if (!pObject)
+		return false;
+	int index = CPools::GetObjectPool()->GetJustIndex(pObject);
+#ifdef FIX_BUGS
+	if (index < 0 || index >= CPools::GetObjectPool()->GetSize())
+#else
+	if (index < 0 || index > CPools::GetObjectPool()->GetSize())
+#endif
+		return false;
+	return pObject->bIsBIGBuilding || pObject->m_entryInfoList.first;
+}
diff --git a/src/objects/Object.h b/src/objects/Object.h
index c9a1bba8..5a9c0195 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -25,13 +25,29 @@ enum CollisionDamageEffect
 	DAMAGE_EFFECT_NONE,
 	DAMAGE_EFFECT_CHANGE_MODEL,
 	DAMAGE_EFFECT_SPLIT_MODEL,
-	DAMAGE_EFFECT_SMASH_COMPLETELY,
+	DAMAGE_EFFECT_SMASH_AND_DAMAGE_TRAFFICLIGHTS,
+
+	DAMAGE_EFFECT_SMASH_COMPLETELY = 20,
 	DAMAGE_EFFECT_CHANGE_THEN_SMASH,
 
 	DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50,
+	DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY,
+
 	DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60,
 	DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70,
-	DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80
+	DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80,
+
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW1 = 91,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW21,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW31,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW41,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW51,
+
+	DAMAGE_EFFECT_SMASH_BLACKBAG = 100,
+	DAMAGE_EFFECT_SMASH_VEGPALM = 110,
+	DAMAGE_EFFECT_BURST_BEACHBALL = 120,
+	DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD = 131,
+	DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL,
 };
 
 class CVehicle;
@@ -43,18 +59,22 @@ public:
 	CMatrix m_objectMatrix;
 	float m_fUprootLimit;
 	int8 ObjectCreatedBy;
-	int8 bIsPickup : 1;
-	int8 bPickupObjWithMessage : 1;
-	int8 bOutOfStock : 1;
-	int8 bGlassCracked : 1;
-	int8 bGlassBroken : 1;
-	int8 bHasBeenDamaged : 1;
-	int8 bUseVehicleColours : 1;
+	uint8 bIsPickup : 1;
+	uint8 obj_flag_02 : 1;
+	uint8 bPickupObjWithMessage : 1;
+	uint8 bOutOfStock : 1;
+	uint8 bGlassCracked : 1;
+	uint8 bGlassBroken : 1;
+	uint8 bHasBeenDamaged : 1;
+	uint8 bUseVehicleColours : 1;
+	uint8 bIsWeapon : 1;
+	uint8 bIsStreetLight : 1;
 	int8 m_nBonusValue; 
 	float m_fCollisionDamageMultiplier;
 	uint8 m_nCollisionDamageEffect;
 	uint8 m_nSpecialCollisionResponseCases;
 	bool m_bCameraToAvoidThisObject;
+	int8 m_nBeachballBounces;
 	uint32 m_obj_unused1;
 	uint32 m_nEndOfLifeTime;
 	int16 m_nRefModelIndex;
@@ -63,7 +83,7 @@ public:
 	int8 m_colour1, m_colour2;
 
 	static int16 nNoTempObjects;
-	static int16 nBodyCastHealth;
+	static float fDistToNearestTree;
 
 	static void *operator new(size_t);
 	static void *operator new(size_t, int);
@@ -91,4 +111,4 @@ public:
 	static void DeleteAllTempObjectsInArea(CVector point, float fRadius);
 };
 
-VALIDATE_SIZE(CObject, 0x198);
+bool IsObjectPointerValid(CObject* pObject);
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 2dee0397..dd438a3f 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -9,6 +9,9 @@
 #include "World.h"
 #include "Vehicle.h"
 #include "SurfaceTable.h"
+#include "Weather.h"
+#include "PedAttractor.h"
+#include "Object.h"
 
 CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
 {
@@ -16,6 +19,8 @@ CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
 	for (int i = 0; i < ARRAY_SIZE(m_nearPeds); i++) {
 		m_nearPeds[i] = nil;
 	}
+	m_nAttractorCycleState = 0;
+	m_bAttractorUnk = (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < 1.25f);
 }
 
 void
@@ -98,7 +103,7 @@ CCivilianPed::CivilianAI(void)
 		SetLookTimer(500);
 	} else if (closestThreatFlag == PED_FLAG_DEADPEDS) {
 		float eventDistSqr = (m_pEventEntity->GetPosition() - GetPosition()).MagnitudeSqr2D();
-		if (IsGangMember() && m_nPedType == ((CPed*)m_pEventEntity)->m_nPedType) {
+		if (((CPed*)m_pEventEntity)->bIsDrowning || IsGangMember() && m_nPedType == ((CPed*)m_pEventEntity)->m_nPedType) {
 			if (eventDistSqr < sq(5.0f)) {
 				SetFindPathAndFlee(m_pEventEntity, 2000);
 				SetMoveState(PEDMOVE_RUN);
@@ -187,9 +192,6 @@ CCivilianPed::CivilianAI(void)
 void
 CCivilianPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
-		return;
-
 	CPed::ProcessControl();
 
 	if (bWasPostponed)
@@ -198,7 +200,7 @@ CCivilianPed::ProcessControl(void)
 	if (DyingOrDead())
 		return;
 
-	GetWeapon()->Update(m_audioEntityId);
+	GetWeapon()->Update(m_audioEntityId, nil);
 	switch (m_nPedState) {
 		case PED_WANDER_RANGE:
 		case PED_WANDER_PATH:
@@ -215,7 +217,7 @@ CCivilianPed::ProcessControl(void)
 			// fall through
 		case PED_SEEK_POS:
 			if (Seek()) {
-				if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA) && m_pNextPathNode) {
+				if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || IsUseAttractorObjective(m_objective)) && m_pNextPathNode) {
 					m_pNextPathNode = nil;
 #ifdef TOGGLEABLE_BETA_FEATURES
 				} else if (bRunningToPhone && m_objective < OBJECTIVE_FLEE_TILL_SAFE) {
@@ -247,7 +249,7 @@ CCivilianPed::ProcessControl(void)
 					} else if (m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT
 						&& m_pedInObjective && m_pedInObjective->m_nMoveState != PEDMOVE_STILL) {
 						SetMoveState(m_pedInObjective->m_nMoveState);
-					} else if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA) {
+					} else if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || IsUseAttractorObjective(m_objective)) {
 						SetIdle();
 					} else {
 						RestorePreviousState();
@@ -323,7 +325,7 @@ CCivilianPed::ProcessControl(void)
 										CWorld::Players[CWorld::PlayerInFocus].m_nSexFrequency = Max(250, playerSexFrequency - 10);
 									}
 
-									m_pMyVehicle->pDriver->m_fHealth = Min(125.0f, 1.0f + m_pMyVehicle->pDriver->m_fHealth);
+									m_pMyVehicle->pDriver->m_fHealth = Min(CWorld::Players[0].m_nMaxHealth + 25.0f, 1.0f + m_pMyVehicle->pDriver->m_fHealth);
 									if (CWorld::Players[CWorld::PlayerInFocus].m_nSexFrequency == 250)
 										CWorld::Players[CWorld::PlayerInFocus].m_nNextSexFrequencyUpdateTime = CTimer::GetTimeInMilliseconds() + 3000;
 							} else {
@@ -334,7 +336,7 @@ CCivilianPed::ProcessControl(void)
 						} else {
 							bWanderPathAfterExitingCar = true;
 							CWorld::Players[CWorld::PlayerInFocus].m_pHooker = nil;
-							m_pMyVehicle->pDriver->m_fHealth = 125.0f;
+							m_pMyVehicle->pDriver->m_fHealth = CWorld::Players[0].m_nMaxHealth + 25.0f;
 							SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
 						}
 					} else {
@@ -368,6 +370,10 @@ CCivilianPed::ProcessControl(void)
 	if (IsPedInControl())
 		CivilianAI();
 
+	if (CharCreatedBy == RANDOM_CHAR) {
+		UseNearbyAttractors();
+	}
+
 	if (CTimer::GetTimeInMilliseconds() > m_timerUnused) {
 		m_stateUnused = 0;
 		m_timerUnused = 0;
@@ -376,3 +382,90 @@ CCivilianPed::ProcessControl(void)
 	if (m_moved.Magnitude() > 0.0f)
 		Avoid();
 }
+
+const int32 gFrequencyOfAttractorAttempt = 11;
+const float gDistanceToSeekAttractors = 50.0f;
+const float gMaxDistanceToAttract = 10.0f;
+
+/* Probably this was inlined */
+void CCivilianPed::FindNearbyAttractorsSectorList(CPtrList& list, float& minDistance, C2dEffect*& pClosestAttractor, CEntity*& pAttractorEntity)
+{
+	for (CPtrNode* pNode = list.first; pNode != nil; pNode = pNode->next) {
+		CEntity* pEntity = (CEntity*)pNode->item;
+		if (pEntity->IsObject() && (!pEntity->IsStatic() || ((CObject*)pEntity)->bHasBeenDamaged))
+			continue;
+		CBaseModelInfo* pModelInfo = CModelInfo::GetModelInfo(pEntity->GetModelIndex());
+		for (int i = 0; i < pModelInfo->GetNum2dEffects(); i++) {
+			C2dEffect* pEffect = pModelInfo->Get2dEffect(i);
+			if (pEffect->type != EFFECT_PED_ATTRACTOR)
+				continue;
+			if (!IsAttractedTo(pEffect->pedattr.type))
+				continue;
+			CVector pos;
+			CPedAttractorManager::ComputeEffectPos(pEffect, pEntity->GetMatrix(), pos);
+			if ((pos - GetPosition()).MagnitudeSqr() < minDistance) {
+				CPedAttractorManager* pManager = GetPedAttractorManager();
+				if (pManager->HasEmptySlot(pEffect) && pManager->IsApproachable(pEffect, pEntity->GetMatrix(), 0, this)) {
+					pClosestAttractor = pEffect;
+					pAttractorEntity = pEntity;
+					minDistance = (pos - GetPosition()).MagnitudeSqr();
+				}
+			}
+		}
+	}
+}
+
+void CCivilianPed::UseNearbyAttractors()
+{
+	if (CWeather::Rain < 0.2f && !m_bAttractorUnk)
+		return;
+	if (HasAttractor())
+		return;
+	if (m_nAttractorCycleState != gFrequencyOfAttractorAttempt) {
+		m_nAttractorCycleState++;
+		return;
+	}
+	m_nAttractorCycleState = 0;
+	if (!IsPedInControl())
+		return;
+	if (m_nPedState == PED_FLEE_ENTITY)
+		return;
+
+	float left = GetPosition().x - gDistanceToSeekAttractors;
+	float right = GetPosition().x + gDistanceToSeekAttractors;
+	float top = GetPosition().y - gDistanceToSeekAttractors;
+	float bottom = GetPosition().y + gDistanceToSeekAttractors;
+	int xstart = Max(0, CWorld::GetSectorIndexX(left));
+	int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(right));
+	int ystart = Max(0, CWorld::GetSectorIndexY(top));
+	int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(bottom));
+	assert(xstart <= xend);
+	assert(ystart <= yend);
+
+	float minDistance = SQR(gMaxDistanceToAttract);
+	C2dEffect* pClosestAttractor = nil;
+	CEntity* pAttractorEntity = nil;
+
+	for (int y = ystart; y <= yend; y++) {
+		for (int x = xstart; x <= xend; x++) {
+			CSector* s = CWorld::GetSector(x, y);
+			FindNearbyAttractorsSectorList(s->m_lists[ENTITYLIST_BUILDINGS], minDistance, pClosestAttractor, pAttractorEntity);
+			FindNearbyAttractorsSectorList(s->m_lists[ENTITYLIST_OBJECTS], minDistance, pClosestAttractor, pAttractorEntity);
+		}
+	}
+	if (pClosestAttractor)
+		GetPedAttractorManager()->RegisterPedWithAttractor(this, pClosestAttractor, pAttractorEntity->GetMatrix());
+}
+
+bool CCivilianPed::IsAttractedTo(int8 type)
+{
+	switch (type) {
+	case ATTRACTOR_ATM: return true;
+	case ATTRACTOR_SEAT: return true;
+	case ATTRACTOR_STOP: return true;
+	case ATTRACTOR_PIZZA: return true;
+	case ATTRACTOR_SHELTER: return CWeather::Rain >= 0.2f;
+	case ATTRACTOR_ICECREAM: return false;
+	}
+	return false;
+}
diff --git a/src/peds/CivilianPed.h b/src/peds/CivilianPed.h
index 8418a99f..27d458f7 100644
--- a/src/peds/CivilianPed.h
+++ b/src/peds/CivilianPed.h
@@ -4,12 +4,17 @@
 
 class CCivilianPed : public CPed
 {
+	bool m_bAttractorUnk;
+	int32 m_nAttractorCycleState;
 public:
 	CCivilianPed(ePedType, uint32);
 	~CCivilianPed(void) { }
 
 	void CivilianAI(void);
 	void ProcessControl(void);
+	void UseNearbyAttractors(void);
+	void FindNearbyAttractorsSectorList(CPtrList&, float&, C2dEffect*&, CEntity*&);
+	bool IsAttractedTo(int8);
 };
 #ifndef PED_SKIN
 VALIDATE_SIZE(CCivilianPed, 0x53C);
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 99e8c1ae..ae1f6c61 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -17,13 +17,14 @@
 #include "Renderer.h"
 #include "Camera.h"
 
-CCopPed::CCopPed(eCopType copType) : CPed(PEDTYPE_COP)
+CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP)
 {
 	m_nCopType = copType;
 	switch (copType) {
 	case COP_STREET:
 		SetModelIndex(MI_COP);
-		GiveWeapon(WEAPONTYPE_COLT45, 1000);
+		GiveWeapon(WEAPONTYPE_NIGHTSTICK, 1000, true);
+		GiveDelayedWeapon(WEAPONTYPE_COLT45, 1000);
 		m_currentWeapon = WEAPONTYPE_UNARMED;
 		m_fArmour = 0.0f;
 		m_wepSkills = 208; /* TODO: what is this? seems unused */
@@ -31,17 +32,15 @@ CCopPed::CCopPed(eCopType copType) : CPed(PEDTYPE_COP)
 		break;
 	case COP_FBI:
 		SetModelIndex(MI_FBI);
-		GiveWeapon(WEAPONTYPE_COLT45, 1000);
-		GiveWeapon(WEAPONTYPE_AK47, 1000);
-		SetCurrentWeapon(WEAPONTYPE_AK47);
+		GiveDelayedWeapon(WEAPONTYPE_MP5, 1000);
+		SetCurrentWeapon(WEAPONTYPE_MP5);
 		m_fArmour = 100.0f;
 		m_wepSkills = 176; /* TODO: what is this? seems unused */
 		m_wepAccuracy = 76;
 		break;
 	case COP_SWAT:
 		SetModelIndex(MI_SWAT);
-		GiveWeapon(WEAPONTYPE_COLT45, 1000);
-		GiveWeapon(WEAPONTYPE_UZI, 1000);
+		GiveDelayedWeapon(WEAPONTYPE_UZI, 1000);
 		SetCurrentWeapon(WEAPONTYPE_UZI);
 		m_fArmour = 50.0f;
 		m_wepSkills = 32; /* TODO: what is this? seems unused */
@@ -49,15 +48,29 @@ CCopPed::CCopPed(eCopType copType) : CPed(PEDTYPE_COP)
 		break;
 	case COP_ARMY:
 		SetModelIndex(MI_ARMY);
-		GiveWeapon(WEAPONTYPE_COLT45, 1000);
-		GiveWeapon(WEAPONTYPE_M16, 1000);
-		GiveWeapon(WEAPONTYPE_GRENADE, 10);
-		SetCurrentWeapon(WEAPONTYPE_M16);
+		GiveDelayedWeapon(WEAPONTYPE_MP5, 1000);
+		SetCurrentWeapon(WEAPONTYPE_MP5);
 		m_fArmour = 100.0f;
 		m_wepSkills = 32; /* TODO: what is this? seems unused */
 		m_wepAccuracy = 84;
 		break;
-	default:
+	case COP_MIAMIVICE:
+		switch (modifier) {
+		case 0: SetModelIndex(MI_VICE1); break;
+		case 1: SetModelIndex(MI_VICE2); break;
+		case 2: SetModelIndex(MI_VICE3); break;
+		case 3: SetModelIndex(MI_VICE4); break;
+		case 4: SetModelIndex(MI_VICE5); break;
+		case 5: SetModelIndex(MI_VICE6); break;
+		case 6: SetModelIndex(MI_VICE7); break;
+		case 7: SetModelIndex(MI_VICE8); break;
+		default: assert(0); break;
+		}
+		GiveDelayedWeapon(WEAPONTYPE_UZI, 1000);
+		SetCurrentWeapon(WEAPONTYPE_UZI);
+		m_fArmour = 100.0f;
+		m_wepSkills = 176;
+		m_wepAccuracy = 76;
 		break;
 	}
 	m_bIsInPursuit = false;
@@ -88,7 +101,7 @@ CCopPed::SetArrestPlayer(CPed *player)
 {
 	if (!IsPedInControl() || !player)
 		return;
-
+	/*
 	switch (m_nCopType) {
 		case COP_FBI:
 			Say(SOUND_PED_ARREST_FBI);
@@ -99,7 +112,7 @@ CCopPed::SetArrestPlayer(CPed *player)
 		default:
 			Say(SOUND_PED_ARREST_COP);
 			break;
-	}
+	} */
 	if (player->EnteringCar()) {
 		if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer)
 			return;
@@ -244,7 +257,7 @@ CCopPed::ArrestPlayer(void)
 				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ARREST_GUN, 4.0f);
 
 			CVector suspMidPos;
-			suspect->m_pedIK.GetComponentPosition((RwV3d*)suspMidPos, PED_MID);
+			suspect->m_pedIK.GetComponentPosition(*(RwV3d *)&suspMidPos, PED_MID);
 			m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(suspMidPos.x, suspMidPos.y,
 				GetPosition().x, GetPosition().y);
 
@@ -425,8 +438,9 @@ CCopPed::CopAI(void)
 #ifdef VC_PED_PORTS
 						float dotProd;
 						if (m_nRoadblockNode != -1) {
-							CTreadable *roadBlockRoad = ThePaths.m_mapObjects[CRoadBlocks::RoadBlockObjects[m_nRoadblockNode]];
-							dotProd = DotProduct2D(playerOrHisVeh->GetPosition() - roadBlockRoad->GetPosition(), GetPosition() - roadBlockRoad->GetPosition());
+							// TODO(MIAMI): check this, i'm only getting this compile here....
+							CPathNode *roadBlockNode = &ThePaths.m_pathNodes[CRoadBlocks::RoadBlockNodes[m_nRoadblockNode]];
+							dotProd = DotProduct2D(playerOrHisVeh->GetPosition() - roadBlockNode->GetPosition(), GetPosition() - roadBlockNode->GetPosition());
 						} else
 							dotProd = -1.0f;
 
@@ -559,9 +573,6 @@ CCopPed::CopAI(void)
 void
 CCopPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
-		return;
-
 	CPed::ProcessControl();
 	if (bWasPostponed)
 		return;
@@ -578,7 +589,7 @@ CCopPed::ProcessControl(void)
 		ArrestPlayer();
 		return;
 	}
-	GetWeapon()->Update(m_audioEntityId);
+	GetWeapon()->Update(m_audioEntityId, nil);
 	if (m_moved.Magnitude() > 0.0f)
 		Avoid();
 
@@ -594,6 +605,7 @@ CCopPed::ProcessControl(void)
 		if (IsPedInControl())
 			SetIdle();
 	}
+	/*
 	if (m_bIsInPursuit) {
 		if (player->m_nPedState != PED_ARRESTED && !player->DyingOrDead()) {
 			switch (m_nCopType) {
@@ -611,7 +623,7 @@ CCopPed::ProcessControl(void)
 					break;
 			}
 		}
-	}
+	} */
 
 	if (IsPedInControl()) {
 		CopAI();
@@ -709,7 +721,7 @@ CCopPed::ProcessControl(void)
 		return;
 
 	bool dontShoot = false;
-	if (GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(this)) {
+	if (GetIsOnScreen()) {
 		if (((CTimer::GetFrameCounter() + m_randomSeed) & 0x1F) == 17) {
 			CEntity *foundBuilding = nil;
 			CColPoint foundCol;
diff --git a/src/peds/CopPed.h b/src/peds/CopPed.h
index 5346d9a1..945f78b8 100644
--- a/src/peds/CopPed.h
+++ b/src/peds/CopPed.h
@@ -7,6 +7,7 @@ enum eCopType
 	COP_FBI = 1,
 	COP_SWAT = 2,
 	COP_ARMY = 3,
+	COP_MIAMIVICE = 5
 };
 
 class CCopPed : public CPed
@@ -24,7 +25,7 @@ public:
 	eCopType m_nCopType;
 	int8 field_1364;
 
-	CCopPed(eCopType);
+	CCopPed(eCopType, int32 modifier = 0);
 	~CCopPed();
 
 	void ClearPursuit(void);
diff --git a/src/peds/DummyPed.h b/src/peds/DummyPed.h
index ea617c76..cace4ead 100644
--- a/src/peds/DummyPed.h
+++ b/src/peds/DummyPed.h
@@ -8,5 +8,3 @@ class CDummyPed : CDummy
 	int32 pedType;
 	int32 unknown;
 };
-
-VALIDATE_SIZE(CDummyPed, 0x70);
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index cdaee657..44c3d066 100644
--- a/src/peds/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
@@ -44,15 +44,12 @@ CEmergencyPed::InRange(CPed *victim)
 void
 CEmergencyPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
-		return;
-
 	CPed::ProcessControl();
 	if (bWasPostponed)
 		return;
 
 	if(!DyingOrDead()) {
-		GetWeapon()->Update(m_audioEntityId);
+		GetWeapon()->Update(m_audioEntityId, nil);
 
 		if (IsPedInControl() && m_moved.Magnitude() > 0.0f)
 			Avoid();
@@ -234,8 +231,8 @@ CEmergencyPed::MedicAI(void)
 				if (nearestAccident) {
 					m_pRevivedPed = nearestAccident->m_pVictim;
 					m_pRevivedPed->RegisterReference((CEntity**)&m_pRevivedPed);
-					m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&midPos, PED_MID);
-					m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&headPos, PED_HEAD);
+					m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&midPos, PED_MID);
+					m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&headPos, PED_HEAD);
 					SetSeek((headPos + midPos) * 0.5f, 1.0f);
 					SetObjective(OBJECTIVE_NONE);
 					bIsRunning = true;
@@ -274,8 +271,8 @@ CEmergencyPed::MedicAI(void)
 							m_nEmergencyPedState = EMERGENCY_PED_STOP;
 							break;
 						}
-						m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&midPos, PED_MID);
-						m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&headPos, PED_HEAD);
+						m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&midPos, PED_MID);
+						m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&headPos, PED_HEAD);
 						SetSeek((headPos + midPos) * 0.5f, nearestAccident->m_nMedicsPerformingCPR * 0.5f + 1.0f);
 						SetObjective(OBJECTIVE_NONE);
 						bIsRunning = true;
@@ -311,13 +308,13 @@ CEmergencyPed::MedicAI(void)
 					m_nLastPedState = PED_CPR;
 					SetLookFlag(m_pRevivedPed, 0);
 					SetLookTimer(500);
-					Say(SOUND_PED_HEALING);
+					//Say(SOUND_PED_HEALING);
 					if (m_pAttendedAccident->m_nMedicsPerformingCPR) {
 						SetIdle();
 						m_nEmergencyPedState = EMERGENCY_PED_STAND_STILL;
 					} else {
 						m_nEmergencyPedState = EMERGENCY_PED_FACE_TO_PATIENT;
-						m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CPR, 4.0f);
+						m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_MEDIC, ANIM_CPR, 4.0f);
 						bIsDucking = true;
 					}
 					SetLookTimer(2000);
@@ -329,8 +326,8 @@ CEmergencyPed::MedicAI(void)
 				if (!m_pRevivedPed || m_pRevivedPed->m_fHealth > 0.0f)
 					m_nEmergencyPedState = EMERGENCY_PED_DETERMINE_NEXT_STATE;
 				else {
-					m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&midPos, PED_MID);
-					m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&headPos, PED_HEAD);
+					m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&midPos, PED_MID);
+					m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&headPos, PED_HEAD);
 					midPos = (headPos + midPos) * 0.5f;
 					m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
 						midPos.x, midPos.y,
@@ -351,8 +348,8 @@ CEmergencyPed::MedicAI(void)
 					m_nEmergencyPedState = EMERGENCY_PED_DETERMINE_NEXT_STATE;
 					break;
 				}
-				m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&midPos, PED_MID);
-				m_pRevivedPed->m_pedIK.GetComponentPosition((RwV3d*)&headPos, PED_HEAD);
+				m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&midPos, PED_MID);
+				m_pRevivedPed->m_pedIK.GetComponentPosition(*(RwV3d *)&headPos, PED_HEAD);
 				midPos = (headPos + midPos) * 0.5f;
 				m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
 					midPos.x, midPos.y,
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index 8859e61e..2d6d1137 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -2,12 +2,17 @@
 
 #include "ModelIndices.h"
 #include "Gangs.h"
+#include "General.h"
+#include "Streaming.h"
 #include "Weapon.h"
 
 CGangInfo CGangs::Gang[NUM_GANGS];
+bool CGangs::GangAttackWithCops[NUM_GANGS];
 
 CGangInfo::CGangInfo() :
-	m_nVehicleMI(MI_BUS),
+	m_nVehicleMI(-1),
+	m_nPedModel1MI(-1),
+	m_nPedModel2MI(-1),
 	m_nPedModelOverride(-1),
 	m_Weapon1(WEAPONTYPE_UNARMED),
 	m_Weapon2(WEAPONTYPE_UNARMED)
@@ -15,21 +20,63 @@ CGangInfo::CGangInfo() :
 
 void CGangs::Initialise(void)
 {
-	Gang[GANG_MAFIA].m_nVehicleMI = MI_MAFIA;
-	Gang[GANG_TRIAD].m_nVehicleMI = MI_BELLYUP;
-	Gang[GANG_DIABLOS].m_nVehicleMI = MI_DIABLOS;
-	Gang[GANG_YAKUZA].m_nVehicleMI = MI_YAKUZA;
-	Gang[GANG_YARDIE].m_nVehicleMI = MI_YARDIE;
-	Gang[GANG_COLUMB].m_nVehicleMI = MI_COLUMB;
-	Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS;
-	Gang[GANG_7].m_nVehicleMI = -1;
-	Gang[GANG_8].m_nVehicleMI = -1;
+	SetGangPedModels(GANG_CUBAN, MI_CBA, MI_CBB);
+	SetGangPedModels(GANG_HAITIAN, MI_HNA, MI_HNB);
+	SetGangPedModels(GANG_STREET, MI_SGA, MI_SGB);
+	SetGangPedModels(GANG_DIAZ, MI_CLA, MI_CLB);
+	SetGangPedModels(GANG_SECURITY, MI_GDA, MI_GDB);
+	SetGangPedModels(GANG_BIKER, MI_BKA, MI_BKB);
+	SetGangPedModels(GANG_PLAYER, MI_PGA, MI_PGB);
+	SetGangPedModels(GANG_GOLFER, MI_WFOGO, MI_WMOGO);
+	SetGangVehicleModel(GANG_CUBAN, MI_CUBAN);
+	SetGangVehicleModel(GANG_HAITIAN, MI_VOODOO);
+	SetGangVehicleModel(GANG_STREET, MI_GANGBUR);
+	SetGangVehicleModel(GANG_DIAZ, -1);
+	SetGangVehicleModel(GANG_SECURITY, -1);
+	SetGangVehicleModel(GANG_BIKER, MI_ANGEL);
+	SetGangVehicleModel(GANG_PLAYER, -1);
+	SetGangVehicleModel(GANG_GOLFER, MI_CADDY);
+	SetGangWeapons(GANG_GOLFER, WEAPONTYPE_GOLFCLUB, WEAPONTYPE_GOLFCLUB);
 #ifdef FIX_BUGS
 	for (int i = 0; i < NUM_GANGS; i++)
-		Gang[i].m_nPedModelOverride = -1;
+		SetGangPedModelOverride(i, -1);
 #endif
 }
 
+bool CGangs::HaveGangModelsLoaded(int16 gang)
+{
+	CGangInfo* pGangInfo = GetGangInfo(gang);
+	return CStreaming::HasModelLoaded(pGangInfo->m_nPedModel1MI) && CStreaming::HasModelLoaded(pGangInfo->m_nPedModel2MI);
+}
+
+void CGangs::SetGangPedModels(int16 gang, int32 mi1, int32 mi2)
+{
+	GetGangInfo(gang)->m_nPedModel1MI = mi1;
+	GetGangInfo(gang)->m_nPedModel2MI = mi2;
+}
+
+void CGangs::SetWillAttackPlayerWithCops(ePedType type, bool will)
+{
+	if (type >= PEDTYPE_GANG1 && type <= PEDTYPE_GANG9)
+		GangAttackWithCops[type - PEDTYPE_GANG1] = will;
+}
+
+bool CGangs::GetWillAttackPlayerWithCops(ePedType type)
+{
+	if (type >= PEDTYPE_GANG1 && type <= PEDTYPE_GANG9)
+		return GangAttackWithCops[type - PEDTYPE_GANG1];
+	return false;
+}
+
+int32 CGangs::ChooseGangPedModel(int16 gang)
+{
+	CGangInfo* pGangInfo = GetGangInfo(gang);
+	if (pGangInfo->m_nPedModelOverride != -1 || CGeneral::GetRandomTrueFalse())
+		return pGangInfo->m_nPedModel1MI;
+	else
+		return pGangInfo->m_nPedModel2MI;
+}
+
 void CGangs::SetGangVehicleModel(int16 gang, int32 model)
 {
 	GetGangInfo(gang)->m_nVehicleMI = model;
diff --git a/src/peds/Gangs.h b/src/peds/Gangs.h
index c8ea2916..c6381343 100644
--- a/src/peds/Gangs.h
+++ b/src/peds/Gangs.h
@@ -1,8 +1,12 @@
 #pragma once
 
+#include "PedType.h"
+
 struct CGangInfo
 {
 	int32 m_nVehicleMI;
+	int32 m_nPedModel1MI;
+	int32 m_nPedModel2MI;
 	int8 m_nPedModelOverride;
 	int32 m_Weapon1;
 	int32 m_Weapon2;
@@ -13,15 +17,15 @@ struct CGangInfo
 VALIDATE_SIZE(CGangInfo, 0x10);
 
 enum {
-	GANG_MAFIA = 0,
-	GANG_TRIAD,
-	GANG_DIABLOS,
-	GANG_YAKUZA,
-	GANG_YARDIE,
-	GANG_COLUMB,
-	GANG_HOODS,
-	GANG_7,
-	GANG_8,
+	GANG_CUBAN = 0,
+	GANG_HAITIAN,
+	GANG_STREET,
+	GANG_DIAZ,
+	GANG_SECURITY,
+	GANG_BIKER,
+	GANG_PLAYER,
+	GANG_GOLFER,
+	GANG_9,
 	NUM_GANGS
 };
 
@@ -36,9 +40,18 @@ public:
 	static void SaveAllGangData(uint8 *, uint32 *);
 	static void LoadAllGangData(uint8 *, uint32);
 
+	static void SetGangPedModels(int16, int32, int32);
+	static void SetWillAttackPlayerWithCops(ePedType type, bool will);
+	static bool GetWillAttackPlayerWithCops(ePedType type);
+	static int32 ChooseGangPedModel(int16);
+
+	static bool HaveGangModelsLoaded(int16 gang);
+	static int32 GetGangPedModel1(int16 gang) { return Gang[gang].m_nPedModel1MI; }
+	static int32 GetGangPedModel2(int16 gang) { return Gang[gang].m_nPedModel2MI; }
 	static int32 GetGangVehicleModel(int16 gang) { return Gang[gang].m_nVehicleMI; }
 	static CGangInfo *GetGangInfo(int16 gang) { return &Gang[gang]; }
 
 private:
 	static CGangInfo Gang[NUM_GANGS];
+	static bool GangAttackWithCops[NUM_GANGS];
 };
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 254f89a6..70e6303e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -58,6 +58,11 @@
 #include "ParticleObject.h"
 #include "Floater.h"
 #include "Range2D.h"
+#include "Streaming.h"
+#include "PedAttractor.h"
+#include "Debug.h"
+#include "GameLogic.h"
+#include "Bike.h"
 
 #define CAN_SEE_ENTITY_ANGLE_THRESHOLD	DEGTORAD(60.0f)
 
@@ -66,36 +71,15 @@ uint16 gnNumTempPedList;
 
 static CColPoint aTempPedColPts[MAX_COLLISION_POINTS];
 
+// TODO(Miami)
+#define AUDIO_NOT_READY
+
 uint16 nPlayerInComboMove;
 
 RpClump *flyingClumpTemp;
 
-// This is beta fistfite.dat array. Not used anymore since they're being fetched from fistfite.dat.
 FightMove tFightMoves[NUM_FIGHTMOVES] = {
-	{NUM_ANIMS, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_PUNCH_R, 0.2f, 8.0f / 30.0f, 0.0f, 0.3f, HITLEVEL_HIGH, 1, 0},
-	{ANIM_FIGHT_IDLE, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_FIGHT_SH_F, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_FIGHT_KNEE, 4.0f / 30.0f, 0.2f, 0.0f, 0.6f, HITLEVEL_LOW, 2, 0},
-	{ANIM_FIGHT_HEAD, 4.0f / 30.0f, 0.2f, 0.0f, 0.7f, HITLEVEL_HIGH, 3, 0},
-	{ANIM_FIGHT_PUNCH, 4.0f / 30.0f, 7.0f / 30.0f, 10.0f / 30.0f, 0.4f, HITLEVEL_HIGH, 1, 0},
-	{ANIM_FIGHT_LHOOK, 8.0f / 30.0f, 10.0f / 30.0f, 0.0f, 0.4f, HITLEVEL_HIGH, 3, 0},
-	{ANIM_FIGHT_KICK, 8.0f / 30.0f, 10.0f / 30.0f, 0.0f, 0.5, HITLEVEL_MEDIUM, 2, 0},
-	{ANIM_FIGHT_LONGKICK, 8.0f / 30.0f, 10.0f / 30.0f, 0.0f, 0.5, HITLEVEL_MEDIUM, 4, 0},
-	{ANIM_FIGHT_ROUNDHOUSE, 8.0f / 30.0f, 10.0f / 30.0f, 0.0f, 0.6f, HITLEVEL_MEDIUM, 4, 0},
-	{ANIM_FIGHT_BODYBLOW, 5.0f / 30.0f, 7.0f / 30.0f, 0.0f, 0.35f, HITLEVEL_LOW, 2, 0},
-	{ANIM_KICK_FLOOR, 10.0f / 30.0f, 14.0f / 30.0f, 0.0f, 0.4f, HITLEVEL_GROUND, 1, 0},
-	{ANIM_HIT_FRONT, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_BACK, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_RIGHT, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_LEFT, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_BODYBLOW, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_CHEST, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_WALK, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_FLOOR_HIT, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_HIT_BEHIND, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
-	{ANIM_FIGHT2_IDLE, 0.0f, 0.0f, 0.0f, 0.0f, HITLEVEL_NULL, 0, 0},
+	// TODO(Miami)
 };
 
 uint16 CPed::nThreatReactionRangeMultiplier = 1;
@@ -107,6 +91,11 @@ CVector vecPedVanRearDoorAnimOffset;
 CVector vecPedQuickDraggedOutCarAnimOffset;
 CVector vecPedDraggedOutCarAnimOffset;
 CVector vecPedTrainDoorAnimOffset;
+CVector vecPedStdBikeJumpRhsAnimOffset;
+CVector vecPedVespaBikeJumpRhsAnimOffset;
+CVector vecPedHarleyBikeJumpRhsAnimOffset;
+CVector vecPedDirtBikeJumpRhsAnimOffset;
+CVector vecPedBikeKickAnimOffset;
 
 bool CPed::bNastyLimbsCheat;
 bool CPed::bPedCheat2;
@@ -126,6 +115,8 @@ bool CPed::bMakePedsRunToPhonesToReportCrimes = false;
 CPed::~CPed(void)
 {
 	CWorld::Remove(this);
+	if (m_attractor)
+		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
 	CRadar::ClearBlipForEntity(BLIP_CHAR, CPools::GetPedPool()->GetIndex(this));
 	if (InVehicle()){
 		uint8 door_flag = GetCarDoorFlag(m_vehEnterType);
@@ -144,6 +135,12 @@ CPed::~CPed(void)
 	}
 	if (m_pFire)
 		m_pFire->Extinguish();
+
+	ClearWeapons();
+	if (bCarPassenger)
+		CPopulation::ms_nTotalCarPassengerPeds--;
+	if (bMiamiViceCop)
+		CPopulation::NumMiamiViceCops--;
 	CPopulation::UpdatePedCount((ePedType)m_nPedType, true);
 	DMAudio.DestroyEntity(m_audioEntityId);
 }
@@ -163,10 +160,11 @@ CPed::FlagToDestroyWhenNextProcessed(void)
 	}
 	bInVehicle = false;
 	m_pMyVehicle = nil;
+
 	if (CharCreatedBy == MISSION_CHAR)
-		m_nPedState = PED_DEAD;
+		SetPedState(PED_DEAD);
 	else
-		m_nPedState = PED_NONE;
+		SetPedState(PED_NONE);
 	m_pVehicleAnim = nil;
 }
 
@@ -193,13 +191,17 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	CharCreatedBy = RANDOM_CHAR;
 	m_leader = nil;
 	m_pedInObjective = nil;
+	m_attractorHeading = 0.0f;
 	m_carInObjective = nil;
+	m_attractorHeading = 0.0f;
 	bInVehicle = false;
 	m_pMyVehicle = nil;
 	m_pVehicleAnim = nil;
 	m_vecOffsetSeek.x = 0.0f;
 	m_vecOffsetSeek.y = 0.0f;
 	m_vecOffsetSeek.z = 0.0f;
+	m_attractor = nil;
+	m_positionInQueue = -1;
 	m_pedFormation = FORMATION_UNDEFINED;
 	m_collidingThingTimer = 0;
 	m_nPedStateTimer = 0;
@@ -228,6 +230,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
 	m_wepSkills = 0;
 	m_distanceToCountSeekDone = 1.0f;
+	m_acceptableHeadingOffset = 0.1f;
 	bRunningToPhone = false;
 	m_phoneId = -1;
 	m_lastAccident = 0;
@@ -235,6 +238,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_fleeFromPosX = 0;
 	m_fleeFromPosY = 0;
 	m_fleeTimer = 0;
+	pThreatEx = nil;
 	m_vecSeekPosEx = CVector(0.0f, 0.0f, 0.0f);
 	m_distanceToCountSeekDoneEx = 0.0f;
 	m_nWaitState = WAITSTATE_FALSE;
@@ -269,6 +273,8 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_fAirResistance = 0.4f / m_fMass;
 	m_fElasticity = 0.05f;
 
+	m_ceaseAttackTimer = 0;
+
 	bIsStanding = false;
 	bWasStanding = false;
 	bIsAttacking = false;
@@ -349,9 +355,33 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 #ifdef KANGAROO_CHEAT
 	m_ped_flagI80 = false;
 #endif
+
+	m_gangFlags = 0xFF;
+
+	bReachedAttractorHeadingTarget = false;
+	bTurnedAroundOnAttractor = false;
+	bCarPassenger = false;
+	bMiamiViceCop = false;
+	bMoneyHasBeenGivenByScript = false;
+	bHasBeenPhotographed = false;
+
+	bIsDrowning = false;
+	bDrownsInWater = true;
 #ifdef VC_PED_PORTS
-	bSomeVCflag1 = false;
+	bHeadStuckInCollision = false;
 #endif
+	bIsPlayerFriend = true;
+	bDeadPedInFrontOfCar = false;
+	bStayInCarOnJack = false;
+
+	bDontFight = false;
+	bDoomAim = true;
+	bCanBeShotInVehicle = true;
+	bIgnoreThreatsBehindObjects = false;
+
+	bNeverEverTargetThisPed = false;
+
+	bBoughtIceCream = false;
 
 	if ((CGeneral::GetRandomNumber() & 3) == 0)
 		bHasACamera = true;
@@ -374,8 +404,9 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_maxWeaponTypeAllowed = WEAPONTYPE_UNARMED;
 	m_currentWeapon = WEAPONTYPE_UNARMED;
 	m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+	m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
 
-	for(int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
+	for(int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
 		CWeapon &weapon = GetWeapon(i);
 		weapon.m_eWeaponType = WEAPONTYPE_UNARMED;
 		weapon.m_eWeaponState = WEAPONSTATE_READY;
@@ -385,39 +416,64 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	}
 
 	m_lastFightMove = FIGHTMOVE_NULL;
-	GiveWeapon(WEAPONTYPE_UNARMED, 0);
+	GiveWeapon(WEAPONTYPE_UNARMED, 0, true);
 	m_wepAccuracy = 60;
 	m_lastWepDam = -1;
+	m_lastDamEntity = nil;
+	m_attachedTo = nil;
+	m_attachWepAmmo = 0;
 	m_collPoly.valid = false;
 	m_fCollisionSpeed = 0.0f;
 	m_wepModelID = -1;
+	uint16 random = CGeneral::GetRandomNumber();
+	m_nPedMoney = random % 25;
+	if (m_nPedMoney == 23)
+		m_nPedMoney = 400;
+	m_nExtendedRangeTimer = 0;
+	m_bleedCounter = 0;
 #ifdef PED_SKIN
 	m_pWeaponModel = nil;
 #endif
 	CPopulation::UpdatePedCount((ePedType)m_nPedType, false);
 }
 
-uint32
-CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo)
+// --MIAMI: Done
+int32
+CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused)
 {
-	CWeapon &weapon = GetWeapon(weaponType);
+	int slot = GetWeaponSlot(weaponType);
 
-	if (HasWeapon(weaponType)) {
-		if (weapon.m_nAmmoTotal + ammo > 99999)
-			weapon.m_nAmmoTotal = 99999;
-		else
-			weapon.m_nAmmoTotal += ammo;
+	if (m_weapons[slot].m_eWeaponType == weaponType) {
+		GetWeapon(slot).m_nAmmoTotal += ammo;
+		if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
 
-		weapon.Reload();	
+			// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+			GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
+		} else {
+			GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
+		}
+		GetWeapon(slot).Reload();
+		if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+			GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 	} else {
-		weapon.Initialise(weaponType, ammo);
-		// TODO: It seems game uses this as both weapon count and max WeaponType we have, which is ofcourse erroneous.
-		m_maxWeaponTypeAllowed++;
+		if (HasWeaponSlot(slot)) {
+
+			// TODO(Miami): Make an enum for that
+			if (slot == 4 || slot == 5 || slot == 6)
+				ammo += GetWeapon(slot).m_nAmmoTotal;
+
+			RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon(slot).m_eWeaponType)->m_nModelId);
+			GetWeapon(slot).Shutdown();
+		}
+		GetWeapon(slot).Initialise(weaponType, ammo);
+		if (slot == m_currentWeapon && !bInVehicle) {
+			AddWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nModelId);
+		}
 	}
-	if (weapon.m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO)
-		weapon.m_eWeaponState = WEAPONSTATE_READY;
+	if (GetWeapon(slot).m_eWeaponState != WEAPONSTATE_OUT_OF_AMMO)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 
-	return weaponType;
+	return slot;
 }
 
 static RwObject*
@@ -530,6 +586,7 @@ CPed::IsPlayer(void)
 		m_nPedType == PEDTYPE_PLAYER3 || m_nPedType == PEDTYPE_PLAYER4;
 }
 
+// --MIAMI: Done
 bool
 CPed::UseGroundColModel(void)
 {
@@ -539,12 +596,14 @@ CPed::UseGroundColModel(void)
 		m_nPedState == PED_DEAD;
 }
 
+// --MIAMI: Done
 bool
 CPed::CanSetPedState(void)
 {
 	return !DyingOrDead() && m_nPedState != PED_ARRESTED && !EnteringCar() && m_nPedState != PED_STEAL_CAR;
 }
 
+// --MIAMI: Done
 bool
 CPed::IsPedInControl(void)
 {
@@ -553,6 +612,7 @@ CPed::IsPedInControl(void)
 		&& m_fHealth > 0.0f;
 }
 
+// --MIAMI: Done
 bool
 CPed::CanStrafeOrMouseControl(void)
 {
@@ -561,9 +621,10 @@ CPed::CanStrafeOrMouseControl(void)
 		return false;
 #endif
 	return m_nPedState == PED_NONE || m_nPedState == PED_IDLE || m_nPedState == PED_FLEE_POS || m_nPedState == PED_FLEE_ENTITY ||
-		m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP;
+		m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP || m_nPedState == PED_ANSWER_MOBILE;
 }
 
+// --MIAMI: Done
 void
 CPed::AddWeaponModel(int id)
 {
@@ -571,8 +632,12 @@ CPed::AddWeaponModel(int id)
 
 	if (id != -1) {
 #ifdef PED_SKIN
-		if(IsClumpSkinned(GetClump()))
+		if (IsClumpSkinned(GetClump())) {
+			if (m_pWeaponModel)
+				RemoveWeaponModel(-1);
+
 			m_pWeaponModel = (RpAtomic*)CModelInfo::GetModelInfo(id)->CreateInstance();
+		}
 		else
 #endif
 		{
@@ -581,7 +646,11 @@ CPed::AddWeaponModel(int id)
 			RpAtomicSetFrame(atm, m_pFrames[PED_HANDR]->frame);
 			RpClumpAddAtomic(GetClump(), atm);
 		}
+		CModelInfo::GetModelInfo(id)->AddRef();
 		m_wepModelID = id;
+
+		if (IsPlayer() && id == MI_MINIGUN)
+			((CPlayerPed*)this)->m_pMinigunTopAtomic = (RpAtomic*)CModelInfo::GetModelInfo(MI_MINIGUN2)->CreateInstance();
 	}
 }
 
@@ -593,7 +662,7 @@ CPed::AimGun(void)
 
 	if (m_pSeekTarget) {
 		if (m_pSeekTarget->IsPed()) {
-			((CPed*)m_pSeekTarget)->m_pedIK.GetComponentPosition(&pos, PED_MID);
+			((CPed*)m_pSeekTarget)->m_pedIK.GetComponentPosition(pos, PED_MID);
 			vector = pos;
 		} else {
 			vector = m_pSeekTarget->GetPosition();
@@ -628,7 +697,7 @@ CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
 
 		// BUG: This condition will always return true. Even fixing it won't work, because these states are unused.
 		// if (m_nPedState != PED_PASSENGER || m_nPedState != PED_TAXI_PASSENGER) {
-			CPed::SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
+			SetDie();
 		// }
 
 		bBodyPartJustCameOff = true;
@@ -750,6 +819,7 @@ CPed::SetLookFlag(float direction, bool keepTryingToLook)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetLookTimer(int time)
 {
@@ -828,6 +898,8 @@ CPed::Avoid(void)
 	}
 }
 
+
+// --MIAMI: Done
 void
 CPed::ClearAimFlag(void)
 {
@@ -835,9 +907,7 @@ CPed::ClearAimFlag(void)
 		bIsAimingGun = false;
 		bIsRestoringGun = true;
 		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
-#ifdef VC_PED_PORTS
 		m_lookTimer = 0;
-#endif
 	}
 
 	if (IsPlayer())
@@ -870,116 +940,273 @@ CPed::IsPedHeadAbovePos(float zOffset)
 	return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z;
 }
 
+// --MIAMI: Done
+void
+CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
+{
+	CPed *ped = (CPed*)arg;
+	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(ped->GetWeapon()->m_eWeaponType);
+	
+	if (ped->DyingOrDead())
+		return;
+
+	if (ped->bIsDucking && ped->bCrouchWhenShooting) {
+		CAnimBlendAssociation *crouchFireAssoc = nil;
+		if (!!weapon->m_bCrouchFire) {
+			crouchFireAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchFireAnim(weapon));
+		}
+		if (!!weapon->m_bReload && reloadAssoc) {
+			if (reloadAssoc->animId == GetCrouchReloadAnim(weapon) && !crouchFireAssoc) {
+				CAnimBlendAssociation *crouchAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
+				crouchAssoc->SetCurrentTime(crouchAssoc->hierarchy->totalLength);
+				crouchAssoc->flags &= ~ASSOC_RUNNING;
+			}
+		}
+	} else if (weapon->m_bReloadLoop2Start && ped->bIsAttacking) {
+		CAnimBlendAssociation *fireAssoc =
+			CAnimManager::BlendAnimation(ped->GetClump(), weapon->m_AnimToPlay, GetPrimaryFireAnim(weapon), 8.0f);
+		fireAssoc->SetFinishCallback(FinishedAttackCB, ped);
+		fireAssoc->SetRun();
+		if (fireAssoc->currentTime != reloadAssoc->hierarchy->totalLength) {
+			if (fireAssoc->currentTime >= weapon->m_fAnimLoopStart)
+				return;
+
+			fireAssoc->SetCurrentTime(Max(weapon->m_fAnimLoopStart - 0.04f, 0.0f));
+		} else {
+			fireAssoc->SetCurrentTime(Max(weapon->m_fAnimLoopStart - 0.04f, 0.0f));
+		}
+	}
+}
+
+// --MIAMI: Done
 void
 CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
 {
-	CWeaponInfo *currentWeapon;
-	CAnimBlendAssociation *newAnim;
+	CAnimBlendAssociation *newAnim, *reloadAnimAssoc;
 	CPed *ped = (CPed*)arg;
+	CWeaponInfo *currentWeapon = CWeaponInfo::GetWeaponInfo(ped->GetWeapon()->m_eWeaponType);
 
-	if (attackAssoc) {
-		switch (attackAssoc->animId) {
-			case ANIM_WEAPON_START_THROW:
-				// what?!
-				if ((!ped->IsPlayer() || ((CPlayerPed*)ped)->m_bHaveTargetSelected) && ped->IsPlayer()) {
-					attackAssoc->blendDelta = -1000.0f;
-					newAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_THROWU);
-				} else {
-					attackAssoc->blendDelta = -1000.0f;
-					newAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_THROW);
+	if (ped->m_nPedState != PED_ATTACK) {
+		if (ped->bIsDucking && ped->IsPedInControl()) {
+			if (currentWeapon->m_bReload) {
+				reloadAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchReloadAnim(currentWeapon));
+			}
+			if (currentWeapon->m_bCrouchFire && attackAssoc) {
+				if (attackAssoc->animId == GetCrouchFireAnim(currentWeapon) && !reloadAnimAssoc) {
+					newAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
+					newAnim->SetCurrentTime(newAnim->hierarchy->totalLength);
+					newAnim->flags &= ~ASSOC_RUNNING;
 				}
+			}
+		}
+		return;
+	}
+	if (attackAssoc && attackAssoc->animId == ANIM_THROWABLE_START_THROW && currentWeapon->m_AnimToPlay == ASSOCGRP_THROW) {
+		if ((!ped->IsPlayer() || ((CPlayerPed*)ped)->m_bHaveTargetSelected) && ped->IsPlayer()) {
+			attackAssoc->blendDelta = -1000.0f;
+			newAnim = CAnimManager::AddAnimation(ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_THROWABLE_THROWU);
+		} else {
+			attackAssoc->blendDelta = -1000.0;
+			newAnim = CAnimManager::AddAnimation(ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_THROWABLE_THROW);
+		}
+		newAnim->SetFinishCallback(FinishedAttackCB, ped);
+		return;
+	}
 
-				newAnim->SetFinishCallback(FinishedAttackCB, ped);
-				return;
+	if (ped->bIsDucking && ped->bCrouchWhenShooting) {
+		if (currentWeapon->m_bReload) {
+			reloadAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), GetCrouchReloadAnim(currentWeapon));
+		}
+		if (currentWeapon->m_bCrouchFire && attackAssoc) {
+			if (attackAssoc->animId == GetCrouchFireAnim(currentWeapon) && !reloadAnimAssoc) {
+				newAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 8.0f);
+				newAnim->SetCurrentTime(newAnim->hierarchy->totalLength);
+				newAnim->flags &= ~ASSOC_RUNNING;
+			}
+		}
 
-			case ANIM_FIGHT_PPUNCH:
-				attackAssoc->blendDelta = -8.0f;
-				attackAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				ped->ClearAttack();
-				return;
+		if (!ped->bIsAttacking)
+			ped->ClearAttack();
 
-			case ANIM_WEAPON_THROW:
-			case ANIM_WEAPON_THROWU:
-				if (ped->GetWeapon()->m_nAmmoTotal > 0) {
-					currentWeapon = CWeaponInfo::GetWeaponInfo(ped->GetWeapon()->m_eWeaponType);
+		return;
+	}
+	
+	// Not for unarmed, it's for weapons using unarmed anims
+	if (currentWeapon->m_bUse2nd && ped->bIsAttacking && currentWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) {
+		AnimationId groundAnim = GetFireAnimGround(currentWeapon);
+		CAnimBlendAssociation *groundAnimAssoc = RpAnimBlendClumpGetAssociation(ped->GetClump(), groundAnim);
+		if (!groundAnimAssoc || groundAnimAssoc->blendAmount <= 0.95f && groundAnimAssoc->blendDelta <= 0.0f) {
+			if (attackAssoc && attackAssoc->animId == ANIM_MELEE_ATTACK) {
+				newAnim = CAnimManager::BlendAnimation(
+					ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK_2ND, 8.0f);
+			} else {
+				newAnim = CAnimManager::BlendAnimation(
+					ped->GetClump(), currentWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK, 8.0f);
+			}
+			newAnim->SetFinishCallback(FinishedAttackCB, ped);
+		}
+	} else {
+		if (attackAssoc && attackAssoc->animId == ANIM_MELEE_ATTACK && currentWeapon->m_AnimToPlay == ASSOCGRP_UNARMED)
+		{
+			attackAssoc->blendDelta = -8.0f;
+			attackAssoc->flags |= ASSOC_DELETEFADEDOUT;
+			ped->ClearAttack();
+			return;
+		}
+		if (attackAssoc)
+		{
+			if (currentWeapon->m_AnimToPlay == ASSOCGRP_THROW)
+			{
+				if ((attackAssoc->animId == ANIM_THROWABLE_THROW || attackAssoc->animId == ANIM_THROWABLE_THROWU) && ped->GetWeapon()->m_nAmmoTotal > 0)
+				{
+					ped->RemoveWeaponModel(currentWeapon->m_nModelId);
 					ped->AddWeaponModel(currentWeapon->m_nModelId);
 				}
-				break;
-			default:
-				break;
+			}
 		}
+
+		if (!ped->bIsAttacking)
+			ped->ClearAttack();
 	}
-	
-	if (!ped->bIsAttacking)
-		ped->ClearAttack();
 }
 
+// --MIAMI: Done except commented things
 void
 CPed::Attack(void)
 {
 	CAnimBlendAssociation *weaponAnimAssoc;
 	int32 weaponAnim;
-	float animStart;
 	eWeaponType ourWeaponType;
 	float weaponAnimTime;
 	eWeaponFire ourWeaponFire;
 	float animLoopEnd;
 	CWeaponInfo *ourWeapon;
 	bool attackShouldContinue;
-	AnimationId reloadAnim;
 	CAnimBlendAssociation *reloadAnimAssoc;
+	CAnimBlendAssociation *throwAssoc;
 	float delayBetweenAnimAndFire;
+	float animLoopStart;
 	CVector firePos;
 
 	ourWeaponType = GetWeapon()->m_eWeaponType;
 	ourWeapon = CWeaponInfo::GetWeaponInfo(ourWeaponType);
 	ourWeaponFire = ourWeapon->m_eWeaponFire;
-	weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ourWeapon->m_AnimToPlay);
+	weaponAnimAssoc = nil;
 	attackShouldContinue = bIsAttacking;
 	reloadAnimAssoc = nil;
-	reloadAnim = NUM_ANIMS;
+	throwAssoc = nil;
+	animLoopStart = ourWeapon->m_fAnimLoopStart;
+	animLoopEnd = ourWeapon->m_fAnimLoopEnd;
 	delayBetweenAnimAndFire = ourWeapon->m_fAnimFrameFire;
 	weaponAnim = ourWeapon->m_AnimToPlay;
 
-	if (weaponAnim == ANIM_WEAPON_HGUN_BODY)
-		reloadAnim = ANIM_HGUN_RELOAD;
-	else if (weaponAnim == ANIM_WEAPON_AK_BODY)
-		reloadAnim = ANIM_AK_RELOAD;
+	if (bIsDucking) {
+		if (!!ourWeapon->m_bCrouchFire && bCrouchWhenShooting) {
+			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(ourWeapon));
+			if (weaponAnimAssoc) {
+				animLoopStart = ourWeapon->m_fAnim2LoopStart;
+				animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
+				delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
+			}
+		}
+	} else {
+		AnimationId anim = GetFireAnimNotDucking(ourWeapon);
+		weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), anim);
+		if (anim == ANIM_WEAPON_FIRE_3RD && weaponAnimAssoc) {
+			animLoopStart = 11.f/30.f;
+			animLoopEnd = 19.f/30.f;
+			delayBetweenAnimAndFire = 14.f/30.f;
+		}
+	}
 
-	if (reloadAnim != NUM_ANIMS)
-		reloadAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), reloadAnim);
+	if (ourWeapon->m_bReload) {
+		reloadAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetReloadAnim(ourWeapon));
+	}
 
-	if (bIsDucking)
-		return;
+	if (!!ourWeapon->m_bReload && !reloadAnimAssoc)  {
+		reloadAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(ourWeapon));
+	}
 
-	if (reloadAnimAssoc) {
+	if ( reloadAnimAssoc && reloadAnimAssoc->IsRunning() ) {
 		if (!IsPlayer() || ((CPlayerPed*)this)->m_bHaveTargetSelected)
 			ClearAttack();
-
 		return;
 	}
 
-	if (CTimer::GetTimeInMilliseconds() < m_shootTimer)
+	if ( reloadAnimAssoc ) {
+		reloadAnimAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		if ( reloadAnimAssoc->blendDelta >= 0.0f )
+			reloadAnimAssoc->blendDelta = -8.0f;
+	}
+
+	if (!!ourWeapon->m_bThrow)  {
+		throwAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_THROWABLE_START_THROW);
+	}
+
+	if ( CTimer::GetTimeInMilliseconds() < m_shootTimer )
 		attackShouldContinue = true;
 
+	bool meleeAttackStarted = false;
+	if ( !weaponAnimAssoc ) {
+		if (!!ourWeapon->m_bPartialAttack) {
+			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_MELEE_ATTACK_START);
+			if ( weaponAnimAssoc ) {
+				if ( IsPlayer() )
+					meleeAttackStarted = true;
+
+				switch ( ourWeapon->m_AnimToPlay ) {
+					case ASSOCGRP_UNARMED:
+					case ASSOCGRP_SCREWDRIVER:
+					case ASSOCGRP_KNIFE:
+					case ASSOCGRP_BASEBALLBAT:
+					case ASSOCGRP_GOLFCLUB:
+					case ASSOCGRP_CHAINSAW:
+						delayBetweenAnimAndFire = 0.2f;
+						animLoopStart = 0.1f;
+						break;
+					default:
+						break;
+				}
+				animLoopEnd = 99.9f;
+			}
+		}
+	}
 	if (!weaponAnimAssoc) {
-		weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ourWeapon->m_Anim2ToPlay);
-		delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
-
-		// Long throw granade, molotov
-		if (!weaponAnimAssoc && ourWeapon->m_bThrow) {
-			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_THROWU);
-			delayBetweenAnimAndFire = 0.2f;
+		if (!!ourWeapon->m_bUse2nd) {
+			weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE_2ND);
+			if (weaponAnimAssoc) {
+				animLoopStart = ourWeapon->m_fAnim2LoopStart;
+				animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
+				delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
+			}
 		}
+	}
+	if (!weaponAnimAssoc) {
+		weaponAnimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetFireAnimGround(ourWeapon));
+		if (weaponAnimAssoc) {
+			animLoopStart = ourWeapon->m_fAnim2LoopStart;
+			animLoopEnd = ourWeapon->m_fAnim2LoopEnd;
+			delayBetweenAnimAndFire = ourWeapon->m_fAnim2FrameFire;
+		}
+	}
 
-		if (!weaponAnimAssoc) {
+	if (!weaponAnimAssoc) {
+		if (!throwAssoc) {
 			if (attackShouldContinue) {
 				if (ourWeaponFire != WEAPON_FIRE_PROJECTILE || !IsPlayer() || ((CPlayerPed*)this)->m_bHaveTargetSelected) {
-					if (!CGame::nastyGame || ourWeaponFire != WEAPON_FIRE_MELEE || CheckForPedsOnGroundToAttack(this, nil) < PED_ON_THE_FLOOR) {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ourWeapon->m_AnimToPlay, 8.0f);
-					}
-					else {
-						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ourWeapon->m_Anim2ToPlay, 8.0f);
+					if (bCrouchWhenShooting && bIsDucking && !!ourWeapon->m_bCrouchFire) {
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetCrouchFireAnim(ourWeapon), 8.0f);
+
+					} else if(!!ourWeapon->m_bUse2nd && CGeneral::GetRandomNumber() & 1){
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE_2ND, 8.0f);
+
+					} else if (!CGame::nastyGame || (!ourWeapon->m_bGround2nd && !ourWeapon->m_bGround3rd) ||
+						ourWeaponFire != WEAPON_FIRE_MELEE || CheckForPedsOnGroundToAttack(this, nil) < PED_ON_THE_FLOOR) {
+
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetFireAnimNotDucking(ourWeapon), 8.0f);
+
+					} else {
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, GetFireAnimGround(ourWeapon, false), 8.0f);
 					}
 
 					weaponAnimAssoc->SetFinishCallback(CPed::FinishedAttackCB, this);
@@ -996,78 +1223,131 @@ CPed::Attack(void)
 			} else
 				FinishedAttackCB(nil, this);
 
-			return;
+		}
+		return;
+	}
+
+	if (meleeAttackStarted && IsPlayer()) {
+		if (((CPlayerPed*)this)->m_bHaveTargetSelected || ((CPlayerPed*)this)->m_fMoveSpeed < 0.5f) {
+			weaponAnimAssoc->SetRun();
+		} else {
+			if (weaponAnimAssoc->currentTime > animLoopStart && weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep <= animLoopStart)
+				weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
 		}
 	}
 
-	animStart = ourWeapon->m_fAnimLoopStart;
+	float animStart = ourWeapon->m_fAnimLoopStart * 0.4f;
 	weaponAnimTime = weaponAnimAssoc->currentTime;
 	if (weaponAnimTime > animStart && weaponAnimTime - weaponAnimAssoc->timeStep <= animStart) {
-		if (ourWeapon->m_bCanAimWithArm)
+		if (!bIsDucking && !(m_nPedType == PEDTYPE_COP && ourWeapon->m_bCop3rd && weaponAnimAssoc->animId == ANIM_WEAPON_FIRE_3RD) && ourWeapon->m_bCanAimWithArm)
 			m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
 		else
 			m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 	}
 
-	if (weaponAnimTime <= delayBetweenAnimAndFire || weaponAnimTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire || !weaponAnimAssoc->IsRunning()) {
-		if (weaponAnimAssoc->speed < 1.0f)
-			weaponAnimAssoc->speed = 1.0f;
+	if (ourWeaponType != WEAPONTYPE_CHAINSAW
+		|| !meleeAttackStarted && delayBetweenAnimAndFire - 0.5f >= weaponAnimAssoc->currentTime
+		|| weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire) {
 
-	} else {
-		firePos = ourWeapon->m_vecFireOffset;
-		if (ourWeaponType == WEAPONTYPE_BASEBALLBAT) {
-			if (weaponAnimAssoc->animId == ourWeapon->m_Anim2ToPlay)
-				firePos.z = 0.7f * ourWeapon->m_fRadius - 1.0f;
+		if (ourWeaponType == WEAPONTYPE_CHAINSAW) {
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_ATTACK, 0.0f);
+		} else if (weaponAnimTime <= delayBetweenAnimAndFire || weaponAnimTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire || !weaponAnimAssoc->IsRunning()) {
+			if (weaponAnimAssoc->speed < 1.0f)
+				weaponAnimAssoc->speed = 1.0f;
 
-			firePos = GetMatrix() * firePos;
-		} else if (ourWeaponType != WEAPONTYPE_UNARMED) {
-			TransformToNode(firePos, weaponAnimAssoc->animId == ANIM_KICK_FLOOR ? PED_FOOTR : PED_HANDR);
 		} else {
-			firePos = GetMatrix() * firePos;
-		}
-			
-		GetWeapon()->Fire(this, &firePos);
+			firePos = ourWeapon->m_vecFireOffset;
 
-		if (ourWeaponType == WEAPONTYPE_MOLOTOV || ourWeaponType == WEAPONTYPE_GRENADE) {
-			RemoveWeaponModel(ourWeapon->m_nModelId);
-		}
-		if (!GetWeapon()->m_nAmmoTotal && ourWeaponFire != WEAPON_FIRE_MELEE && FindPlayerPed() != this) {
-			SelectGunIfArmed();
-		}
+			if (ourWeaponType != WEAPONTYPE_KATANA && ourWeaponType != WEAPONTYPE_CHAINSAW) {
+				if (ourWeapon->m_eWeaponFire != WEAPON_FIRE_MELEE) {
+					TransformToNode(firePos, (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND && ourWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) ? PED_FOOTR : PED_HANDR);
+				} else {
+					firePos = GetMatrix() * firePos;
+				}
+			} else {
+				if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND)
+					firePos.z = 0.7f * ourWeapon->m_fRadius - 1.0f;
 
-		if (GetWeapon()->m_eWeaponState != WEAPONSTATE_MELEE_MADECONTACT) {
-			// If reloading just began, start the animation
-			// Last condition will always return true, even IDA hides it
-			if (GetWeapon()->m_eWeaponState == WEAPONSTATE_RELOADING && reloadAnim != NUM_ANIMS /* && !reloadAnimAssoc*/) {
-				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, reloadAnim, 8.0f);
-				ClearLookFlag();
-				ClearAimFlag();
-				bIsAttacking = false;
-				bIsPointingGunAt = false;
-				m_shootTimer = CTimer::GetTimeInMilliseconds();
-				return;
+				firePos = GetMatrix() * firePos;
 			}
-		} else {
-			if (weaponAnimAssoc->animId == ANIM_WEAPON_BAT_V || weaponAnimAssoc->animId == ANIM_WEAPON_BAT_H) {
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, 1.0f);
-			} else if (weaponAnimAssoc->animId == ANIM_FIGHT_PPUNCH) {
-				DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_PUNCH_39, 0.0f);
+			
+			GetWeapon()->Fire(this, &firePos);
+
+			if (ourWeaponType == WEAPONTYPE_MOLOTOV || ourWeaponType == WEAPONTYPE_GRENADE || ourWeaponType == WEAPONTYPE_DETONATOR_GRENADE ||
+				ourWeaponType == WEAPONTYPE_TEARGAS) {
+				RemoveWeaponModel(ourWeapon->m_nModelId);
+			}
+			if (!GetWeapon()->m_nAmmoTotal && ourWeaponFire != WEAPON_FIRE_MELEE && FindPlayerPed() != this) {
+				SelectGunIfArmed();
 			}
 
-			weaponAnimAssoc->speed = 0.5f;
+			if (GetWeapon()->m_eWeaponState == WEAPONSTATE_MELEE_MADECONTACT) {
+				int damagerType = ENTITY_TYPE_NOTHING;
+				if (m_pDamageEntity && (m_fDamageImpulse == 0.0f || !m_pDamageEntity->IsBuilding())) {
+					damagerType = m_pDamageEntity->GetType();
+				}
+				switch (ourWeapon->m_AnimToPlay) {
+					case ASSOCGRP_UNARMED:
+						if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK || weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_START) {
+#ifdef AUDIO_NOT_READY
+							DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_PUNCH_39, 0.0f);
+#else
+							DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_PUNCH_39, (damagerType | (ourWeaponType << 8)));
+#endif
+						}
+						break;
+					case ASSOCGRP_KNIFE:
+					case ASSOCGRP_BASEBALLBAT:
+					case ASSOCGRP_GOLFCLUB:
+					case ASSOCGRP_CHAINSAW:
+#ifdef AUDIO_NOT_READY
+						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, 1.0f);
+#else
+						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, (damagerType | (ourWeaponType << 8)));
+#endif
+						break;
+					default:
+						break;
+				}
 
-			if (bIsAttacking || CTimer::GetTimeInMilliseconds() < m_shootTimer) {
-				weaponAnimAssoc->callbackType = 0;
+				if (bIsAttacking || CTimer::GetTimeInMilliseconds() < m_shootTimer) {
+					weaponAnimAssoc->callbackType = 0;
+				}
 			}
+
+			attackShouldContinue = false;
 		}
+	} else {
+		CVector firePos = ourWeapon->m_vecFireOffset;
 
+		if (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND)
+			firePos.z = 0.7f * ourWeapon->m_fRadius - 1.0f;
+
+		firePos = GetMatrix() * firePos;
+		GetWeapon()->Fire(this, &firePos);
+		if (GetWeapon()->m_eWeaponState == WEAPONSTATE_MELEE_MADECONTACT) {
+			int damagerType = ENTITY_TYPE_PED;
+			if (m_pDamageEntity)
+				damagerType = m_pDamageEntity->GetType();
+
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_MADECONTACT, (float)damagerType);
+			if (IsPlayer()) {
+				CPad::GetPad(0)->StartShake(240, 180);
+			}
+		} else {
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_IDLE, 0.0f);
+			if (IsPlayer()) {
+				CPad::GetPad(0)->StartShake(240, 90);
+			}
+		}
 		attackShouldContinue = false;
 	}
 
-	if (ourWeaponType == WEAPONTYPE_SHOTGUN) {
+	if (ourWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT && ourWeapon->m_AnimToPlay == ASSOCGRP_SHOTGUN) {
 		weaponAnimTime = weaponAnimAssoc->currentTime;
 		firePos = ourWeapon->m_vecFireOffset;
 
+		//TODO(Miami): Check
 		if (weaponAnimTime > 1.0f && weaponAnimTime - weaponAnimAssoc->timeStep <= 1.0f && weaponAnimAssoc->IsRunning()) {
 			TransformToNode(firePos, PED_HANDR);
 
@@ -1086,85 +1366,119 @@ CPed::Attack(void)
 			GetWeapon()->AddGunshell(this, gunshellPos, gunshellRot, 0.025f);
 		}
 	}
-#ifdef VC_PED_PORTS
+
+	// TODO(Miami): CSpecialFX::AddWeaponStreak
+
+	// Anim breakout on running
 	if (IsPlayer()) {
 		if (CPad::GetPad(0)->GetSprint()) {
-			// animBreakout is a member of WeaponInfo in VC, so it's me that added the below line.
-			float animBreakOut = ((ourWeaponType == WEAPONTYPE_FLAMETHROWER || ourWeaponType == WEAPONTYPE_UZI || ourWeaponType == WEAPONTYPE_SHOTGUN) ? 25 / 30.0f : 99 / 30.0f);
-			if (!attackShouldContinue && weaponAnimAssoc->currentTime > animBreakOut) {
+			if (!attackShouldContinue && weaponAnimAssoc->currentTime > ourWeapon->m_fAnimBreakout) {
 				weaponAnimAssoc->blendDelta = -4.0f;
 				FinishedAttackCB(nil, this);
 				return;
 			}
 		}
 	}
-#endif
-	animLoopEnd = ourWeapon->m_fAnimLoopEnd;
-	if (ourWeaponFire == WEAPON_FIRE_MELEE && weaponAnimAssoc->animId == ourWeapon->m_Anim2ToPlay)
-		animLoopEnd = 3.4f/6.0f;
 
 	weaponAnimTime = weaponAnimAssoc->currentTime;
 
 	// Anim loop end, either start the loop again or finish the attack
 	if (weaponAnimTime > animLoopEnd || !weaponAnimAssoc->IsRunning() && ourWeaponFire != WEAPON_FIRE_PROJECTILE) {
-
+		if (GetWeapon()->m_eWeaponState == WEAPONSTATE_RELOADING) {
+			if (ourWeapon->m_bReload && !reloadAnimAssoc) {
+				if (!CWorld::Players[CWorld::PlayerInFocus].m_bFastReload) {
+					CAnimBlendAssociation *newReloadAssoc;
+					if (bIsDucking) {
+						newReloadAssoc = CAnimManager::BlendAnimation(
+							GetClump(), ourWeapon->m_AnimToPlay,
+							GetCrouchReloadAnim(ourWeapon),
+							8.0f);
+					} else {
+						newReloadAssoc = CAnimManager::BlendAnimation(
+							GetClump(), ourWeapon->m_AnimToPlay,
+							GetReloadAnim(ourWeapon),
+							8.0f);
+					}
+					newReloadAssoc->SetFinishCallback(FinishedReloadCB, this);
+				}
+				ClearLookFlag();
+				ClearAimFlag();
+				bIsAttacking = false;
+				bIsPointingGunAt = false;
+				m_shootTimer = CTimer::GetTimeInMilliseconds();
+#ifdef AUDIO_NOT_READY
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, 0.0f);
+#else
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, GetWeapon()->m_eWeaponType);
+#endif
+				return;
+			}
+		}
 		if (weaponAnimTime - 2.0f * weaponAnimAssoc->timeStep <= animLoopEnd
 			&& (bIsAttacking || CTimer::GetTimeInMilliseconds() < m_shootTimer)
-			&& GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING) {
+			&& (GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING
+				|| GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)) {
+
+			PedOnGroundState pedOnGroundState;
+			if (ourWeapon->m_eWeaponFire == WEAPON_FIRE_MELEE &&
+				(CGame::nastyGame && ((pedOnGroundState = CheckForPedsOnGroundToAttack(this, nil)) > PED_IN_FRONT_OF_ATTACKER)
+				|| ourWeaponType == WEAPONTYPE_BASEBALLBAT && pedOnGroundState == NO_PED && bIsStanding && m_pCurSurface && m_pCurSurface->IsVehicle())) {
 
-			weaponAnim = weaponAnimAssoc->animId;
-			if (ourWeaponFire != WEAPON_FIRE_MELEE || CheckForPedsOnGroundToAttack(this, nil) < PED_ON_THE_FLOOR) {
-				if (weaponAnim != ourWeapon->m_Anim2ToPlay || weaponAnim == ANIM_RBLOCK_CSHOOT) {
-					weaponAnimAssoc->Start(ourWeapon->m_fAnimLoopStart);
+				AnimationId fireAnim = GetFireAnimGround(ourWeapon, false);
+				if (weaponAnimAssoc->animId == fireAnim)
+					weaponAnimAssoc->SetCurrentTime(0.1f);
+				else {
+					if (fireAnim) {
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, fireAnim, 8.0f);
+					} else {
+						weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_KICK_FLOOR, 8.0f);
+					}
+				}
+				weaponAnimAssoc->SetFinishCallback(FinishedAttackCB, this);
+			} else if (!!ourWeapon->m_bUse2nd) {
+				if (weaponAnimAssoc->animId == ANIM_WEAPON_FIRE_2ND) {
+					weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE, 8.0f);
 				} else {
-					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ourWeapon->m_AnimToPlay, 8.0f);
+					weaponAnimAssoc = CAnimManager::BlendAnimation(GetClump(), ourWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE_2ND, 8.0f);
 				}
+				weaponAnimAssoc->SetFinishCallback(FinishedAttackCB, this);
 			} else {
-				if (weaponAnim == ourWeapon->m_Anim2ToPlay)
-					weaponAnimAssoc->SetCurrentTime(0.1f);
-				else
-					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ourWeapon->m_Anim2ToPlay, 8.0f);
+				weaponAnimAssoc->SetCurrentTime(animLoopStart);
+				weaponAnimAssoc->SetRun();
 			}
-#ifdef VC_PED_PORTS
-		} else if (IsPlayer() && m_pPointGunAt && bIsAimingGun && GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING) {
-			weaponAnimAssoc->SetCurrentTime(ourWeapon->m_fAnimLoopEnd);
-			weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
-			SetPointGunAt(m_pPointGunAt);
-#endif
-		} else {
-			ClearAimFlag();
+		}
+	} else if (IsPlayer() && m_pPointGunAt && bIsAimingGun && GetWeapon()->m_eWeaponState != WEAPONSTATE_RELOADING) {
+		weaponAnimAssoc->SetCurrentTime(animLoopEnd);
+		weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
+		SetPointGunAt(m_pPointGunAt);
+	} else {
+		ClearAimFlag();
 
-			// Echoes of bullets, at the end of the attack. (Bug: doesn't play while reloading)
-			if (weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep <= ourWeapon->m_fAnimLoopEnd) {
-				switch (ourWeaponType) {
-					case WEAPONTYPE_UZI:
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_UZI_BULLET_ECHO, 0.0f);
-						break;
-					case WEAPONTYPE_AK47:
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, 0.0f);
-						break;
-					case WEAPONTYPE_M16:
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_M16_BULLET_ECHO, 0.0f);
-						break;
-					default:
-						break;
-				}
-			}
+		// Echoes of bullets, at the end of the attack. (Bug: doesn't play while reloading)
+		if (weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep < animLoopEnd) {
 
-			// Fun fact: removing this part leds to reloading flamethrower
-			if (ourWeaponType == WEAPONTYPE_FLAMETHROWER && weaponAnimAssoc->IsRunning()) {
-				weaponAnimAssoc->flags |= ASSOC_DELETEFADEDOUT;
-				weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
-				weaponAnimAssoc->blendDelta = -4.0f;
-			}
+#ifdef AUDIO_NOT_READY
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, 0.0f);
+#else
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_AK47_BULLET_ECHO, ourWeaponType);
+#endif
+		}
+
+		// Fun fact: removing this part leds to reloading flamethrower
+		if (ourWeaponType == WEAPONTYPE_FLAMETHROWER && weaponAnimAssoc->IsRunning()) {
+			weaponAnimAssoc->flags |= ASSOC_DELETEFADEDOUT;
+			weaponAnimAssoc->flags &= ~ASSOC_RUNNING;
+			weaponAnimAssoc->blendDelta = -4.0f;
 		}
 	}
+
 	if (weaponAnimAssoc->currentTime > delayBetweenAnimAndFire)
 		attackShouldContinue = false;
 
 	bIsAttacking = attackShouldContinue;
 }
 
+// --MIAMI: Done
 void
 CPed::RemoveWeaponModel(int modelId)
 {
@@ -1172,40 +1486,74 @@ CPed::RemoveWeaponModel(int modelId)
 #ifdef PED_SKIN
 	if(IsClumpSkinned(GetClump())){
 		if(m_pWeaponModel){
-			RwFrame *frm = RpAtomicGetFrame(m_pWeaponModel);
-			RpAtomicDestroy(m_pWeaponModel);
-			RwFrameDestroy(frm);
-			m_pWeaponModel = nil;
+			if (modelId == -1
+				|| CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel) == CModelInfo::GetModelInfo(modelId)) {
+				CVisibilityPlugins::GetAtomicModelInfo(m_pWeaponModel)->RemoveRef();
+				RwFrame* frm = RpAtomicGetFrame(m_pWeaponModel);
+				RpAtomicDestroy(m_pWeaponModel);
+				RwFrameDestroy(frm);
+				m_pWeaponModel = nil;
+			}
 		}
 	}else
 #endif
 		RwFrameForAllObjects(m_pFrames[PED_HANDR]->frame,RemoveAllModelCB,nil);
+
+	if (IsPlayer() && (modelId == -1 || modelId == MI_MINIGUN)) {
+		RpAtomic* &atm = ((CPlayerPed*)this)->m_pMinigunTopAtomic;
+		if (atm) {
+			RwFrame *frm = RpAtomicGetFrame(atm);
+			RpAtomicDestroy(atm);
+			RwFrameDestroy(frm);
+			atm = nil;
+		}
+	}
 	m_wepModelID = -1;
 }
 
+// --MIAMI: Done
 void
-CPed::SetCurrentWeapon(uint32 weaponType)
+CPed::SetCurrentWeapon(eWeaponType weaponType)
 {
-	CWeaponInfo *weaponInfo;
-	if (HasWeapon(weaponType)) {
+	SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot);
+}
+
+// --MIAMI: Done
+void
+CPed::SetCurrentWeapon(int slot)
+{
+	if (slot == -1)
+		return;
+
+	CWeaponInfo* weaponInfo;
+	if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
 		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
 		RemoveWeaponModel(weaponInfo->m_nModelId);
+	}
+	m_currentWeapon = slot;
 
-		m_currentWeapon = weaponType;
+	if (FindPlayerPed() && IsPlayer())
+		((CPlayerPed*)this)->m_nSelectedWepSlot = m_currentWeapon;
 
+	if (HasWeaponSlot(slot)) {
 		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
 		AddWeaponModel(weaponInfo->m_nModelId);
 	}
 }
 
+// --MIAMI: Done
 // Only used while deciding which gun ped should switch to, if no ammo left.
 bool
 CPed::SelectGunIfArmed(void)
 {
-	for (int i = 0; i < m_maxWeaponTypeAllowed; i++) {
+	for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
 		if (GetWeapon(i).m_nAmmoTotal > 0) {
 			eWeaponType weaponType = GetWeapon(i).m_eWeaponType;
-			if (weaponType >= WEAPONTYPE_COLT45 && weaponType != WEAPONTYPE_M16 && weaponType <= WEAPONTYPE_FLAMETHROWER) {
+
+			// First condition checks for Pistol, Python and Shotguns
+			if ((weaponType >= WEAPONTYPE_COLT45 && weaponType < WEAPONTYPE_TEC9) ||
+				weaponType == WEAPONTYPE_UZI || weaponType == WEAPONTYPE_M4 || weaponType == WEAPONTYPE_MP5 ||
+				weaponType == WEAPONTYPE_ROCKETLAUNCHER || weaponType == WEAPONTYPE_FLAMETHROWER || weaponType == WEAPONTYPE_SNIPERRIFLE) {
 				SetCurrentWeapon(i);
 				return true;
 			}
@@ -1215,38 +1563,54 @@ CPed::SelectGunIfArmed(void)
 	return false;
 }
 
+// --MIAMI: Done
 void
 CPed::Duck(void)
 {
 	if (CTimer::GetTimeInMilliseconds() > m_duckTimer)
 		ClearDuck();
+	else if (bIsDucking && bCrouchWhenShooting) {
+		CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+		CAnimBlendAssociation *attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+		if (!attackAssoc) {
+			if(!!weapon->m_bCrouchFire)
+				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
+		}
+		if (!attackAssoc) {
+			if(!!weapon->m_bReload)
+				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
+		}
+		if (!attackAssoc) {
+			bIsDucking = false;
+		}
+	}
 }
 
+// --MIAMI: Done
 void
-CPed::ClearDuck(void)
+CPed::ClearDuck(bool clearTimer)
 {
 	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
 	if (!animAssoc) {
 		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_LOW);
-
-		if (!animAssoc) {
-			bIsDucking = false;
-			return;
-		}
 	}
 
-	if (!bCrouchWhenShooting)
-		return;
+	if (!animAssoc) {
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+	}
 
-	if (m_nPedState != PED_ATTACK && m_nPedState != PED_AIM_GUN)
-		return;
+	if (animAssoc) {
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		animAssoc->blendDelta = -4.0f;
+	}
+	bIsDucking = false;
 
-	animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_RBLOCK_CSHOOT);
-	if (!animAssoc || animAssoc->blendDelta < 0.0f) {
-		CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_RBLOCK_CSHOOT, 4.0f);
+	if (clearTimer) {
+		m_duckTimer = 0;
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::ClearPointGunAt(void)
 {
@@ -1256,27 +1620,21 @@ CPed::ClearPointGunAt(void)
 	ClearLookFlag();
 	ClearAimFlag();
 	bIsPointingGunAt = false;
-#ifndef VC_PED_PORTS
-	if (m_nPedState == PED_AIM_GUN) {
-		RestorePreviousState();
-#else
 	if (m_nPedState == PED_AIM_GUN || m_nPedState == PED_ATTACK) {
-		m_nPedState = PED_IDLE;
+		SetPedState(PED_IDLE);
 		RestorePreviousState();
 	}
-#endif
-		weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weaponInfo->m_AnimToPlay);
-		if (!animAssoc || animAssoc->blendDelta < 0.0f) {
-			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weaponInfo->m_Anim2ToPlay);
-		}
-		if (animAssoc) {
-			animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			animAssoc->blendDelta = -4.0f;
+	weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+	animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
+	if (!animAssoc || animAssoc->blendDelta < 0.0f) {
+		if (!!weaponInfo->m_bCrouchFire) {
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weaponInfo));
 		}
-#ifndef VC_PED_PORTS
 	}
-#endif
+	if (animAssoc) {
+		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		animAssoc->blendDelta = -4.0f;
+	}
 }
 
 void
@@ -1334,7 +1692,7 @@ CPed::BeingDraggedFromCar(void)
 #ifdef VC_PED_PORTS
 	if (m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
 		if (m_pMyVehicle) {
-			m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, NUM_ANIMS, m_pVehicleAnim->currentTime * 5.0f);
+			m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, NUM_STD_ANIMS, m_pVehicleAnim->currentTime * 5.0f);
 		}
 	}
 #endif
@@ -1501,6 +1859,7 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
 	return veh->GetPosition() + doorPos;
 }
 
+// --MIAMI: Done
 void
 CPed::LineUpPedWithCar(PedLineUpPhase phase)
 {
@@ -1509,29 +1868,59 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 	float seatPosMult = 0.0f;
 	float currentZ;
 	float adjustedTimeStep;
+	CVector autoZPos;
 
 	if (CReplay::IsPlayingBack())
 		return;
 
 	if (!bChangedSeat && phase != LINE_UP_TO_CAR_2) {
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT)) {
-			SetPedPositionInCar();
-			return;
-		}
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT)) {
-			SetPedPositionInCar();
-			return;
-		}
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITP)) {
-			SetPedPositionInCar();
-			return;
-		}
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITPLO)) {
-			SetPedPositionInCar();
-			return;
+		if (m_pMyVehicle->IsBike()) {
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_RIDE) ||
+				RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_PASSENGER)) {
+				SetPedPositionInCar();
+				return;
+			}
+		} else {
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT)) {
+				SetPedPositionInCar();
+				return;
+			}
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT)) {
+				SetPedPositionInCar();
+				return;
+			}
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITP)) {
+				SetPedPositionInCar();
+				return;
+			}
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SITPLO)) {
+				SetPedPositionInCar();
+				return;
+			}
 		}
 		bChangedSeat = true;
 	}
+	if (phase == LINE_UP_TO_CAR_FALL) {
+		SetPedPositionInCar();
+		autoZPos = GetPosition();
+		CPedPlacement::FindZCoorForPed(&autoZPos);
+		if (m_pVehicleAnim && (m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_LHS || m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_RHS)
+			&& autoZPos.z > GetPosition().z) {
+			m_matrix.GetPosition().z = autoZPos.z;
+		}
+		if (m_pVehicleAnim && m_pVehicleAnim->animId == ANIM_BIKE_HIT) {
+			if (autoZPos.z > GetPosition().z)
+				m_matrix.GetPosition().z += m_pVehicleAnim->GetProgress() * (autoZPos.z - GetPosition().z);
+
+		} else if (m_pVehicleAnim) {
+			if (m_pVehicleAnim->animId == ANIM_BIKE_GETOFF_BACK) {
+				if (autoZPos.z > GetPosition().z) {
+					m_matrix.GetPosition().z += (m_pVehicleAnim->currentTime * (20.f / 7.f)) * (autoZPos.z - GetPosition().z);
+				}
+			}
+		}
+		return;
+	}
 	if (phase == LINE_UP_TO_CAR_START) {
 		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
 	}
@@ -1569,14 +1958,9 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 		}
 	}
 
-	if (!bInVehicle)
-		seatPosMult = 1.0f;
-
-#ifdef VC_PED_PORTS
 	bool multExtractedFromAnim = false;
 	bool multExtractedFromAnimBus = false;
 	float zBlend;
-#endif
 	if (m_pVehicleAnim) {
 		vehAnim = m_pVehicleAnim->animId;
 
@@ -1587,38 +1971,38 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 			case ANIM_CAR_LJACKED_LHS:
 			case ANIM_VAN_GETIN_L:
 			case ANIM_VAN_GETIN:
-#ifdef VC_PED_PORTS
 				multExtractedFromAnim = true;
-				zBlend = Max(m_pVehicleAnim->currentTime / m_pVehicleAnim->hierarchy->totalLength - 0.3f, 0.0f) / (1.0f - 0.3f);
+				zBlend = Max(m_pVehicleAnim->GetProgress() - 0.3f, 0.0f) / (1.0f - 0.3f);
 				// fall through
-#endif
+
 			case ANIM_CAR_QJACKED:
 			case ANIM_CAR_GETOUT_LHS:
 			case ANIM_CAR_GETOUT_LOW_LHS:
 			case ANIM_CAR_GETOUT_RHS:
 			case ANIM_CAR_GETOUT_LOW_RHS:
-#ifdef VC_PED_PORTS
+
 				if (!multExtractedFromAnim) {
 					multExtractedFromAnim = true;
-					zBlend = Max(m_pVehicleAnim->currentTime / m_pVehicleAnim->hierarchy->totalLength - 0.5f, 0.0f) / (1.0f - 0.5f);
+					zBlend = Max(m_pVehicleAnim->GetProgress() - 0.5f, 0.0f) / (1.0f - 0.5f);
 				}
 				// fall through
-#endif
+
 			case ANIM_CAR_CRAWLOUT_RHS:
 			case ANIM_CAR_CRAWLOUT_RHS2:
 			case ANIM_VAN_GETOUT_L:
 			case ANIM_VAN_GETOUT:
-				seatPosMult = m_pVehicleAnim->currentTime / m_pVehicleAnim->hierarchy->totalLength;
+			case ANIM_BIKE_GETOFF_RHS:
+			case ANIM_BIKE_GETOFF_LHS:
+				seatPosMult = m_pVehicleAnim->GetProgress();
 				break;
 			case ANIM_CAR_GETIN_RHS:
 			case ANIM_CAR_GETIN_LHS:
-#ifdef VC_PED_PORTS
 				if (veh && veh->IsCar() && veh->bIsBus) {
 					multExtractedFromAnimBus = true;
-					zBlend = Min(m_pVehicleAnim->currentTime / m_pVehicleAnim->hierarchy->totalLength, 0.5f) / 0.5f;
+					zBlend = Min(m_pVehicleAnim->GetProgress(), 0.5f) / 0.5f;
 				}
 				// fall through
-#endif
+
 			case ANIM_CAR_QJACK:
 			case ANIM_CAR_GETIN_LOW_LHS:
 			case ANIM_CAR_GETIN_LOW_RHS:
@@ -1633,6 +2017,12 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 			case ANIM_CAR_LSHUFFLE_RHS:
 				seatPosMult = 0.0f;
 				break;
+			case ANIM_CAR_JUMPIN_LHS:
+			{
+				float animLength = m_pVehicleAnim->hierarchy->totalLength;
+				seatPosMult = Max(0.0f, 0.5f * animLength - m_pVehicleAnim->currentTime) / animLength;
+				break;
+			}
 			case ANIM_CAR_CLOSE_LHS:
 			case ANIM_CAR_CLOSE_RHS:
 			case ANIM_COACH_OPEN_L:
@@ -1643,8 +2033,25 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 				seatPosMult = 1.0f;
 				break;
 			default:
+				if (veh->IsBike()) {
+					seatPosMult = 0.0f;
+				} else {
+					if (bInVehicle)
+						seatPosMult = 0.0f;
+					else
+						seatPosMult = 1.0f;
+				}
 				break;
 		}
+	} else {
+		if (veh->IsBike()) {
+			seatPosMult = 0.0f;
+		} else {
+			if (bInVehicle)
+				seatPosMult = 0.0f;
+			else
+				seatPosMult = 1.0f;
+		}
 	}
 
 	CVector neededPos;
@@ -1655,7 +2062,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 		neededPos = GetPositionToOpenCarDoor(veh, m_vehEnterType, seatPosMult);
 	}
 
-	CVector autoZPos = neededPos;
+	autoZPos = neededPos;
 
 	if (veh->bIsInWater) {
 		if (veh->m_vehType == VEHICLE_TYPE_BOAT && veh->IsUpsideDown())
@@ -1685,11 +2092,24 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 	}
 
 	if (autoZPos.z > neededPos.z) {
-#ifdef VC_PED_PORTS
-		if (multExtractedFromAnim) {
+		vehAnim = m_pVehicleAnim->animId;
+		if (veh->IsBike() && (m_pVehicleAnim && vehAnim != ANIM_BIKE_KICK)) {
+			float zBlend;
+			if (vehAnim != ANIM_BIKE_GETOFF_RHS && vehAnim != ANIM_BIKE_GETOFF_LHS) {
+				if (vehAnim != ANIM_BIKE_JUMPON_R && vehAnim != ANIM_BIKE_JUMPON_L) {
+					zBlend = 0.0f;
+				} else {
+					float animLength = m_pVehicleAnim->hierarchy->totalLength;
+					zBlend = Min(1.0f, 2.0f * m_pVehicleAnim->currentTime / animLength);
+				}
+			} else {
+				zBlend = 1.0f - seatPosMult;
+			}
+			float curZ = veh->GetPosition().z + FEET_OFFSET;
+			neededPos.z = ((curZ - autoZPos.z) - veh->GetHeightAboveRoad()) * zBlend + autoZPos.z;
+		} else if (multExtractedFromAnim) {
 			neededPos.z += (autoZPos.z - neededPos.z) * zBlend;
 		} else {
-#endif
 			currentZ = GetPosition().z;
 			if (m_pVehicleAnim && vehAnim != ANIM_VAN_GETIN_L && vehAnim != ANIM_VAN_CLOSE_L && vehAnim != ANIM_VAN_CLOSE && vehAnim != ANIM_VAN_GETIN) {
 				neededPos.z = autoZPos.z;
@@ -1700,20 +2120,16 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 				// Smoothly change ped position
 				neededPos.z = currentZ - (currentZ - neededPos.z) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep);
 			}
-#ifdef VC_PED_PORTS
 		}
-#endif
 	} else {
 		// We may need to raise up the ped
 		if (phase == LINE_UP_TO_CAR_START) {
 			currentZ = GetPosition().z;
 
 			if (neededPos.z > currentZ) {
-#ifdef VC_PED_PORTS
 				if (multExtractedFromAnimBus) {
 					neededPos.z = (neededPos.z - currentZ) * zBlend + currentZ;
 				} else {
-#endif
 					if (m_pVehicleAnim &&
 						(vehAnim == ANIM_CAR_GETIN_RHS || vehAnim == ANIM_CAR_GETIN_LOW_RHS || vehAnim == ANIM_CAR_GETIN_LHS || vehAnim == ANIM_CAR_GETIN_LOW_LHS
 							|| vehAnim == ANIM_CAR_QJACK || vehAnim == ANIM_VAN_GETIN_L || vehAnim == ANIM_VAN_GETIN)) {
@@ -1721,12 +2137,10 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 
 						// Smoothly change ped position
 						neededPos.z = (neededPos.z - currentZ) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep) + currentZ;
-					} else if (EnteringCar()) {
+					} else if (EnteringCar() || m_nPedState == PED_DRIVING && veh->IsBike()) {
 						neededPos.z = Max(currentZ, autoZPos.z);
 					}
-#ifdef VC_PED_PORTS
 				}
-#endif
 			}
 		}
 	}
@@ -1757,14 +2171,26 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 		m_fRotationCur -= (m_fRotationCur - limitedDest) * (1.0f - timeUntilStateChange);
 	}
 
-	if (seatPosMult > 0.2f || vehIsUpsideDown) {
+	if (seatPosMult > 0.2f || vehIsUpsideDown || veh->IsBike()) {
 		SetPosition(neededPos);
 
 		SetHeading(m_fRotationCur);
 	} else {
 		CMatrix vehDoorMat(veh->GetMatrix());
 		vehDoorMat.GetPosition() += Multiply3x3(vehDoorMat, GetLocalPositionToOpenCarDoor(veh, m_vehEnterType, 0.0f));
-		// VC couch anims are inverted, so they're fixing it here.
+
+		// Cool huh? Entering from windscreen
+		if (m_vehEnterType == CAR_WINDSCREEN || veh->bIsBus) {
+			CMatrix correctionMat;
+			if (veh->bIsBus && (m_vehEnterType == CAR_DOOR_LF || m_vehEnterType == CAR_DOOR_LR))
+				correctionMat.SetRotateZ(-HALFPI);
+			else if (veh->bIsBus && (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR))
+				correctionMat.SetRotateZ(HALFPI);
+			else
+				correctionMat.SetRotateZ(PI);
+
+			vehDoorMat = vehDoorMat * correctionMat;
+		}
 		GetMatrix() = vehDoorMat;
 	}
 
@@ -2084,6 +2510,7 @@ CPed::SetPedStats(ePedStats pedStat)
 	m_pedStats = CPedStats::ms_apPedStats[pedStat];
 }
 
+// --MIAMI: Done
 void
 CPed::SetModelIndex(uint32 mi)
 {
@@ -2096,19 +2523,37 @@ CPed::SetModelIndex(uint32 mi)
 	m_animGroup = (AssocGroupId) modelInfo->m_animGroup;
 	CAnimManager::AddAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE);
 
+	// TODO(Miami): This is inlined CanUseTorsoWhenLooking
+	bool canUseMyBody = false;
+	if (m_nPedState != PED_DRIVING && m_nPedState != PED_DRAG_FROM_CAR && !bIsDucking) {
+		if (m_animGroup != ASSOCGRP_SEXYWOMAN && m_animGroup != ASSOCGRP_WOMAN)
+			canUseMyBody = true;
+	}
+	if (!canUseMyBody)
+		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
+
 	// This is a mistake by R*, velocity is CVector, whereas m_vecAnimMoveDelta is CVector2D. 
 	(*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity = (CVector*) &m_vecAnimMoveDelta;
 
 #ifdef PED_SKIN
 	if(modelInfo->GetHitColModel() == nil)
 		modelInfo->CreateHitColModelSkinned(GetClump());
+
+	if (IsClumpSkinned(GetClump())) // condition isn't there in VC
+		UpdateRpHAnim();
 #endif
 }
 
 void
 CPed::RemoveLighting(bool reset)
 {
-	CRenderer::RemoveVehiclePedLights(this, reset);
+	if (!bRenderScorched) {
+		CRenderer::RemoveVehiclePedLights(this, reset);
+		if (reset)
+			ReSetAmbientAndDirectionalColours();
+	}
+	SetAmbientColours();
+	DeActivateDirectional();
 }
 
 bool
@@ -2158,6 +2603,7 @@ CPed::CalculateNewOrientation(void)
 	SetHeading(m_fRotationCur);
 }
 
+// --MIAMI: Done
 float
 CPed::WorkOutHeadingForMovingFirstPerson(float offset)
 {
@@ -2173,14 +2619,15 @@ CPed::WorkOutHeadingForMovingFirstPerson(float offset)
 		angle = CGeneral::GetRadianAngleBetweenPoints(0.0f, 0.0f, -leftRight, upDown);
 	} else {
 		if (leftRight < 0.0f)
-			angle = 0.5f * PI;
+			angle = HALFPI;
 		else if (leftRight > 0.0f)
-			angle = -0.5f * PI;
+			angle = -HALFPI;
 	}
 
 	return CGeneral::LimitRadianAngle(offset + angle);
 }
 
+// --MIAMI: Done
 void
 CPed::CalculateNewVelocity(void)
 {
@@ -2195,9 +2642,6 @@ CPed::CalculateNewVelocity(void)
 			limitedRotDest -= 2 * PI;
 		}
 
-		if (IsPlayer() && m_nPedState == PED_ATTACK)
-			headAmount /= 4.0f;
-
 		float neededTurn = limitedRotDest - m_fRotationCur;
 		if (neededTurn <= headAmount) {
 			if (neededTurn > (-headAmount))
@@ -2221,8 +2665,12 @@ CPed::CalculateNewVelocity(void)
 	}
 
 	if ((!TheCamera.Cams[TheCamera.ActiveCam].GetWeaponFirstPersonOn() && !TheCamera.Cams[0].Using3rdPersonMouseCam())
-		|| FindPlayerPed() != this || !CanStrafeOrMouseControl())
+		|| FindPlayerPed() != this || !CanStrafeOrMouseControl()) {
+
+		if (FindPlayerPed() == this)
+			FindPlayerPed()->m_fWalkAngle = 0.0f;
 		return;
+	}
 
 	float walkAngle = WorkOutHeadingForMovingFirstPerson(m_fRotationCur);
 	float pedSpeed = m_moved.Magnitude();
@@ -2242,16 +2690,13 @@ CPed::CalculateNewVelocity(void)
 
 	CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
 	CAnimBlendAssociation *fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
-#ifdef VC_PED_PORTS
 	if(!fightAssoc)
 		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_TIRED);
 
-	// There is one more anim in VC.
+	if(!fightAssoc)
+		fightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
 
 	if ((!idleAssoc || idleAssoc->blendAmount < 0.5f) && !fightAssoc && !bIsDucking) {
-#else
-	if ((!idleAssoc || idleAssoc->blendAmount < 0.5f) && !fightAssoc) {
-#endif
 		LimbOrientation newUpperLegs;
 		newUpperLegs.yaw = localWalkAngle;
 
@@ -2262,35 +2707,19 @@ CPed::CalculateNewVelocity(void)
 		}
 
 		if (newUpperLegs.yaw > -DEGTORAD(50.0f) && newUpperLegs.yaw < DEGTORAD(50.0f)) {
-#ifdef PED_SKIN
-			if(IsClumpSkinned(GetClump())){
-/*
-				// this looks shit
-				newUpperLegs.pitch = 0.0f;
-				RwV3d axis = { -1.0f, 0.0f, 0.0f };
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &axis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPRECONCAT);
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &axis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPRECONCAT);
-*/
-				newUpperLegs.pitch = 0.1f;
-				RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
-				RwV3d Zaxis = { 0.0f, 0.0f, 1.0f };
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
-				RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
-
-				bDontAcceptIKLookAts = true;
-			}else
-#endif
-			{
-				newUpperLegs.pitch = 0.0f;
-				m_pedIK.RotateTorso(m_pFrames[PED_UPPERLEGL], &newUpperLegs, false);
-				m_pedIK.RotateTorso(m_pFrames[PED_UPPERLEGR], &newUpperLegs, false);
-			}
+			newUpperLegs.pitch = 0.1f;
+			RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
+			RwV3d Zaxis = { 0.0f, 0.0f, 1.0f };
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGL]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Zaxis, RADTODEG(newUpperLegs.pitch), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_UPPERLEGR]->hanimFrame->q, &Xaxis, RADTODEG(newUpperLegs.yaw), rwCOMBINEPOSTCONCAT);
+			bDontAcceptIKLookAts = true;
 		}
 	}
 }
 
+// --MIAMI: Done, but what is TODO_CHAR??
 bool
 CPed::CanBeDeleted(void)
 {
@@ -2302,11 +2731,14 @@ CPed::CanBeDeleted(void)
 			return true;
 		case MISSION_CHAR:
 			return false;
+		case TODO_CHAR:
+			return false;
 		default:
 			return true;
 	}
 }
 
+// --MIAMI: Done
 bool
 CPed::CanPedDriveOff(void)
 {
@@ -2323,7 +2755,7 @@ CPed::CanPedDriveOff(void)
 	return true;
 }
 
-#ifdef VC_PED_PORTS
+// --MIAMI: Done
 bool
 CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal = nil)
 {
@@ -2355,20 +2787,6 @@ CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal = nil)
 	CVector forwardPos = pos + forwardOffset;
 	return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false);
 }
-#else
-bool
-CPed::CanPedJumpThis(CEntity *unused)
-{
-	CVector2D forward(-Sin(m_fRotationCur), Cos(m_fRotationCur));
-	CVector pos = GetPosition();
-	CVector forwardPos(
-		forward.x + pos.x,
-		forward.y + pos.y,
-		pos.z);
-
-	return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false);
-}
-#endif
 
 bool
 CPed::CanPedReturnToState(void)
@@ -2377,6 +2795,7 @@ CPed::CanPedReturnToState(void)
 		m_nPedState != PED_FIGHT && m_nPedState != PED_STEP_AWAY && m_nPedState != PED_SNIPER_MODE && m_nPedState != PED_LOOK_ENTITY;
 }
 
+// --MIAMI: Done
 bool
 CPed::CanSeeEntity(CEntity *entity, float threshold = CAN_SEE_ENTITY_ANGLE_THRESHOLD)
 {
@@ -2673,18 +3092,17 @@ CPed::SetObjective(eObjective newObj, void *entity)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetIdle(void)
 {
 	if (m_nPedState != PED_IDLE && m_nPedState != PED_MUG && m_nPedState != PED_FLEE_ENTITY) {
-#ifdef VC_PED_PORTS
 		if (m_nPedState == PED_AIM_GUN)
 			ClearPointGunAt();
 
-		m_nLastPedState = PED_NONE;
-#endif
-		m_nPedState = PED_IDLE;
+		SetPedState(PED_IDLE);
 		SetMoveState(PEDMOVE_STILL);
+		m_nLastPedState = PED_NONE;
 	}
 	if (m_nWaitState == WAITSTATE_FALSE) {
 		m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(2000, 4000);
@@ -2992,6 +3410,7 @@ CPed::TurnBody(void)
 	return turnDone;
 }
 
+// --MIAMI: Done
 void
 CPed::Chat(void)
 {
@@ -3026,7 +3445,7 @@ CPed::Chat(void)
 		} else
 			Say(SOUND_PED_CHAT);
 
-	} else if (!RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FLAG_XPRESS)) {
+	} else if (!RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_IDLE)) {
 
 		if (CGeneral::GetRandomNumber() < 20) {
 			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
@@ -3150,6 +3569,7 @@ CPed::FacePhone(void)
 #endif
 }
 
+// --MIAMI: Done
 CPed *
 CPed::CheckForDeadPeds(void)
 {
@@ -3165,6 +3585,7 @@ CPed::CheckForDeadPeds(void)
 	return nil;
 }
 
+// --MIAMI: Done
 bool
 CPed::CheckForExplosions(CVector2D &area)
 {
@@ -3209,6 +3630,7 @@ CPed::CheckForExplosions(CVector2D &area)
 	return false;
 }
 
+// --MIAMI: Done
 CPed *
 CPed::CheckForGunShots(void)
 {
@@ -3224,6 +3646,7 @@ CPed::CheckForGunShots(void)
 	return nil;
 }
 
+// --MIAMI: Done
 PointBlankNecessity
 CPed::CheckForPointBlankPeds(CPed *pedToVerify)
 {
@@ -3267,6 +3690,7 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify)
 	return NO_POINT_BLANK_PED;
 }
 
+// --MIAMI: Done
 bool
 CPed::CheckIfInTheAir(void)
 {
@@ -3288,13 +3712,30 @@ CPed::CheckIfInTheAir(void)
 	return !foundGround;
 }
 
+// --MIAMI: Done
+void
+CPed::CheckThreatValidity(void)
+{
+	if (m_threatEntity && !IsEntityPointerValid(m_threatEntity)) {
+		m_threatFlags = 0;
+		m_threatEntity = 0;
+	}
+	if (m_pEventEntity && !IsEntityPointerValid(m_pEventEntity)) {
+		m_threatFlags = 0;
+		m_pEventEntity = 0;
+	}
+	if (!m_threatEntity && !m_pEventEntity)
+		m_threatFlags = 0;
+}
+
+// --MIAMI: Done
 void
 CPed::ClearAll(void)
 {
 	if (!IsPedInControl() && m_nPedState != PED_DEAD)
 		return;
 
-	m_nPedState = PED_NONE;
+	SetPedState(PED_NONE);
 	m_nMoveState = PEDMOVE_NONE;
 	m_pSeekTarget = nil;
 	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
@@ -3302,16 +3743,13 @@ CPed::ClearAll(void)
 	m_fleeFromPosY = 0.0f;
 	m_fleeFrom = nil;
 	m_fleeTimer = 0;
+	pThreatEx = nil;
 	bUsesCollision = true;
-#ifdef VC_PED_PORTS
 	ClearPointGunAt();
-#else
-	ClearAimFlag();
-	ClearLookFlag();
-#endif
 	bIsPointingGunAt = false;
 	bRenderPedInCar = true;
 	bKnockedUpIntoAir = false;
+	b158_4 = false;
 	m_pCollidingEntity = nil;
 }
 
@@ -3340,29 +3778,40 @@ CPed::ClearAttack(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::ClearAttackByRemovingAnim(void)
 {
-	if (m_nPedState != PED_ATTACK || bIsDucking)
+	if (m_nPedState != PED_ATTACK)
 		return;
 
 	CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weapon->m_AnimToPlay);
-	if (!weaponAssoc) {
-		weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weapon->m_Anim2ToPlay);
-
-		if (!weaponAssoc && weapon->m_bThrow)
-			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_THROWU);
+	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetPrimaryFireAnim(weapon));
 
-		if (!weaponAssoc) {
-			ClearAttack();
-			return;
-		}
+	if (!weaponAssoc) {
+		if (!!weapon->m_bCrouchFire)
+			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
+	}
+	if (!weaponAssoc) {
+		if(!!weapon->m_bFinish3rd)
+			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_SPECIAL);
+	}
+	if (!weaponAssoc) {
+		if(!!weapon->m_bUse2nd)
+			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHFIRE);
+	}
+	if (!weaponAssoc) {
+		if(!!weapon->m_bCop3rd)
+			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_SPECIAL);
+	}
+	if (weaponAssoc) {
+		weaponAssoc->blendDelta = -8.0f;
+		weaponAssoc->flags &= ~ASSOC_RUNNING;
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		weaponAssoc->SetDeleteCallback(FinishedAttackCB, this);
+	} else {
+		ClearAttack();
 	}
-	weaponAssoc->blendDelta = -8.0f;
-	weaponAssoc->flags &= ~ASSOC_RUNNING;
-	weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	weaponAssoc->SetDeleteCallback(FinishedAttackCB, this);
 }
 
 void
@@ -3376,6 +3825,7 @@ CPed::StopNonPartialAnims(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetStoredState(void)
 {
@@ -3387,10 +3837,7 @@ CPed::SetStoredState(void)
 		if (m_nMoveState == PEDMOVE_NONE || m_nMoveState == PEDMOVE_STILL)
 			m_nMoveState = PEDMOVE_WALK;
 	}
-#ifdef VC_PED_PORTS
-	if (m_nPedState != PED_IDLE)
-#endif
-	{
+	if (m_nPedState != PED_IDLE) {
 		m_nLastPedState = m_nPedState;
 		if (m_nMoveState >= m_nPrevMoveState)
 			m_nPrevMoveState = m_nMoveState;
@@ -3400,6 +3847,8 @@ CPed::SetStoredState(void)
 void
 CPed::SetDie(AnimationId animId, float delta, float speed)
 {
+	if (m_attractor)
+		GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
 	CPlayerPed *player = FindPlayerPed();
 	if (player == this) {
 		if (!player->m_bCanBeDamaged)
@@ -3427,7 +3876,7 @@ CPed::SetDie(AnimationId animId, float delta, float speed)
 	}
 
 	m_nPedState = PED_DIE;
-	if (animId == NUM_ANIMS) {
+	if (animId == NUM_STD_ANIMS) {
 		bIsPedDieAnimPlaying = false;
 	} else {
 		CAnimBlendAssociation *dieAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, delta);
@@ -3450,6 +3899,7 @@ CPed::SetDie(AnimationId animId, float delta, float speed)
 	m_bloodyFootprintCountOrDeathTime = CTimer::GetTimeInMilliseconds();
 }
 
+// --MIAMI: Done except commented things
 bool
 CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
 {
@@ -3461,17 +3911,28 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 	bool willLinger = false;
 	int random;
 
+	// TODO(Miami): PlayerInfo thingies here
+
 	if (player == this) {
 		if (!player->m_bCanBeDamaged)
 			return false;
 
+		if (damagedBy && damagedBy->IsPed() && ((CPed*)damagedBy)->m_nPedType == PEDTYPE_GANG7)
+			return false;
+
+		if ((method == WEAPONTYPE_FLAMETHROWER || method == WEAPONTYPE_MOLOTOV) && CWorld::Players[CWorld::PlayerInFocus].m_bFireproof)
+			return false;
+
 		player->AnnoyPlayerPed(false);
 	}
 
 	if (DyingOrDead())
 		return false;
 
-	if (!bUsesCollision && method != WEAPONTYPE_DROWNING)
+	if (method == WEAPONTYPE_DROWNING && !bDrownsInWater)
+		return false;
+
+	if (!bUsesCollision && (!bInVehicle || m_nPedState != PED_DRIVING) && method != WEAPONTYPE_DROWNING)
 		return false;
 
 	if (bOnlyDamagedByPlayer && damagedBy != player && damagedBy != FindPlayerVehicle() &&
@@ -3484,8 +3945,12 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 	else
 		healthImpact = damage * m_pedStats->m_defendWeakness;
 
+	if (!IsPlayer() &&
+		(method == WEAPONTYPE_SCREWDRIVER || method == WEAPONTYPE_KNIFE || (method >= WEAPONTYPE_CLEAVER && method <= WEAPONTYPE_CHAINSAW)))
+		m_bleedCounter = 200;
+
 	bool detectDieAnim = true;
-	if (m_nPedState == PED_FALL || m_nPedState == PED_GETUP) {
+	if (m_nPedState == PED_GETUP) {
 		if (!IsPedHeadAbovePos(-0.3f)) {
 			if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
 				dieAnim = ANIM_FLOOR_HIT_F;
@@ -3494,20 +3959,36 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 			dieDelta *= 2.0f;
 			dieSpeed = 0.5f;
 			detectDieAnim = false;
-		} else if (m_nPedState == PED_FALL) {
-			dieAnim = NUM_ANIMS;
-			detectDieAnim = false;
 		}
+	} else if (m_nPedState == PED_FALL) {
+		CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+		if (!fallAssoc || fallAssoc->IsRunning()) {
+			if (fallAssoc && fallAssoc->blendDelta >= 0.0f)
+				dieAnim = NUM_STD_ANIMS;
+			else
+				dieAnim = ANIM_KO_SHOT_FRONT1;
+		} else {
+			if (fallAssoc->flags & ASSOC_FRONTAL)
+				dieAnim = ANIM_FLOOR_HIT_F;
+			else
+				dieAnim = ANIM_FLOOR_HIT;
+
+			dieDelta *= 2.0f;
+			dieSpeed = 0.5f;
+		}
+		detectDieAnim = false;
 	}
+
 	if (detectDieAnim) {
 		switch (method) {
 			case WEAPONTYPE_UNARMED:
+			case WEAPONTYPE_BRASSKNUCKLE:
 				if (bMeleeProof)
 					return false;
 
 				if (m_nPedState == PED_FALL) {
 					if (IsPedHeadAbovePos(-0.3f)) {
-						dieAnim = NUM_ANIMS;
+						dieAnim = NUM_STD_ANIMS;
 					} else {
 						if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
 							dieAnim = ANIM_FLOOR_HIT_F;
@@ -3535,19 +4016,28 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 					}
 				}
 				break;
+			case WEAPONTYPE_SCREWDRIVER:
+			case WEAPONTYPE_GOLFCLUB:
+			case WEAPONTYPE_NIGHTSTICK:
+			case WEAPONTYPE_KNIFE:
 			case WEAPONTYPE_BASEBALLBAT:
+			case WEAPONTYPE_HAMMER:
+			case WEAPONTYPE_CLEAVER:
+			case WEAPONTYPE_MACHETE:
+			case WEAPONTYPE_KATANA:
+			case WEAPONTYPE_CHAINSAW:
 				if (bMeleeProof)
 					return false;
-#ifdef VC_PED_PORTS
-				if (/*method != WEAPONTYPE_KATANA || */
+
+				if (method != WEAPONTYPE_KATANA ||
 					damagedBy != FindPlayerPed()
 					|| FindPlayerPed()->m_nPedState != PED_FIGHT
-					/*|| FindPlayerPed()->m_lastFightMove != 28 && FindPlayerPed()->m_lastFightMove != 29 */
+					|| FindPlayerPed()->m_lastFightMove != FIGHTMOVE_MELEE1 && FindPlayerPed()->m_lastFightMove != FIGHTMOVE_MELEE2
 					|| CGeneral::GetRandomNumber() & 3) {
 
 					if (m_nPedState == PED_FALL) {
 						if (IsPedHeadAbovePos(-0.3f)) {
-							dieAnim = NUM_ANIMS;
+							dieAnim = NUM_STD_ANIMS;
 						} else {
 							if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
 								dieAnim = ANIM_FLOOR_HIT_F;
@@ -3556,8 +4046,8 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 							dieDelta = dieDelta * 2.0f;
 							dieSpeed = 0.5f;
 						}
-					} else if (damagedBy != FindPlayerPed()) { // || FindPlayerPed()->m_lastFightMove != 29)
-						//if (damagedBy != FindPlayerPed() || FindPlayerPed()->m_lastFightMove != 30) {
+					} else if (damagedBy != FindPlayerPed() || FindPlayerPed()->m_lastFightMove != FIGHTMOVE_MELEE2) {
+						if (damagedBy != FindPlayerPed() || FindPlayerPed()->m_lastFightMove != FIGHTMOVE_MELEE3) {
 							switch (direction) {
 								case 0:
 									dieAnim = ANIM_KO_SKID_FRONT;
@@ -3574,79 +4064,49 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 								default:
 									break;
 							}
-						//} else {
-						//	dieAnim = ANIM_KO_SHOT_STOM;
-						//}
+						} else {
+							dieAnim = ANIM_KO_SHOT_STOM;
+						}
 					} else {
 						dieAnim = ANIM_KO_SHOT_FACE;
 					}
 				} else {
 					dieAnim = ANIM_KO_SHOT_FACE;
-					// SpawnFlyingComponent in VC
 					RemoveBodyPart(PED_HEAD, direction);
 					headShot = true;
 					willLinger = true;
 				}
-#else
-				if (m_nPedState == PED_FALL) {
-					if (IsPedHeadAbovePos(-0.3f)) {
-						dieAnim = NUM_ANIMS;
-					} else {
-					    if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
-							dieAnim = ANIM_FLOOR_HIT_F;
-						else
-							dieAnim = ANIM_FLOOR_HIT;
-						dieDelta = dieDelta * 2.0f;
-						dieSpeed = 0.5f;
-					}
-				} else {
-					switch (direction) {
-						case 0:
-							dieAnim = ANIM_KO_SKID_FRONT;
-							break;
-						case 1:
-							dieAnim = ANIM_KO_SPIN_R;
-							break;
-						case 2:
-							dieAnim = ANIM_KO_SKID_BACK;
-							break;
-						case 3:
-							dieAnim = ANIM_KO_SPIN_L;
-							break;
-						default:
-							break;
-					}
-				}
-#endif
 				break;
 			case WEAPONTYPE_COLT45:
-			case WEAPONTYPE_UZI:
 			case WEAPONTYPE_SHOTGUN:
-			case WEAPONTYPE_AK47:
-			case WEAPONTYPE_M16:
+			case WEAPONTYPE_STUBBY_SHOTGUN:
+			case WEAPONTYPE_SPAS12_SHOTGUN:
+			case WEAPONTYPE_TEC9:
+			case WEAPONTYPE_UZI:
+			case WEAPONTYPE_SILENCED_INGRAM:
+			case WEAPONTYPE_MP5:
+			case WEAPONTYPE_M4:
+			case WEAPONTYPE_RUGER:
 			case WEAPONTYPE_SNIPERRIFLE:
+			case WEAPONTYPE_LASERSCOPE:
+			case WEAPONTYPE_M60:
+			case WEAPONTYPE_MINIGUN:
+			case WEAPONTYPE_UZI_DRIVEBY:
+
 				if (bBulletProof)
 					return false;
 
 				bool dontRemoveLimb;
 				if (IsPlayer() || bNoCriticalHits)
 					dontRemoveLimb = true;
-				else {
-					switch (method) {
-						case WEAPONTYPE_SNIPERRIFLE:
-							dontRemoveLimb = false;
-							break;
-						case WEAPONTYPE_M16:
-							dontRemoveLimb = false;
-							break;
-						case WEAPONTYPE_SHOTGUN:
-							dontRemoveLimb = CGeneral::GetRandomNumber() & 7;
-							break;
-						default:
-							dontRemoveLimb = CGeneral::GetRandomNumber() & 15;
-							break;
-					}
-				}
+				else if (method != WEAPONTYPE_M4 && method != WEAPONTYPE_RUGER && method != WEAPONTYPE_SNIPERRIFLE &&
+						method != WEAPONTYPE_LASERSCOPE) {
+					if (method == WEAPONTYPE_SHOTGUN)
+						dontRemoveLimb = CGeneral::GetRandomNumber() & 7;
+					else
+						dontRemoveLimb = CGeneral::GetRandomNumber() & 15;
+				} else
+					dontRemoveLimb = false;
 
 				if (dontRemoveLimb) {
 					if (method == WEAPONTYPE_SHOTGUN) {
@@ -3711,8 +4171,8 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 					}
 				}
 				break;
-			case WEAPONTYPE_ROCKETLAUNCHER:
 			case WEAPONTYPE_GRENADE:
+			case WEAPONTYPE_ROCKETLAUNCHER:
 			case WEAPONTYPE_EXPLOSION:
 				if (bExplosionProof)
 					return false;
@@ -3809,7 +4269,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 					default:
 						break;
 				}
-				if (damagedBy) {
+				if (damagedBy && pedPiece != PEDPIECE_TORSO) {
 					CVehicle *vehicle = (CVehicle*)damagedBy;
 					if (method == WEAPONTYPE_RAMMEDBYCAR) {
 						float vehSpeed = vehicle->m_vecMoveSpeed.Magnitude();
@@ -3868,6 +4328,16 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 			CWorld::Players[CWorld::PlayerInFocus].m_nTimeLastHealthLoss = CTimer::GetTimeInMilliseconds();
 
 		m_lastWepDam = method;
+		m_lastDamEntity = damagedBy;
+	}
+
+	if (method == WEAPONTYPE_FALL) {
+		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS)) {
+			if (m_fHealth >= 1.0 && m_fHealth - healthImpact < 5.0f) {
+				m_fHealth = Min(m_fHealth, 5.0f);
+				return false;
+			}
+		}
 	}
 
 	if (m_fHealth - healthImpact >= 1.0f && !willLinger) {
@@ -3877,32 +4347,41 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 
 	if (bInVehicle) {
 		if (method != WEAPONTYPE_DROWNING) {
-#ifdef VC_PED_PORTS
 			if (m_pMyVehicle) {
-				if (m_pMyVehicle->IsCar() && m_pMyVehicle->pDriver == this) {
-					if (m_pMyVehicle->GetStatus() == STATUS_SIMPLE) {
-						m_pMyVehicle->SetStatus(STATUS_PHYSICS);
-						CCarCtrl::SwitchVehicleToRealPhysics(m_pMyVehicle);
-					}
-					m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
-					m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
-					m_pMyVehicle->AutoPilot.m_nTempAction = TEMPACT_HANDBRAKESTRAIGHT;
-					m_pMyVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 2000;
-				}
-				if (m_pMyVehicle->CanPedExitCar()) {
-					SetObjective(OBJECTIVE_LEAVE_CAR_AND_DIE, m_pMyVehicle);
-				} else {
+				bool bDone = false;
+				if (m_pMyVehicle->IsBike()) {
 					m_fHealth = 0.0f;
-					if (m_pMyVehicle && m_pMyVehicle->pDriver == this) {
-						SetRadioStation();
-						m_pMyVehicle->SetStatus(STATUS_ABANDONED);
+					((CBike*)m_pMyVehicle)->KnockOffRider(method, direction, this, false);
+					bDone = true;
+				} else {
+					if (m_pMyVehicle->GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR) {
+						if (m_pMyVehicle->pDriver == this) {
+							if (m_pMyVehicle->GetStatus() == STATUS_SIMPLE) {
+								m_pMyVehicle->SetStatus(STATUS_PHYSICS);
+								CCarCtrl::SwitchVehicleToRealPhysics(m_pMyVehicle);
+							}
+							m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
+							m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
+							m_pMyVehicle->AutoPilot.m_nTempAction = TEMPACT_HANDBRAKESTRAIGHT;
+							m_pMyVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + 2000;
+						}
 					}
-					SetDie(dieAnim, dieDelta, dieSpeed);
-					/*
-					if (damagedBy == FindPlayerPed() && damagedBy != this) {
-						// PlayerInfo stuff
+					// TODO(MIAMI): argument
+					if (m_pMyVehicle->CanPedExitCar(false)) {
+						SetObjective(OBJECTIVE_LEAVE_CAR_AND_DIE, m_pMyVehicle);
+					} else {
+						m_fHealth = 0.0f;
+						if (m_pMyVehicle && m_pMyVehicle->pDriver == this) {
+							SetRadioStation();
+							m_pMyVehicle->SetStatus(STATUS_ABANDONED);
+						}
+						SetDie(dieAnim, dieDelta, dieSpeed);
+						/*
+						if (damagedBy == FindPlayerPed() && damagedBy != this) {
+							// TODO(Miami): PlayerInfo stuff
+						}
+						*/
 					}
-					*/
 				}
 				for (int i = 0; i < ARRAY_SIZE(m_pMyVehicle->pPassengers); i++) {
 					CPed* passenger = m_pMyVehicle->pPassengers[i];
@@ -3920,8 +4399,9 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 				} else {
 					CDarkel::RegisterKillNotByPlayer(this, method);
 				}
+				if (bDone)
+					return true;
 			}
-#endif
 			m_fHealth = 1.0f;
 			return false;
 		}
@@ -3929,7 +4409,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 		if (player == this)
 			m_pMyVehicle->SetStatus(STATUS_PLAYER_DISABLED);
 
-		SetDie(NUM_ANIMS, 4.0f, 0.0f);
+		SetDie(NUM_STD_ANIMS, 4.0f, 0.0f);
 		return true;
 	} else {
 		m_fHealth = 0.0f;
@@ -3937,7 +4417,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 
 		if (damagedBy == player || damagedBy && damagedBy == FindPlayerVehicle()) {
 
-			// There are PlayerInfo stuff here in VC
+			// TODO(Miami): PlayerInfo stuff
 			CDarkel::RegisterKillByPlayer(this, method, headShot);
 			m_threatEntity = player;
 		} else {
@@ -3945,6 +4425,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 		}
 		if (method == WEAPONTYPE_DROWNING)
 			bIsInTheAir = false;
+		// TODO(Miami): timesDrowned
 
 		return true;
 	}
@@ -3982,7 +4463,7 @@ CPed::SetGetUp(void)
 		}
 		if (m_nPedState != PED_GETUP) {
 			SetStoredState();
-			m_nPedState = PED_GETUP;
+			SetPedState(PED_GETUP);
 		}
 
 		CVehicle *collidingVeh = (CVehicle*)m_pCollidingEntity;
@@ -3990,7 +4471,7 @@ CPed::SetGetUp(void)
 		if (veh && veh->m_vehType != VEHICLE_TYPE_BIKE ||
 			collidingVeh && collidingVeh->IsVehicle() && collidingVeh->m_vehType != VEHICLE_TYPE_BIKE
 			&& ((uint8)(CTimer::GetFrameCounter() + m_randomSeed + 5) % 8 ||
-		         CCollision::ProcessColModels(GetMatrix(), *GetColModel(), collidingVeh->GetMatrix(), *collidingVeh->GetColModel(),
+				 CCollision::ProcessColModels(GetMatrix(), *GetColModel(), collidingVeh->GetMatrix(), *collidingVeh->GetColModel(),
 					aTempPedColPts, nil, nil) > 0)) {
 
 			bGetUpAnimStarted = false;
@@ -4025,7 +4506,7 @@ CPed::SetGetUp(void)
 		animAssoc->SetFinishCallback(PedGetupCB,this);
 	} else {
 		m_fHealth = 0.0f;
-		SetDie(NUM_ANIMS, 4.0f, 0.0f);
+		SetDie(NUM_STD_ANIMS, 4.0f, 0.0f);
 	}
 }
 
@@ -4124,11 +4605,15 @@ CPed::ClearSeek(void)
 	bRunningToPhone = false;
 }
 
+// --MIAMI: Done
 bool
 CPed::SetWanderPath(int8 pathStateDest)
 {
 	uint8 nextPathState;
 
+	if (IsPlayer())
+		return false;
+
 	if (IsPedInControl()) {
 		if (bKindaStayInSamePlace) {
 			SetIdle();
@@ -4157,7 +4642,7 @@ CPed::SetWanderPath(int8 pathStateDest)
 
 			// We did it, save next path state and return true
 			m_nPathDir = nextPathState;
-			m_nPedState = PED_WANDER_PATH;
+			SetPedState(PED_WANDER_PATH);
 			SetMoveState(PEDMOVE_WALK);
 			bIsRunning = false;
 			return true;
@@ -4169,25 +4654,15 @@ CPed::SetWanderPath(int8 pathStateDest)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::ClearWeapons(void)
 {
-	CWeaponInfo *currentWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	RemoveWeaponModel(currentWeapon->m_nModelId);
-
-	m_maxWeaponTypeAllowed = WEAPONTYPE_BASEBALLBAT;
-	m_currentWeapon = WEAPONTYPE_UNARMED;
-
-	currentWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	AddWeaponModel(currentWeapon->m_nModelId);
-	for(int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
-		CWeapon &weapon = GetWeapon(i);
-		weapon.m_eWeaponType = WEAPONTYPE_UNARMED;
-		weapon.m_eWeaponState = WEAPONSTATE_READY;
-		weapon.m_nAmmoInClip = 0;
-		weapon.m_nAmmoTotal = 0;
-		weapon.m_nTimer = 0;
+	RemoveWeaponModel(-1);
+	for (int i = 0; i < ARRAY_SIZE(m_weapons); i++) {
+		GetWeapon(i).Shutdown();
 	}
+	SetCurrentWeapon(WEAPONTYPE_UNARMED);
 }
 
 void
@@ -4216,6 +4691,7 @@ CPed::RestoreHeadingRateCB(CAnimBlendAssociation *assoc, void *arg)
 	((CPed*)arg)->m_headingRate = ((CPed*)arg)->m_pedStats->m_headingChangeRate;
 }
 
+// --MIAMI: Done
 void
 CPed::RestorePreviousState(void)
 {
@@ -4226,7 +4702,7 @@ CPed::RestorePreviousState(void)
 		return;
 
 	if (InVehicle()) {
-		m_nPedState = PED_DRIVING;
+		SetPedState(PED_DRIVING);
 		m_nLastPedState = PED_NONE;
 	} else {
 		if (m_nLastPedState == PED_NONE) {
@@ -4243,21 +4719,23 @@ CPed::RestorePreviousState(void)
 				SetIdle();
 				break;
 			case PED_WANDER_PATH:
-				m_nPedState = PED_WANDER_PATH;
+				SetPedState(PED_WANDER_PATH);
 				bIsRunning = false;
 				if (!bFindNewNodeAfterStateRestore) {
 					if (m_pNextPathNode) {
-						CVector diff = m_pNextPathNode->GetPosition() - GetPosition();
+						CVector nextNode = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+						CVector diff = nextNode - GetPosition();
 						if (diff.MagnitudeSqr() < sq(7.0f)) {
 							SetMoveState(PEDMOVE_WALK);
 							break;
 						}
 					}
 				}
-				SetWanderPath(CGeneral::GetRandomNumber() & 7);
+				SetWanderPath(m_nPedState == PED_FOLLOW_PATH ? m_nPathDir : CGeneral::GetRandomNumber() & 7);
 				break;
 			default:
-				m_nPedState = m_nLastPedState;
+				PedState oldState = m_nLastPedState;
+				SetPedState(oldState);
 				SetMoveState((eMoveState) m_nPrevMoveState);
 				break;
 		}
@@ -4292,68 +4770,97 @@ CPed::SetAimFlag(float angle)
 		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 }
 
+// --MIAMI: Done
 void
 CPed::SetPointGunAt(CEntity *to)
 {
 	if (to) {
 		SetLookFlag(to, true);
 		SetAimFlag(to);
-#ifdef VC_PED_PORTS
 		SetLookTimer(INT32_MAX);
-#endif
 	}
 
-	if (m_nPedState == PED_AIM_GUN || bIsDucking || m_nWaitState == WAITSTATE_PLAYANIM_DUCK)
+	CWeaponInfo* curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+	if (m_nPedState == PED_AIM_GUN || (bIsDucking && !IsPlayer()) || m_nWaitState == WAITSTATE_PLAYANIM_DUCK || curWeapon->m_AnimToPlay == ASSOCGRP_STD)
 		return;
 
 	if (m_nPedState != PED_ATTACK)
 		SetStoredState();
 
-	m_nPedState = PED_AIM_GUN;
+	SetPedState(PED_AIM_GUN);
 	bIsPointingGunAt = true;
-	CWeaponInfo *curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
 	SetMoveState(PEDMOVE_NONE);
 
 	CAnimBlendAssociation *aimAssoc;
 
-	if (bCrouchWhenShooting)
-		aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), curWeapon->m_Anim2ToPlay);
-	else
-		aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), curWeapon->m_AnimToPlay);
+	if (bCrouchWhenShooting && bIsDucking) {
+		if (!!curWeapon->m_bCrouchFire) {
+			aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(curWeapon));
+		}
+	} else {
+		aimAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
+	}
 
 	if (!aimAssoc || aimAssoc->blendDelta < 0.0f) {
-		if (bCrouchWhenShooting)
-			aimAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, curWeapon->m_Anim2ToPlay, 4.0f);
-		else
-			aimAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, curWeapon->m_AnimToPlay);
+		if (bCrouchWhenShooting && bIsDucking) {
+			if (!!curWeapon->m_bCrouchFire) {
+				aimAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon), 4.0f);
+			}
+		} else {
+			aimAssoc = CAnimManager::AddAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_WEAPON_FIRE);
+		}
 
 		aimAssoc->blendAmount = 0.0f;
 		aimAssoc->blendDelta = 8.0f;
 	}
-	if (to)
+	if (to && !IsPlayer())
 		Say(SOUND_PED_ATTACK);
 }
 
+// --MIAMI: Done
 void
 CPed::SetAmmo(eWeaponType weaponType, uint32 ammo)
 {
-	if (HasWeapon(weaponType)) {
-		GetWeapon(weaponType).m_nAmmoTotal = ammo;
+	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
+	if (slot == -1)
+		return;
+
+	GetWeapon(slot).m_nAmmoTotal = ammo;
+	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
+
+		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
 	} else {
-		GetWeapon(weaponType).Initialise(weaponType, ammo);
-		m_maxWeaponTypeAllowed++;
+		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
 	}
+	int32 newClip = GetWeapon(slot).m_nAmmoTotal;
+	if (newClip >= GetWeapon(slot).m_nAmmoInClip)
+		newClip = GetWeapon(slot).m_nAmmoInClip;
+	GetWeapon(slot).m_nAmmoInClip = newClip;
+
+	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 }
 
+// --MIAMI: Done
 void
 CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo)
 {
-	if (HasWeapon(weaponType)) {
-		GetWeapon(weaponType).m_nAmmoTotal += ammo;
+	int slot = CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
+	if (slot == -1)
+		return;
+
+	GetWeapon(slot).m_nAmmoTotal += ammo;
+	if (weaponType < WEAPONTYPE_TOTALWEAPONS && weaponType > WEAPONTYPE_UNARMED && CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType] >= 0) {
+
+		// Looks like abandoned idea. This block never runs, ms_aMaxAmmoForWeapon is always -1.
+		GetWeapon(slot).m_nAmmoTotal = Min(CWeaponInfo::ms_aMaxAmmoForWeapon[weaponType], GetWeapon(slot).m_nAmmoTotal);
 	} else {
-		GetWeapon(weaponType).Initialise(weaponType, ammo);
-		m_maxWeaponTypeAllowed++;
+		GetWeapon(slot).m_nAmmoTotal = Min(99999, GetWeapon(slot).m_nAmmoTotal);
 	}
+
+	if (GetWeapon(slot).m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO && GetWeapon(slot).m_nAmmoTotal > 0)
+		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 }
 
 void
@@ -4414,7 +4921,7 @@ CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
 			else if (animType < 2)
 				stepAnim = ANIM_EV_STEP;
 			else
-				stepAnim = NUM_ANIMS;
+				stepAnim = NUM_STD_ANIMS;
 		}
 		if (!RpAnimBlendClumpGetAssociation(GetClump(), stepAnim)) {
 			CAnimBlendAssociation *stepAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, stepAnim, 8.0f);
@@ -4544,28 +5051,22 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetAttack(CEntity *victim)
 {
 	CPed *victimPed = nil;
+	CWeaponInfo *curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
+	CAnimBlendAssociation *animAssoc;
+
 	if (victim && victim->IsPed())
 		victimPed = (CPed*)victim;
 
-	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_ARMED);
-	if (animAssoc) {
-		animAssoc->blendDelta = -1000.0f;
-		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-	}
-
-	if (m_attackTimer > CTimer::GetTimeInMilliseconds() || m_nWaitState == WAITSTATE_SURPRISE)
-		return;
-
-	if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HGUN_RELOAD)) {
-		bIsAttacking = false;
+	if (m_attackTimer > CTimer::GetTimeInMilliseconds() || m_nWaitState == WAITSTATE_SURPRISE || (bIsDucking && !bCrouchWhenShooting))
 		return;
-	}
 
-	if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_AK_RELOAD)) {
+	if (curWeapon->m_bReload &&
+		(RpAnimBlendClumpGetAssociation(GetClump(), GetReloadAnim(curWeapon)) || RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(curWeapon)))) {
 		if (!IsPlayer() || m_nPedState != PED_ATTACK || ((CPlayerPed*)this)->m_bHaveTargetSelected)
 			bIsAttacking = false;
 		else
@@ -4574,20 +5075,16 @@ CPed::SetAttack(CEntity *victim)
 		return;
 	}
 
-	CWeaponInfo *curWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	if (curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT && !IsPlayer()) {
-		if (GetWeapon()->HitsGround(this, nil, victim))
-			return;
-	}
-
-	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED) {
+	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_UNARMED || curWeapon->m_bFightMode || GetWeapon()->m_eWeaponType == WEAPONTYPE_BRASSKNUCKLE) {
 		if (IsPlayer() ||
-			(m_nPedState != PED_FIGHT && m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL && !(m_pedStats->m_flags & STAT_SHOPPING_BAGS))) {
+			(m_nPedState != PED_FIGHT && m_nMoveState != PEDMOVE_NONE && m_nMoveState != PEDMOVE_STILL
+				&& !(m_pedStats->m_flags & STAT_SHOPPING_BAGS) && curWeapon->m_bPartialAttack)) {
 
 			if (m_nPedState != PED_ATTACK) {
-				m_nPedState = PED_ATTACK;
+				SetPedState(PED_ATTACK);
 				bIsAttacking = false;
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, curWeapon->m_AnimToPlay, 8.0f);
+
+				CAnimBlendAssociation *animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK_START, 8.0f);
 				animAssoc->SetRun();
 				if (animAssoc->currentTime == animAssoc->hierarchy->totalLength)
 					animAssoc->SetCurrentTime(0.0f);
@@ -4595,33 +5092,63 @@ CPed::SetAttack(CEntity *victim)
 				animAssoc->SetFinishCallback(FinishedAttackCB, this);
 			}
 		} else {
-			StartFightAttack(CGeneral::GetRandomNumber() % 256);
+			StartFightAttack(CGeneral::GetRandomNumber());
+		}
+		return;
+	}
+
+	if (curWeapon->m_bPartialAttack &&
+		(IsPlayer() && ((CPlayerPed*)this)->m_fMoveSpeed >= 1.0f ||
+		m_nMoveState == PEDMOVE_WALK || m_nMoveState == PEDMOVE_RUN)) {
+
+		if (m_nPedState != PED_ATTACK) {
+			SetPedState(PED_ATTACK);
+			bIsAttacking = false;
+			CAnimBlendAssociation* animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, ANIM_MELEE_ATTACK_START, 8.0f);
+			animAssoc->SetRun();
+			if (animAssoc->currentTime == animAssoc->hierarchy->totalLength)
+				animAssoc->SetCurrentTime(0.0f);
+
+			animAssoc->SetFinishCallback(FinishedAttackCB, this);
 		}
 		return;
 	}
 
+	// TODO(Miami): Clean up old referene
 	m_pSeekTarget = victim;
 	if (m_pSeekTarget)
 		m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
 
 	if (curWeapon->m_bCanAim) {
 		CVector aimPos = GetRight() * 0.1f + GetForward() * 0.2f + GetPosition();
+		aimPos += GetUp() * 0.35f;
 		CEntity *obstacle = CWorld::TestSphereAgainstWorld(aimPos, 0.2f, nil, true, false, false, true, false, false);
-		if (obstacle)
-			return;
+		if (obstacle) {
+			if(gaTempSphereColPoints[0].surfaceB != SURFACE_TRANSPARENT_CLOTH && gaTempSphereColPoints[0].surfaceB != SURFACE_METAL_CHAIN_FENCE &&
+				gaTempSphereColPoints[0].surfaceB != SURFACE_WOOD_BENCH && gaTempSphereColPoints[0].surfaceB != SURFACE_SCAFFOLD_POLE) {
+				if (!IsPlayer()) {
+					bObstacleShowedUpDuringKillObjective = true;
+					m_shootTimer = 0;
+					SetAttackTimer(1500);
+					m_shotTime = CTimer::GetTimeInMilliseconds();
+				}
+				return;
+			}
+		}
 
 		m_pLookTarget = victim;
 		if (victim) {
 			m_pLookTarget->RegisterReference((CEntity **) &m_pLookTarget);
 			m_pSeekTarget->RegisterReference((CEntity **) &m_pSeekTarget);
 		}
+
 		if (m_pLookTarget) {
 			SetAimFlag(m_pLookTarget);
-		} else {
+		} else if (this == FindPlayerPed() && TheCamera.Cams[0].Using3rdPersonMouseCam()) {
+			SetAimFlag(m_fRotationCur);
+			((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch();
+		} else if (curWeapon->m_bCanAimWithArm) {
 			SetAimFlag(m_fRotationCur);
-
-			if (FindPlayerPed() == this && TheCamera.Cams[0].Using3rdPersonMouseCam())
-				((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch();
 		}
 	}
 	if (m_nPedState == PED_ATTACK) {
@@ -4629,7 +5156,7 @@ CPed::SetAttack(CEntity *victim)
 		return;
 	}
 
-	if (IsPlayer() || !victimPed || victimPed->IsPedInControl()) {
+	if (IsPlayer() || (!victimPed || victimPed->IsPedInControl())) {
 		if (IsPlayer())
 			CPad::GetPad(0)->ResetAverageWeapon();
 
@@ -4643,7 +5170,7 @@ CPed::SetAttack(CEntity *victim)
 			ClearAimFlag();
 
 			// This condition is pointless
-			if (pointBlankStatus == POINT_BLANK_FOR_WANTED_PED || !victimPed)
+			if (pointBlankStatus == POINT_BLANK_FOR_WANTED_PED || !victimPed && (IsPlayer() || !m_carInObjective))
 				StartFightAttack(200);
 		} else {
 			if (!curWeapon->m_bCanAim)
@@ -4652,21 +5179,42 @@ CPed::SetAttack(CEntity *victim)
 			if (m_nPedState != PED_AIM_GUN)
 				SetStoredState();
 
-			m_nPedState = PED_ATTACK;
+			SetPedState(PED_ATTACK);
 			SetMoveState(PEDMOVE_NONE);
-			if (bCrouchWhenShooting) {
-				animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_RBLOCK_CSHOOT, 4.0f);
+			if (bCrouchWhenShooting && bIsDucking && !!curWeapon->m_bCrouchFire) {
+				CAnimBlendAssociation* curMoveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(curWeapon));
+				if (curMoveAssoc) {
+					if (strcmp(CAnimManager::GetAnimAssociation(curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon))->hierarchy->name, curMoveAssoc->hierarchy->name) != 0) {
+						delete curMoveAssoc;
+					}
+				}
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, GetCrouchFireAnim(curWeapon), 8.0f);
 			} else {
 				float animDelta = 8.0f;
 				if (curWeapon->m_eWeaponFire == WEAPON_FIRE_MELEE)
 					animDelta = 1000.0f;
 
-				if (GetWeapon()->m_eWeaponType != WEAPONTYPE_BASEBALLBAT
-					|| CheckForPedsOnGroundToAttack(this, nil) < PED_ON_THE_FLOOR) {
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, curWeapon->m_AnimToPlay, animDelta);
+				AnimationId fireAnim;
+				if (curWeapon->m_bThrow)
+					fireAnim = ANIM_THROWABLE_START_THROW;
+				else if (CGame::nastyGame && (curWeapon->m_bGround2nd || curWeapon->m_bGround3rd)) {
+					PedOnGroundState pedOnGround = CheckForPedsOnGroundToAttack(this, nil);
+					if (pedOnGround > PED_IN_FRONT_OF_ATTACKER || pedOnGround == NO_PED && bIsStanding && m_pCurSurface && m_pCurSurface->IsVehicle()) {
+						fireAnim = GetFireAnimGround(curWeapon, false);
+					} else {
+						fireAnim = GetFireAnimNotDucking(curWeapon);
+					}
 				} else {
-					animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, curWeapon->m_Anim2ToPlay, animDelta);
+					fireAnim = GetFireAnimNotDucking(curWeapon);
 				}
+
+				CAnimBlendAssociation* curFireAssoc = RpAnimBlendClumpGetAssociation(GetClump(), fireAnim);
+				if (curFireAssoc) {
+					if (strcmp(CAnimManager::GetAnimAssociation(curWeapon->m_AnimToPlay, fireAnim)->hierarchy->name, curFireAssoc->hierarchy->name) != 0) {
+						delete curFireAssoc;
+					}
+				}
+				animAssoc = CAnimManager::BlendAnimation(GetClump(), curWeapon->m_AnimToPlay, fireAnim, animDelta);
 			}
 
 			animAssoc->SetRun();
@@ -4681,7 +5229,8 @@ CPed::SetAttack(CEntity *victim)
 	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT && victimPed->m_nPedState == PED_GETUP)
 		SetWaitState(WAITSTATE_SURPRISE, nil);
 
-	SetLookFlag(victim, false);
+	// TODO(Miami): New parameter
+	SetLookFlag(victim, true); //true);
 	SetLookTimer(100);
 }
 
@@ -4759,10 +5308,11 @@ CPed::StartFightAttack(uint8 buttonPressure)
 		nPlayerInComboMove = 0;
 }
 
+// --MIAMI: Done
 void
 CPed::LoadFightData(void)
 {
-	float startFireTime, endFireTime, comboFollowOnTime, strikeRadius;
+	float startFireTime, endFireTime, comboFollowOnTime, strikeRadius, extendReachMultiplier;
 	int damage, flags;
 	char line[256], moveName[32], animName[32], hitLevel;
 	int moveId = 0;
@@ -4791,12 +5341,13 @@ CPed::LoadFightData(void)
 
 		sscanf(
 			&line[lp],
-			"%s %f %f %f %f %c %s %d %d",
+			"%s %f %f %f %f %f %c %s %d %d",
 			moveName,
 			&startFireTime,
 			&endFireTime,
 			&comboFollowOnTime,
 			&strikeRadius,
+			&extendReachMultiplier,
 			&hitLevel,
 			animName,
 			&damage,
@@ -4809,6 +5360,7 @@ CPed::LoadFightData(void)
 		tFightMoves[moveId].endFireTime = endFireTime / 30.0f;
 		tFightMoves[moveId].comboFollowOnTime = comboFollowOnTime / 30.0f;
 		tFightMoves[moveId].strikeRadius = strikeRadius;
+		tFightMoves[moveId].extendReachMultiplier = extendReachMultiplier;
 		tFightMoves[moveId].damage = damage;
 		tFightMoves[moveId].flags = flags;
 
@@ -4832,11 +5384,14 @@ CPed::LoadFightData(void)
 				break;
 		}
 
-		if (strncmp(animName, "null", 4) != 0) {
-			animAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, animName);
-			tFightMoves[moveId].animId = (AnimationId)animAssoc->animId;
-		} else {
-			tFightMoves[moveId].animId = ANIM_WALK;
+		if (strncmp(animName, "default", 8) != 0) {
+			if (strncmp(animName, "null", 5) != 0) {
+				animAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, animName);
+				tFightMoves[moveId].animId = (AnimationId)animAssoc->animId;
+			}
+			else {
+				tFightMoves[moveId].animId = ANIM_WALK;
+			}
 		}
 		moveId++;
 	}
@@ -4859,7 +5414,7 @@ CPed::GetLocalDirection(const CVector2D &posOffset)
 bool
 CPed::FightStrike(CVector &touchedNodePos)
 {
-	CColModel *ourCol;
+	CColModel *hisCol;
 	CVector attackDistance;
 	ePedPieceTypes closestPedPiece = PEDPIECE_TORSO;
 	float maxDistanceToBeBeaten;
@@ -4883,41 +5438,26 @@ CPed::FightStrike(CVector &touchedNodePos)
 
 		if (nearPed->bUsesCollision || nearPed->m_nPedState == PED_DEAD) {
 			CVector nearPedCentre;
+
+			// Have to animate a skinned clump because the initial col model is useless
+			hisCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(nearPed->GetModelIndex()))->AnimatePedColModelSkinnedWorld(nearPed->GetClump());
+
 			nearPed->GetBoundCentre(nearPedCentre);
 			CVector potentialAttackDistance = nearPedCentre - touchedNodePos;
 
 			// He can beat us
 			if (sq(maxDistanceToBeBeaten) > potentialAttackDistance.MagnitudeSqr()) {
 
-#ifdef PED_SKIN
-				// Have to animate a skinned clump because the initial col model is useless
-				if(IsClumpSkinned(GetClump()))
-					ourCol = ((CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex()))->AnimatePedColModelSkinned(GetClump());
-				else
-#endif
-				if (nearPed->m_nPedState == PED_FALL
-					|| nearPed->m_nPedState == PED_DEAD || nearPed->m_nPedState == PED_DIE
-					|| !nearPed->IsPedHeadAbovePos(-0.3f)) {
-					ourCol = &CTempColModels::ms_colModelPedGroundHit;
-				} else {
-#ifdef ANIMATE_PED_COL_MODEL
-					ourCol = CPedModelInfo::AnimatePedColModel(((CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex()))->GetHitColModel(),
-					                                           RpClumpGetFrame(GetClump()));
-#else
-					ourCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->GetHitColModel();
-#endif
-				}
-
-				for (int j = 0; j < ourCol->numSpheres; j++) {
-					attackDistance = nearPed->GetPosition() + ourCol->spheres[j].center;
+				for (int j = 0; j < hisCol->numSpheres; j++) {
+					attackDistance = hisCol->spheres[j].center;
 					attackDistance -= touchedNodePos;
-					CColSphere *ourPieces = ourCol->spheres;
-					float maxDistanceToBeat = ourPieces[j].radius + tFightMoves[m_lastFightMove].strikeRadius;
+					CColSphere *hisPieces = hisCol->spheres;
+					float maxDistanceToBeat = hisPieces[j].radius + tFightMoves[m_lastFightMove].strikeRadius;
 
 					// We can beat him too
 					if (sq(maxDistanceToBeat) > attackDistance.MagnitudeSqr()) {
 						pedFound = true;
-						closestPedPiece = (ePedPieceTypes) ourPieces[j].piece;
+						closestPedPiece = (ePedPieceTypes) hisPieces[j].piece;
 						break;
 					}
 				}
@@ -4944,6 +5484,7 @@ CPed::FightStrike(CVector &touchedNodePos)
 			damageMult *= m_pedStats->m_attackStrength;
 		}
 
+		/*
 		// Change direction if we used kick.
 		if (m_lastFightMove == FIGHTMOVE_KICK) {
 			if (CGeneral::GetRandomNumber() & 1) {
@@ -4951,7 +5492,7 @@ CPed::FightStrike(CVector &touchedNodePos)
 				if (direction > 3)
 					direction -= 4;
 			}
-		}
+		} */
 		nearPed->ReactToAttack(this);
 
 		// Mostly unused. if > 5, ANIM_HIT_WALK will be run, that's it.
@@ -5022,34 +5563,57 @@ CPed::FightStrike(CVector &touchedNodePos)
 	return false;
 }
 
+// --MIAMI: Done
 void
 CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl)
 {
+	if (m_attachedTo)
+		return;
+
 	if (!IsPedInControl() && (!evenIfNotInControl || DyingOrDead()))
 		return;
 
 	ClearLookFlag();
 	ClearAimFlag();
 	SetStoredState();
-	m_nPedState = PED_FALL;
-	CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), animId);
-	
-	if (fallAssoc) {
-		fallAssoc->SetCurrentTime(0.0f);
-		fallAssoc->blendAmount = 0.0f;
-		fallAssoc->blendDelta = 8.0f;
-		fallAssoc->SetRun();
+	SetPedState(PED_FALL);
+	CAnimBlendAssociation *fallAssoc = nil;
+	if (animId == NUM_STD_ANIMS) {
+		if (IsPlayer()) {
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS);
+			if (!fallAssoc)
+				fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_RHS);
+		}
 	} else {
-		fallAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, 8.0f);
+		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), animId);
+
+		if (fallAssoc) {
+			fallAssoc->SetCurrentTime(0.0f);
+			fallAssoc->blendAmount = 0.0f;
+			fallAssoc->blendDelta = 8.0f;
+			fallAssoc->SetRun();
+		}
+		else {
+			fallAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animId, 8.0f);
+		}
+		if (animId == ANIM_BIKE_FALL_R)
+			fallAssoc->SetCurrentTime(0.4f);
 	}
 
 	if (extraTime == -1) {
 		m_getUpTimer = UINT32_MAX;
 	} else if (fallAssoc) {
 		if (IsPlayer()) {
-			m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
-				+ CTimer::GetTimeInMilliseconds()
-				+ 500.0f;
+			if (fallAssoc->animId != ANIM_CAR_ROLLOUT_LHS && fallAssoc->animId != ANIM_CAR_ROLLOUT_RHS) {
+				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
+					+ CTimer::GetTimeInMilliseconds()
+					+ 500.0f;
+			} else {
+				m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
+					+ CTimer::GetTimeInMilliseconds()
+					- 1000.0f * fallAssoc->currentTime
+					+ 100.0f;
+			}
 		} else {
 			m_getUpTimer = 1000.0f * fallAssoc->hierarchy->totalLength
 				+ CTimer::GetTimeInMilliseconds()
@@ -5125,15 +5689,19 @@ CPed::SetFlee(CVector2D const &from, int time)
 	}
 }
 
+// --MIAMI: Only some part is done
 void
 CPed::SetWaitState(eWaitState state, void *time)
 {
-	AnimationId waitAnim = NUM_ANIMS;
+	AnimationId waitAnim = NUM_STD_ANIMS;
 	CAnimBlendAssociation *animAssoc;
 
 	if (!IsPedInControl())
 		return;
 
+	if (m_nWaitState == WAITSTATE_RIOT && state == WAITSTATE_FALSE)
+		return;
+
 	if (state != m_nWaitState)
 		FinishedWaitCB(nil, this);
 
@@ -5159,6 +5727,8 @@ CPed::SetWaitState(eWaitState state, void *time)
 		case WAITSTATE_LOOK_SHOP:
 		case WAITSTATE_LOOK_ACCIDENT:
 		case WAITSTATE_FACEOFF_GANG:
+		case WAITSTATE_RIOT:
+		case WAITSTATE_STRIPPER:
 			break;
 		case WAITSTATE_DOUBLEBACK:
 			m_headingRate = 0.0f;
@@ -5205,6 +5775,7 @@ CPed::SetWaitState(eWaitState state, void *time)
 			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
 #endif
 
+			// Random char as passenger? Cop, medic etc.?
 			if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == RANDOM_CHAR && m_nPedState == PED_SEEK_CAR) {
 				ClearObjective();
 				RestorePreviousState();
@@ -5225,10 +5796,10 @@ CPed::SetWaitState(eWaitState state, void *time)
 		case WAITSTATE_PLAYANIM_COWER:
 			waitAnim = ANIM_HANDSCOWER;
 		case WAITSTATE_PLAYANIM_HANDSUP:
-			if (waitAnim == NUM_ANIMS)
+			if (waitAnim == NUM_STD_ANIMS)
 				waitAnim = ANIM_HANDSUP;
 		case WAITSTATE_PLAYANIM_HANDSCOWER:
-			if (waitAnim == NUM_ANIMS)
+			if (waitAnim == NUM_STD_ANIMS)
 				waitAnim = ANIM_HANDSCOWER;
 			m_headingRate = 0.0f;
 			if (time)
@@ -5242,10 +5813,10 @@ CPed::SetWaitState(eWaitState state, void *time)
 		case WAITSTATE_PLAYANIM_DUCK:
 			waitAnim = ANIM_DUCK_DOWN;
 		case WAITSTATE_PLAYANIM_TAXI:
-			if (waitAnim == NUM_ANIMS)
+			if (waitAnim == NUM_STD_ANIMS)
 				waitAnim = ANIM_IDLE_TAXI;
 		case WAITSTATE_PLAYANIM_CHAT:
-			if (waitAnim == NUM_ANIMS)
+			if (waitAnim == NUM_STD_ANIMS)
 				waitAnim = ANIM_IDLE_CHAT;
 			if (time)
 				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
@@ -5267,8 +5838,49 @@ CPed::SetWaitState(eWaitState state, void *time)
 			animAssoc->SetFinishCallback(RestoreHeadingRateCB, this);
 #endif
 			break;
+		case WAITSTATE_SIT_DOWN:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_DOWN, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 10000;
+			break;
+		case WAITSTATE_SIT_UP:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_UP, 4.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
+			break;
+		case WAITSTATE_SIT_IDLE:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_SEAT_IDLE, 5000.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(25000, 30000);
+			break;
+		case WAITSTATE_USE_ATM:
+			animAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_ATM, 5000.0f);
+			animAssoc->SetFinishCallback(FinishedWaitCB, this);
+			if (time)
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			else
+				m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 100000;
+			break;
+		case WAITSTATE_FAST_FALL:
+			SetFall(-1, ANIM_KO_SKID_FRONT, true);
+			break;
+		case WAITSTATE_BOMBER:
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_BOMBER, 4.0f);
+			m_nWaitTimer = CTimer::GetTimeInMilliseconds() + *(int*)time;
+			break;
+		case WAITSTATE_LANCESITTING:
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_LANCE, ANIM_SUNBATHE, 4.0f);
+			break;
+		case WAITSTATE_SUN_BATHE_PRE:
+		case WAITSTATE_SUN_BATHE_DOWN:
+		case WAITSTATE_SUN_BATHE_IDLE:
+		case WAITSTATE_GROUND_ATTACK:
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
 		default:
-			m_nWaitState = WAITSTATE_FALSE;
+			ClearWaitState();
 			RestoreHeadingRate();
 			return;
 	}
@@ -5595,6 +6207,7 @@ CPed::CollideWithPed(CPed *collideWith)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::CreateDeadPedMoney(void)
 {
@@ -5602,54 +6215,37 @@ CPed::CreateDeadPedMoney(void)
 		return;
 
 	int skin = GetModelIndex();
-	if ((skin >= MI_COP && skin <= MI_FIREMAN) || CharCreatedBy == MISSION_CHAR || bInVehicle)
+
+	if ((skin >= MI_COP && skin <= MI_FIREMAN) || (CharCreatedBy == MISSION_CHAR && !bMoneyHasBeenGivenByScript) || bInVehicle)
 		return;
 
-	int money = CGeneral::GetRandomNumber() % 60;
+	int money = m_nPedMoney;
 	if (money < 10)
 		return;
 
-	if (money == 43)
-		money = 700;
-
-	int pickupCount = money / 40 + 1;
-	int moneyPerPickup = money / pickupCount;
-
-	for(int i = 0; i < pickupCount; i++) {
-		// (CGeneral::GetRandomNumber() % 256) * PI / 128 gives a float up to something TWOPI-ish.
-		float pickupX = 1.5f * Sin((CGeneral::GetRandomNumber() % 256) * PI / 128) + GetPosition().x;
-		float pickupY = 1.5f * Cos((CGeneral::GetRandomNumber() % 256) * PI / 128) + GetPosition().y;
-		bool found = false;
-		float groundZ = CWorld::FindGroundZFor3DCoord(pickupX, pickupY, GetPosition().z, &found) + 0.5f;
-		if (found) {
-			CPickups::GenerateNewOne(CVector(pickupX, pickupY, groundZ), MI_MONEY, PICKUP_MONEY, moneyPerPickup + (CGeneral::GetRandomNumber() & 7));
-		}
-	}
+	CVector pickupPos = GetPosition();
+	CPickups::CreateSomeMoney(pickupPos, money);
+	m_nPedMoney = 0;
 }
 
+// --MIAMI: Done
 void
-CPed::CreateDeadPedWeaponPickups(void)
+CPed::CreateDeadPedPickupCoors(float *x, float *y, float *z)
 {
 	bool found = false;
-	float angleToPed;
 	CVector pickupPos;
 
-	if (bInVehicle)
-		return;
-
-	for(int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
-
-		eWeaponType weapon = GetWeapon(i).m_eWeaponType;
-		int weaponAmmo = GetWeapon(i).m_nAmmoTotal;
-		if (weapon == WEAPONTYPE_UNARMED || weapon == WEAPONTYPE_DETONATOR || weaponAmmo == 0)
-			continue;
+#define NUMBER_OF_ATTEMPTS 32
+	for (int i = 0; i < NUMBER_OF_ATTEMPTS; i++) {
 
-		angleToPed = i * 1.75f;
 		pickupPos = GetPosition();
-		pickupPos.x += 1.5f * Sin(angleToPed);
-		pickupPos.y += 1.5f * Cos(angleToPed);
+		pickupPos.x = 1.5f * Sin((CGeneral::GetRandomNumber() % 256) * PI / 128) + GetPosition().x;
+		pickupPos.y = 1.5f * Cos((CGeneral::GetRandomNumber() % 256) * PI / 128) + GetPosition().y;
 		pickupPos.z = CWorld::FindGroundZFor3DCoord(pickupPos.x, pickupPos.y, pickupPos.z, &found) + 0.5f;
 
+		if (!found)
+			continue;
+
 		CVector pedPos = GetPosition();
 		pedPos.z += 0.3f;
 
@@ -5657,25 +6253,59 @@ CPed::CreateDeadPedWeaponPickups(void)
 		float distance = pedToPickup.Magnitude();
 
 		// outer edge of pickup
-		distance = (distance + 0.3f) / distance;
+		distance = (distance + 0.4f) / distance;
 		CVector pickupPos2 = pedPos;
 		pickupPos2 += distance * pedToPickup;
 
-		// pickup must be on ground and line to its edge must be clear
-		if (!found || CWorld::GetIsLineOfSightClear(pickupPos2, pedPos, true, false, false, false, false, false, false)) {
-			// otherwise try another position (but disregard second check apparently)
-			angleToPed += 3.14f;
-			pickupPos = GetPosition();
-			pickupPos.x += 1.5f * Sin(angleToPed);
-			pickupPos.y += 1.5f * Cos(angleToPed);
-			pickupPos.z = CWorld::FindGroundZFor3DCoord(pickupPos.x, pickupPos.y, pickupPos.z, &found) + 0.5f;
+		if ((pickupPos - FindPlayerCoors()).Magnitude2D() > 2.0f || i > NUMBER_OF_ATTEMPTS / 2) {
+
+			if (i > NUMBER_OF_ATTEMPTS / 2 || !CPickups::TestForPickupsInBubble(pickupPos, 1.3f)) {
+
+				if (CWorld::GetIsLineOfSightClear(pickupPos2, pedPos,
+					true, i < NUMBER_OF_ATTEMPTS / 2, false, i < NUMBER_OF_ATTEMPTS / 2, false, false, false)) {
+
+					if (i > NUMBER_OF_ATTEMPTS / 2 || !CWorld::TestSphereAgainstWorld(pickupPos, 1.2f, nil, false, true, false, false, false, false)) {
+						*x = pickupPos.x;
+						*y = pickupPos.y;
+						*z = pickupPos.z;
+						return;
+					}
+				}
+			}
+		}
+	}
+	*x = GetPosition().x;
+	*y = GetPosition().y;
+	*z = GetPosition().z + 0.4f;
+#undef NUMBER_OF_ATTEMPTS
+}
+
+// --MIAMI: Done
+void
+CPed::CreateDeadPedWeaponPickups(void)
+{
+	CVector pickupPos;
+
+	if (bInVehicle)
+		return;
+
+	for(int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
+
+		eWeaponType weapon = GetWeapon(i).m_eWeaponType;
+		int weaponAmmo = GetWeapon(i).m_nAmmoTotal;
+		if (weapon == WEAPONTYPE_UNARMED || weapon == WEAPONTYPE_DETONATOR || (weaponAmmo == 0 && !GetWeapon(i).IsTypeMelee()))
+			continue;
+
+		int quantity = Min(weaponAmmo, AmmoForWeapon_OnStreet[weapon] / 2);
+		CreateDeadPedPickupCoors(&pickupPos.x, &pickupPos.y, &pickupPos.z);
+		if (!CPickups::TryToMerge_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, quantity, false)) {
+			CPickups::GenerateNewOne_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, Min(weaponAmmo, quantity));
 		}
-		if (found)
-			CPickups::GenerateNewOne_WeaponType(pickupPos, weapon, PICKUP_ONCE_TIMEOUT, Min(weaponAmmo, AmmoForWeapon_OnStreet[weapon]));
 	}
 	ClearWeapons();
 }
 
+// --MIAMI: Done
 void
 CPed::SetAttackTimer(uint32 time)
 {
@@ -5717,6 +6347,26 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
 	veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehEnterType);
 }
 
+// --MIAMI: Done
+void
+CPed::BuyIceCream(void)
+{
+	if (m_carInObjective) {
+		CPed *driver = m_carInObjective->pDriver;
+		if (driver && CTimer::GetTimeInMilliseconds() > m_standardTimer) {
+			SetChat(driver, 8000);
+			driver->SetChat(this, 8000);
+			return;
+		}
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+	} else {
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+	}
+}
+
+// --MIAMI: Done
 void
 CPed::SetBuyIceCream(void)
 {
@@ -5726,55 +6376,73 @@ CPed::SetBuyIceCream(void)
 	if (!m_carInObjective)
 		return;
 
-#ifdef FIX_ICECREAM
-
-	// Simulating BuyIceCream
-	CPed* driver = m_carInObjective->pDriver;
-	if (driver) {
-		m_nPedState = PED_BUY_ICECREAM;
-		bFindNewNodeAfterStateRestore = true;
-		SetObjectiveTimer(8000);
-		SetChat(driver, 8000);
-		driver->SetChat(this, 8000);
-		return;
-	}
-#endif
-
-	// Side of the Ice Cream van
-	m_fRotationDest = m_carInObjective->GetForward().Heading() - HALFPI;
-
-	if (Abs(m_fRotationDest - m_fRotationCur) < HALFPI) {
-		m_standardTimer = CTimer::GetTimeInMilliseconds() + 3000;
-		m_nPedState = PED_BUY_ICECREAM;
-	}
+	SetPedState(PED_BUY_ICECREAM);
 }
 
+// --MIAMI: Done
 void
 CPed::SetChat(CEntity *chatWith, uint32 time)
 {
 	if(m_nPedState != PED_CHAT)
 		SetStoredState();
 
-	m_nPedState = PED_CHAT;
+	SetPedState(PED_CHAT);
 	SetMoveState(PEDMOVE_STILL);
-#ifdef VC_PED_PORTS
 	m_lookTimer = 0;
-#endif
 	SetLookFlag(chatWith, true);
 	m_standardTimer = CTimer::GetTimeInMilliseconds() + time;
 	m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000;
 }
 
+// --MIAMI: Done
+void
+CPed::RemoveWeaponAnims(int unused, float animDelta)
+{	
+	CAnimBlendAssociation *weaponAssoc;
+	//CWeaponInfo::GetWeaponInfo(unused);
+
+	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
+	if (weaponAssoc) {
+		weaponAssoc->blendDelta = animDelta;
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+	}
+	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE_2ND);
+	if (weaponAssoc) {
+		weaponAssoc->blendDelta = animDelta;
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+	}
+	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE_3RD);
+	if (weaponAssoc) {
+		weaponAssoc->blendDelta = animDelta;
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+	}
+	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_RELOAD);
+	if (weaponAssoc) {
+		weaponAssoc->blendDelta = animDelta;
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+	}
+	weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
+	if (weaponAssoc) {
+		weaponAssoc->flags |= ASSOC_DELETEFADEDOUT;
+		if (weaponAssoc->flags & ASSOC_PARTIAL)
+			weaponAssoc->blendDelta = animDelta;
+		else
+			CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, -animDelta);
+	}
+}
+
+// --MIAMI: Done
 void
 CPed::SetDead(void)
 {
-	bUsesCollision = false;
+	if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DROWN))
+		bUsesCollision = false;
 
 	m_fHealth = 0.0f;
 	if (m_nPedState == PED_DRIVING)
 		bIsVisible = false;
 
-	m_nPedState = PED_DEAD;
+	SetPedState(PED_DEAD);
 	m_pVehicleAnim = nil;
 	m_pCollidingEntity = nil;
 
@@ -5784,6 +6452,7 @@ CPed::SetDead(void)
 	m_currentWeapon = WEAPONTYPE_UNARMED;
 	CEventList::RegisterEvent(EVENT_INJURED_PED, EVENT_ENTITY_PED, this, nil, 250);
 	if (this != FindPlayerPed()) {
+		RemoveWeaponAnims(0, -1000.0f);
 		CreateDeadPedWeaponPickups();
 		CreateDeadPedMoney();
 	}
@@ -5824,11 +6493,7 @@ CPed::SetSeek(CVector pos, float distanceToCountDone)
 		|| (m_nPedState == PED_SEEK_POS && m_vecSeekPos.x == pos.x && m_vecSeekPos.y == pos.y))
 		return;
 
-	if (GetWeapon()->m_eWeaponType == WEAPONTYPE_M16
-		|| GetWeapon()->m_eWeaponType == WEAPONTYPE_AK47
-		|| GetWeapon()->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE
-		|| GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER
-		|| GetWeapon()->m_eWeaponType == WEAPONTYPE_SHOTGUN) {
+	if (!CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAimWithArm) {
 		ClearPointGunAt();
 	}
 
@@ -5893,6 +6558,7 @@ CPed::DoesLOSBulletHitPed(CColPoint &colPoint)
 #endif
 }
 
+// --MIAMI: Done
 bool
 CPed::DuckAndCover(void)
 {
@@ -5910,9 +6576,11 @@ CPed::DuckAndCover(void)
 				SetAimFlag(m_pedInObjective);
 
 		} else {
-			bCrouchWhenShooting = false;
 			bKindaStayInSamePlace = false;
-			bIsDucking = false;
+			if (bIsDucking)
+				ClearDuck(true);
+
+			bCrouchWhenShooting = false;
 			bDuckAndCover = false;
 			m_headingRate = 10.0f;
 			m_duckAndCoverTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(20000,30000);
@@ -5921,25 +6589,70 @@ CPed::DuckAndCover(void)
 		}
 		return false;
 	}
+	
+	int16 lastVehicle = 0;
+	CEntity* vehicles[8];
 
 	bool justDucked = false;
 	CVehicle *foundVeh = nil;
 	float maxDist = 225.0f;
-	bIsDucking = false;
+	if (bIsDucking)
+		ClearDuck(true);
+
 	bCrouchWhenShooting = false;
+	bool duckingWithoutVeh = false;
 	if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer) {
-		CVector pos = GetPosition();
-		int16 lastVehicle;
-		CEntity *vehicles[8];
-		CWorld::FindObjectsInRange(pos, CHECK_NEARBY_THINGS_MAX_DIST, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+
+		for(int i = 0; i < 6; i++) {
+			CPlayerPed *player = (CPlayerPed*)m_pedInObjective;
+
+			if (player->m_pPedAtSafePos[i] == this) {
+				duckingWithoutVeh = true;
+				CVector &safePos = player->m_vecSafePos[i];
+				bool notRunningToSafePos = false;
+
+				if (m_vecSeekPos.x != safePos.x && m_vecSeekPos.y != safePos.y && m_vecSeekPos.z != safePos.z)
+					notRunningToSafePos = true;
+
+				if (!notRunningToSafePos) {
+					CVector target = player->m_vecSafePos[i];
+					SetSeek(target, 1.0f);
+					duckingWithoutVeh = true;
+					m_attackTimer = CTimer::GetTimeInMilliseconds() + 6000;
+					bDuckAndCover = true;
+				}
+				break;
+			}
+		}
+		if (!duckingWithoutVeh) {
+			for (int i = 0; i < 6; i++) {
+				CPlayerPed* player = (CPlayerPed*)m_pedInObjective;
+				if (!player->m_pPedAtSafePos[i] && player->m_vecSafePos[i].x != 0.0f) {
+					player->m_pPedAtSafePos[i] = this;
+					CVector target = player->m_vecSafePos[i];
+					SetSeek(target, 1.0f);
+					m_headingRate = 15.0f;
+					ClearPointGunAt();
+					duckingWithoutVeh = 1;
+					bIsRunning = true;
+					bDuckAndCover = true;
+					justDucked = true;
+					m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 500;
+					break;
+				}
+			}
+		}
+		if (!duckingWithoutVeh) {
+			CVector pos = GetPosition();
+			CWorld::FindObjectsInRange(pos, CHECK_NEARBY_THINGS_MAX_DIST, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
+		}
 
 		for (int i = 0; i < lastVehicle; i++) {
 			CVehicle *veh = (CVehicle*) vehicles[i];
-			if (veh->m_vecMoveSpeed.Magnitude() <= 0.02f
-				&& !veh->bIsBus
-				&& !veh->bIsVan
-				&& !veh->bIsBig
+			if (veh->IsCar() && veh->m_vecMoveSpeed.Magnitude() <= 0.02f
+				&& !veh->bIsBus && !veh->bIsVan && !veh->bIsBig
 				&& veh->m_numPedsUseItAsCover < 3) {
+
 				float dist = (GetPosition() - veh->GetPosition()).MagnitudeSqr();
 				if (dist < maxDist) {
 					maxDist = dist;
@@ -5980,25 +6693,25 @@ CPed::DuckAndCover(void)
 			else
 				duckPos = duckAtRightSide;
 
-			if (CWorld::TestSphereAgainstWorld(duckPos, 0.5f, nil, true, true, true, false, false, false)
-				&& CWorld::GetIsLineOfSightClear(GetPosition(), duckPos, 1, 0, 0, 1, 0, 0, 0)) {
+			if (CWorld::TestSphereAgainstWorld(duckPos, 0.5f, nil, true, true, true, false, false, false)) {
 				SetSeek(duckPos, 1.0f);
 				m_headingRate = 15.0f;
 				bIsRunning = true;
 				bDuckAndCover = true;
 				justDucked = true;
 				m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 500;
-				if (foundVeh->bIsLawEnforcer)
+				if (foundVeh->bIsLawEnforcer) {
 					m_carInObjective = foundVeh;
-
-				// BUG? Shouldn't we register the reference?
+					m_carInObjective->RegisterReference((CEntity**)&m_carInObjective);
+				}
 				m_pSeekTarget = foundVeh;
+				m_pSeekTarget->RegisterReference((CEntity**)&m_pSeekTarget);
 				ClearPointGunAt();
 			} else {
 				m_duckAndCoverTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(10000, 15000);
 				bDuckAndCover = false;
 			}
-		} else {
+		} else if (!duckingWithoutVeh) {
 			bDuckAndCover = false;
 		}
 	}
@@ -6006,8 +6719,13 @@ CPed::DuckAndCover(void)
 	if (!justDucked && !bDuckAndCover)
 		return false;
 	
-	if (!Seek())
-		return true;
+	if (!Seek()) {
+		if (m_nMoveState == PEDMOVE_STILL) {
+			bDuckAndCover = false;
+			return false;
+		} else
+			return true;
+	}
 
 	bKindaStayInSamePlace = true;
 	bDuckAndCover = false;
@@ -6024,9 +6742,12 @@ CPed::DuckAndCover(void)
 	}
 
 	m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(3000, 6000);
+	bCrouchWhenShooting = true;
+	SetDuck(CGeneral::GetRandomNumberInRange(2000, 5000), true);
 	return false;
 }
 
+// --MIAMI: Done
 void
 CPed::EndFight(uint8 endType)
 {
@@ -6036,6 +6757,9 @@ CPed::EndFight(uint8 endType)
 	m_lastFightMove = FIGHTMOVE_NULL;
 	RestorePreviousState();
 	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
+	if (!animAssoc)
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
+
 	if (animAssoc)
 		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 
@@ -6058,11 +6782,12 @@ CPed::EndFight(uint8 endType)
 	m_nWaitTimer = 0;
 }
 
+// --MIAMI: Done
 void
 CPed::EnterCar(void)
 {
 	if (IsNotInWreckedVehicle() && m_fHealth > 0.0f) {
-		CVehicle *veh = (CVehicle*)m_pSeekTarget;
+		CVehicle *veh = m_pMyVehicle;
 
 		// Not used.
 		// CVector posForDoor = GetPositionToOpenCarDoor(veh, m_vehEnterType);
@@ -6076,9 +6801,32 @@ CPed::EnterCar(void)
 		}
 		bIsInTheAir = false;
 		LineUpPedWithCar(LINE_UP_TO_CAR_START);
+		if (veh->IsBike()) {
+			CBike *bike = (CBike*)veh;
+			if (bike->GetStatus() != STATUS_ABANDONED || bike->bIsBeingPickedUp || !m_pVehicleAnim) {
+				if (m_nPedState == PED_CARJACK && m_pVehicleAnim) {
+					if (m_pVehicleAnim->currentTime > 0.4f && m_pVehicleAnim->currentTime - m_pVehicleAnim->timeStep <= 0.4f) {
+						int anim = m_pVehicleAnim->animId;
+						if (anim == ANIM_BIKE_KICK) {
+							DMAudio.PlayOneShot(m_audioEntityId, SOUND_187, 3.0f);
+						} else if (anim == ANIM_BIKE_ELBOW_R || anim == ANIM_BIKE_ELBOW_L) {
+							DMAudio.PlayOneShot(m_audioEntityId, SOUND_186, 3.0f);
+						}
+					}
+				}
+			} else {
+				int anim = m_pVehicleAnim->animId;
+
+				// One is pickup and other one is pullup, not same :p
+				if ((anim == ANIM_BIKE_PICKUP_R || anim == ANIM_BIKE_PICKUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
+					bike->bIsBeingPickedUp = true;
+				else if ((anim == ANIM_BIKE_PULLUP_R || anim == ANIM_BIKE_PULLUP_L) && m_pVehicleAnim->currentTime > 0.4667f)
+					bike->bIsBeingPickedUp = true;
+			}
+		}
 	} else {
 		QuitEnteringCar();
-		SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
+		SetDie();
 	}
 }
 
@@ -6157,6 +6905,7 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
 	return 1;
 }
 
+#ifdef GTA_TRAIN
 void
 CPed::LineUpPedWithTrain(void)
 {
@@ -6208,55 +6957,136 @@ CPed::ExitTrain(void)
 {
 	LineUpPedWithTrain();
 }
+#endif
 
+// --MIAMI: Done
 void
 CPed::ExitCar(void)
 {
-	if (!m_pVehicleAnim)
+	if (!m_pVehicleAnim) {
+		if (InVehicle()) {
+			if (m_pMyVehicle->IsBike()) {
+				// TODO(Miami): What are those?
+				if (m_vehEnterType == 18 || m_vehEnterType == 8) {
+					((CBike*)m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNARMED, 0, this, false);
+				}
+			} else if (m_pMyVehicle->IsCar()) {
+				if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_LHS)) {
+					((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_LF, this);
+				} else if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_ROLLOUT_RHS)) {
+					((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_RF, this);
+				}
+			}
+		}
 		return;
+	}
 
 	AnimationId exitAnim = (AnimationId) m_pVehicleAnim->animId;
 	float animTime = m_pVehicleAnim->currentTime;
 
-	m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, exitAnim, animTime);
+	if (exitAnim == ANIM_BIKE_GETOFF_BACK) {
+		if (animTime > 0.35f && m_pMyVehicle && m_pMyVehicle->IsBike())
+			((CBike*)m_pMyVehicle)->KnockOffRider(WEAPONTYPE_UNARMED, 0, this, false);
+		else
+			LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
 
-	if (m_pSeekTarget) {
-		// Car is upside down
-		if (m_pMyVehicle->GetUp().z > -0.8f) {
-			if (exitAnim != ANIM_CAR_CLOSE_RHS && exitAnim != ANIM_CAR_CLOSE_LHS && animTime <= 0.3f)
-				LineUpPedWithCar((m_pMyVehicle->GetModelIndex() == MI_DODO ? LINE_UP_TO_CAR_END : LINE_UP_TO_CAR_START));
-			else
+	} else if (exitAnim != ANIM_CAR_ROLLOUT_LHS && exitAnim != ANIM_CAR_ROLLOUT_RHS) {
+		m_pMyVehicle->ProcessOpenDoor(m_vehEnterType, exitAnim, animTime);
+
+		if (m_pSeekTarget) {
+			// Car is upside down
+			if (m_pMyVehicle->GetUp().z > -0.8f) {
+				if (exitAnim != ANIM_CAR_CLOSE_RHS && exitAnim != ANIM_CAR_CLOSE_LHS && animTime <= 0.3f)
+					LineUpPedWithCar((m_pMyVehicle->GetModelIndex() == MI_DODO ? LINE_UP_TO_CAR_END : LINE_UP_TO_CAR_START));
+				else
+					LineUpPedWithCar(LINE_UP_TO_CAR_END);
+			}
+			else {
 				LineUpPedWithCar(LINE_UP_TO_CAR_END);
-		} else {
-			LineUpPedWithCar(LINE_UP_TO_CAR_END);
+			}
 		}
-	}
 
-	// If there is someone in front of the door, make him fall while we exit.
-	if (m_nPedState == PED_EXIT_CAR) {
-		CPed *foundPed = nil;
-		for (int i = 0; i < m_numNearPeds; i++) {
-			if ((m_nearPeds[i]->GetPosition() - GetPosition()).MagnitudeSqr2D() < 0.04f) {
-				foundPed = m_nearPeds[i];
-				break;
+		// If there is someone in front of the door, make him fall while we exit.
+		if (m_nPedState == PED_EXIT_CAR) {
+			CPed* foundPed = nil;
+			for (int i = 0; i < m_numNearPeds; i++) {
+				if ((m_nearPeds[i]->GetPosition() - GetPosition()).MagnitudeSqr2D() < 0.04f) {
+					foundPed = m_nearPeds[i];
+					break;
+				}
 			}
-		}
-		if (foundPed && animTime > 0.4f && foundPed->IsPedInControl())
-			foundPed->SetFall(1000, ANIM_KO_SKID_FRONT, 1);
+			if(foundPed && (!foundPed->IsPlayer() || m_nPedType == PEDTYPE_COP || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS))
+				if (animTime > 0.4f && foundPed->IsPedInControl())
+					foundPed->SetFall(1000, ANIM_KO_SKID_FRONT, 1);
+		}
+	} else if (animTime <= 0.07f || !m_pMyVehicle || !m_pMyVehicle->IsCar()) {
+		LineUpPedWithCar(LINE_UP_TO_CAR_FALL);
+	} else if (exitAnim == ANIM_CAR_ROLLOUT_LHS) {
+		((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_LF, this);
+	} else {
+		((CAutomobile*)m_pMyVehicle)->KnockPedOutCar(WEAPONTYPE_UNIDENTIFIED, CAR_DOOR_RF, this);
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::Fall(void)
 {
-	if (m_getUpTimer != UINT32_MAX && CTimer::GetTimeInMilliseconds() > m_getUpTimer
-#ifdef VC_PED_PORTS
-		&& bIsStanding
-#endif
-		)
+	if (m_getUpTimer != UINT32_MAX && CTimer::GetTimeInMilliseconds() > m_getUpTimer && bIsStanding)
 		ClearFall();
 
-	// VC plays animations ANIM_STD_FALL_ONBACK and ANIM_STD_FALL_ONFRONT in here, which doesn't exist in III.
+	CAnimBlendAssociation *firstPartialAssoc;
+	CAnimBlendAssociation *fallAssoc;
+
+	if (IsPlayer() && (bKnockedUpIntoAir || b158_4) && !bIsStanding) {
+		firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+
+		// What???
+		if (firstPartialAssoc && (firstPartialAssoc->animId == ANIM_FALL_BACK || firstPartialAssoc->animId == ANIM_FALL_FRONT))
+			fallAssoc = firstPartialAssoc;
+		else
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
+
+		if (!fallAssoc)
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
+
+		if (fallAssoc || !firstPartialAssoc || 0.8f * firstPartialAssoc->hierarchy->totalLength >= firstPartialAssoc->currentTime) {
+			if (fallAssoc) {
+				if (fallAssoc->blendAmount > 0.3f && fallAssoc->blendDelta >= 0.0f)	{
+					float time = fallAssoc->currentTime;
+
+					if (time > 0.667f && time - fallAssoc->timeStep <= 0.667f) {
+						fallAssoc->SetCurrentTime(0.0f);
+						fallAssoc->SetRun();
+					}
+				}
+			}
+		} else if (firstPartialAssoc->flags & ASSOC_FRONTAL) {
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FRONT, 8.0f);
+		} else {
+			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_BACK, 8.0f);
+		}
+	} else if ((bKnockedUpIntoAir || b158_4) && bIsStanding && !bWasStanding) {
+		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
+
+		if (!fallAssoc)
+			fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FRONT);
+
+		if (fallAssoc) {
+			bKnockedUpIntoAir = false;
+			b158_4 = false;
+			fallAssoc->speed = 3.0f;
+			if (IsPlayer())
+				Say(SOUND_PED_LAND);
+
+		} else {
+			firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
+			if (firstPartialAssoc && !firstPartialAssoc->IsRunning()) {
+				bKnockedUpIntoAir = false;
+				b158_4 = false;
+			}
+		}
+	}
 }
 
 void
@@ -6313,13 +7143,9 @@ CPed::Fight(void)
 				case FIGHTMOVE_KNEE:
 					TransformToNode(touchingNodePos, PED_LOWERLEGR);
 					break;
-				case FIGHTMOVE_HEADBUTT:
-					TransformToNode(touchingNodePos, PED_HEAD);
-					break;
 				case FIGHTMOVE_PUNCHJAB:
 					TransformToNode(touchingNodePos, PED_HANDL);
 					break;
-				case FIGHTMOVE_KICK:
 				case FIGHTMOVE_LONGKICK:
 				case FIGHTMOVE_ROUNDHOUSE:
 				case FIGHTMOVE_GROUNDKICK:
@@ -6380,12 +7206,12 @@ CPed::Fight(void)
 			canRoundhouse = false;
 			punchOnly = false;
 			canKick = true;
-			nextFightMove = (m_fightButtonPressure > 190 ? FIGHTMOVE_HEADBUTT : FIGHTMOVE_KNEE);
+			nextFightMove = (m_fightButtonPressure > 190 ? FIGHTMOVE_BODYBLOW : FIGHTMOVE_KNEE);
 			hasShoppingBags = false;
 			canKneeHead = true;
 			nPlayerInComboMove = 0;
 		} else {
-			nextFightMove = (m_fightButtonPressure > 120 ? FIGHTMOVE_HEADBUTT : FIGHTMOVE_KNEE);
+			nextFightMove = (m_fightButtonPressure > 120 ? FIGHTMOVE_BODYBLOW : FIGHTMOVE_KNEE);
 			uint16 pedFeatures = m_pedStats->m_flags;
 			punchOnly = pedFeatures & STAT_PUNCH_ONLY;
 			canRoundhouse = pedFeatures & STAT_CAN_ROUNDHOUSE;
@@ -6424,7 +7250,7 @@ CPed::Fight(void)
 								&& neededTurn < DEGTORAD(35.0f)
 								&& (canKick || hasShoppingBags)) {
 
-								nextFightMove = FIGHTMOVE_KICK;
+								nextFightMove = FIGHTMOVE_LONGKICK;
 								if (hasShoppingBags) {
 									nextFightMove = FIGHTMOVE_ROUNDHOUSE;
 								} else if (canRoundhouse && CGeneral::GetRandomNumber() & 1) {
@@ -6517,7 +7343,7 @@ CPed::Fight(void)
 						if (fightingPedDist >= 1.3f) {
 
 							if (fightingPedDist < 1.7f && canKick) {
-								nextFightMove = FIGHTMOVE_KICK;
+								nextFightMove = FIGHTMOVE_LONGKICK;
 								if (canRoundhouse && CGeneral::GetRandomNumber() & 1)
 									nextFightMove = FIGHTMOVE_ROUNDHOUSE;
 
@@ -6744,9 +7570,7 @@ CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
 
 	if (obstacle) {
 		animAssoc->flags |= ASSOC_DELETEFADEDOUT;
-
-		// ANIM_HIT_WALL in VC (which makes more sense)
-		CAnimBlendAssociation *handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HANDSCOWER, 8.0f);
+		CAnimBlendAssociation *handsCoverAssoc = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_HIT_WALL, 8.0f);
 		handsCoverAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
 		handsCoverAssoc->SetFinishCallback(FinishHitHeadCB, ped);
 		ped->bIsLanding = true;
@@ -6840,6 +7664,7 @@ CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -6850,15 +7675,16 @@ CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
 	ped->Wait();
 }
 
+// --MIAMI: Some part is done
 void
 CPed::Wait(void)
 {
-	AnimationId mustHaveAnim = NUM_ANIMS;
+	AnimationId mustHaveAnim = NUM_STD_ANIMS;
 	CAnimBlendAssociation *animAssoc;
 	CPed *pedWeLook;
 
 	if (DyingOrDead()) {
-		m_nWaitState = WAITSTATE_FALSE;
+		ClearWaitState();
 		RestoreHeadingRate();
 		return;
 	}
@@ -6868,7 +7694,7 @@ CPed::Wait(void)
 		case WAITSTATE_TRAFFIC_LIGHTS:
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
 				if (CTrafficLights::LightForPeds() == PED_LIGHTS_WALK) {
-					m_nWaitState = WAITSTATE_FALSE;
+					ClearWaitState();
 					SetMoveState(PEDMOVE_WALK);
 				}
 			}
@@ -6877,7 +7703,7 @@ CPed::Wait(void)
 		case WAITSTATE_CROSS_ROAD:
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
 				if (CGeneral::GetRandomNumber() & 1 || !m_nWaitTimer)
-					m_nWaitState = WAITSTATE_FALSE;
+					ClearWaitState();
 				else
 					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, nil);
 
@@ -6891,7 +7717,7 @@ CPed::Wait(void)
 
 		case WAITSTATE_CROSS_ROAD_LOOK:
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ROAD_CROSS);
 				if (animAssoc) {
 					animAssoc->blendDelta = -8.0f;
@@ -6908,7 +7734,7 @@ CPed::Wait(void)
 					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_XPRESS_SCRATCH, 4.0f);
 				}
 			} else {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 				SetMoveState(PEDMOVE_WALK);
 			}
 			break;
@@ -6919,13 +7745,13 @@ CPed::Wait(void)
 					m_collidingThingTimer = CTimer::GetTimeInMilliseconds() + 2500;
 				}
 			} else {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 			}
 			break;
 
 		case WAITSTATE_TURN180:
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 				SetMoveState(PEDMOVE_WALK);
 				m_fRotationCur = m_fRotationCur + PI;
 				if (m_nPedState == PED_INVESTIGATE)
@@ -6944,7 +7770,7 @@ CPed::Wait(void)
 					animAssoc->SetFinishCallback(FinishedWaitCB, this);
 					m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 5000;
 				} else {
-					m_nWaitState = WAITSTATE_FALSE;
+					ClearWaitState();
 				}
 			}
 			break;
@@ -6973,7 +7799,7 @@ CPed::Wait(void)
 
 				if (animAssoc->animId == ANIM_TURN_180) {
 					m_fRotationCur = CGeneral::LimitRadianAngle(PI + m_fRotationCur);
-					m_nWaitState = WAITSTATE_FALSE;
+					ClearWaitState();
 					SetMoveState(PEDMOVE_WALK);
 					m_nStoredMoveState = PEDMOVE_NONE;
 					m_panicCounter = 0;
@@ -7010,7 +7836,7 @@ CPed::Wait(void)
 
 		case WAITSTATE_LOOK_ABOUT:
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 				animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_HBHB);
 				if (animAssoc) {
 					animAssoc->blendDelta = -8.0f;
@@ -7023,7 +7849,7 @@ CPed::Wait(void)
 			mustHaveAnim = ANIM_HANDSUP;
 			
 		case WAITSTATE_PLAYANIM_HANDSCOWER:
-			if (mustHaveAnim == NUM_ANIMS)
+			if (mustHaveAnim == NUM_STD_ANIMS)
 				mustHaveAnim = ANIM_HANDSCOWER;
 
 			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), mustHaveAnim);
@@ -7037,7 +7863,7 @@ CPed::Wait(void)
 
 				TurnBody();
 			} else {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 				m_nWaitTimer = 0;
 				if (m_pLookTarget && m_pLookTarget->IsPed()) {
 
@@ -7095,15 +7921,15 @@ CPed::Wait(void)
 			mustHaveAnim = ANIM_HANDSCOWER;
 
 		case WAITSTATE_PLAYANIM_DUCK:
-			if (mustHaveAnim == NUM_ANIMS)
+			if (mustHaveAnim == NUM_STD_ANIMS)
 				mustHaveAnim = ANIM_DUCK_DOWN;
 
 		case WAITSTATE_PLAYANIM_TAXI:
-			if (mustHaveAnim == NUM_ANIMS)
+			if (mustHaveAnim == NUM_STD_ANIMS)
 				mustHaveAnim = ANIM_IDLE_TAXI;
 
 		case WAITSTATE_PLAYANIM_CHAT:
-			if (mustHaveAnim == NUM_ANIMS)
+			if (mustHaveAnim == NUM_STD_ANIMS)
 				mustHaveAnim = ANIM_IDLE_CHAT;
 
 			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
@@ -7112,7 +7938,7 @@ CPed::Wait(void)
 					animAssoc->blendDelta = -4.0f;
 					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 				}
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
 			}
 #ifdef VC_PED_PORTS
 			else if (m_nWaitState == WAITSTATE_PLAYANIM_TAXI) {
@@ -7136,13 +7962,82 @@ CPed::Wait(void)
 					animAssoc->flags |= ASSOC_DELETEFADEDOUT;
 					CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 4.0f);
 					int timer = 2000;
-					m_nWaitState = WAITSTATE_FALSE;
+					ClearWaitState();
 					SetWaitState(WAITSTATE_CROSS_ROAD_LOOK, &timer);
 				}
 			} else {
-				m_nWaitState = WAITSTATE_FALSE;
+				ClearWaitState();
+			}
+			break;
+		case WAITSTATE_SIT_DOWN:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				SetWaitState(WAITSTATE_SIT_IDLE, 0);
+			}
+			break;
+		//case WAITSTATE_SIT_DOWN_RVRS:
+		case WAITSTATE_SIT_UP:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (m_attractor)
+					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+				ClearWaitState();
+				//TODO(MIAMI): scan for threats!
 			}
 			break;
+		case WAITSTATE_SIT_IDLE:
+			if (bTurnedAroundOnAttractor) {
+				m_fRotationCur += PI;
+				m_fRotationCur = CGeneral::LimitRadianAngle(m_fRotationCur);
+				m_fRotationDest = m_fRotationCur;
+				bTurnedAroundOnAttractor = false;
+			}
+			// TODO(MIAMI): scan for threats!
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				ClearWaitState();
+				SetWaitState(WAITSTATE_SIT_UP, 0);
+			}
+			break;
+		case WAITSTATE_USE_ATM:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+				if (m_attractor)
+					GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+				ClearWaitState();
+			}
+			break;
+		case WAITSTATE_RIOT:
+			if (m_nPedState == PED_FLEE_ENTITY || m_nPedState == PED_ATTACK) {
+				ClearWaitState();
+				break;
+			}
+
+			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_RIOT, ANIM_RIOT_ANGRY, ANIM_RIOT_FUKU - ANIM_RIOT_ANGRY + 1);
+			if (IsPedInControl() && CGeneral::GetRandomNumberInRange(0.f,1.f) < 0.25f
+				&& CPopulation::CanJeerAtStripper(m_modelIndex)) {
+				for (int i = 0; i < m_numNearPeds; ++i) {
+					CPed *nearPed = m_nearPeds[i];
+					if (nearPed) {
+						if ((GetPosition() - nearPed->GetPosition()).MagnitudeSqr() < sq(10.f)) {
+							for (int anim = ANIM_STRIP_A; anim <= ANIM_STRIP_G; anim++) {
+								if (RpAnimBlendClumpGetAssociation(nearPed->GetClump(), anim))
+									Say(SOUND_PED_149);
+							}
+						}
+					}
+				}
+			}
+			break;
+		case WAITSTATE_BOMBER:
+			if (CTimer::GetTimeInMilliseconds() > m_nWaitTimer)
+				ClearWaitState();
+			break;
+		case WAITSTATE_STRIPPER:
+			PlayRandomAnimationsFromAnimBlock(this, ASSOCGRP_STRIP, ANIM_STRIP_A, ANIM_STRIP_G - ANIM_STRIP_A + 1);
+			break;
+		case WAITSTATE_SUN_BATHE_PRE:
+		case WAITSTATE_SUN_BATHE_DOWN:
+		case WAITSTATE_SUN_BATHE_IDLE:
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
+			assert(0);
 		default:
 			break;
 	}
@@ -7717,93 +8612,18 @@ CPed::GetNextPointOnRoute(void)
 	return nextPoint;
 }
 
-// These categories are purely random, most of ped models have no correlation. So I don't think making an enum.
 uint8
 CPed::GetPedRadioCategory(uint32 modelIndex)
 {
-	switch (modelIndex) {
-		case MI_MALE01:
-		case MI_FEMALE03:
-		case MI_PROSTITUTE2:
-		case MI_WORKER1:
-		case MI_MOD_MAN:
-		case MI_MOD_WOM:
-		case MI_ST_WOM:
-		case MI_FAN_WOM:
-			return 3;
-		case MI_TAXI_D:
-		case MI_PIMP:
-		case MI_MALE02:
-		case MI_FEMALE02:
-		case MI_FATFEMALE01:
-		case MI_FATFEMALE02:
-		case MI_DOCKER1:
-		case MI_WORKER2:
-		case MI_FAN_MAN2:
-			return 9;
-		case MI_GANG01:
-		case MI_GANG02:
-		case MI_SCUM_MAN:
-		case MI_SCUM_WOM:
-		case MI_HOS_WOM:
-		case MI_CONST1:
-			return 1;
-		case MI_GANG03:
-		case MI_GANG04:
-		case MI_GANG07:
-		case MI_GANG08:
-		case MI_CT_MAN2:
-		case MI_CT_WOM2:
-		case MI_B_MAN3:
-		case MI_SHOPPER3:
-			return 4;
-		case MI_GANG05:
-		case MI_GANG06:
-		case MI_GANG11:
-		case MI_GANG12:
-		case MI_CRIMINAL02:
-		case MI_B_WOM2:
-		case MI_ST_MAN:
-		case MI_HOS_MAN:
-			return 5;
-		case MI_FATMALE01:
-		case MI_LI_MAN2:
-		case MI_SHOPPER1:
-		case MI_CAS_MAN:
-			return 6;
-		case MI_PROSTITUTE:
-		case MI_P_WOM2:
-		case MI_LI_WOM2:
-		case MI_B_WOM3:
-		case MI_CAS_WOM:
-			return 2;
-		case MI_P_WOM1:
-		case MI_DOCKER2:
-		case MI_STUD_MAN:
-			return 7;
-		case MI_CT_MAN1:
-		case MI_CT_WOM1:
-		case MI_LI_MAN1:
-		case MI_LI_WOM1:
-		case MI_B_MAN1:
-		case MI_B_MAN2:
-		case MI_B_WOM1:
-		case MI_SHOPPER2:
-		case MI_STUD_WOM:
-			return 8;
-		default:
-			return 0;
-	}
+	// TODO(MIAMI): remove this function and use modelinfo for radio
+	return 1;
 }
 
-// Some kind of VC leftover I think
+// --MIAMI: Done
 int
 CPed::GetWeaponSlot(eWeaponType weaponType)
 {
-	if (HasWeapon(weaponType))
-		return weaponType;
-	else
-		return -1;
+	return CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
 }
 
 void
@@ -7825,6 +8645,7 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached)
 	return true;
 }
 
+// --MIAMI: Done
 void
 CPed::Idle(void)
 {
@@ -7846,42 +8667,13 @@ CPed::Idle(void)
 		}
 	}
 
-	CAnimBlendAssociation *armedIdleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_ARMED);
-	CAnimBlendAssociation *unarmedIdleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
-	int waitTime;
-
-	if (m_nMoveState == PEDMOVE_STILL) {
-
-		eWeaponType curWeapon = GetWeapon()->m_eWeaponType;
-		if (!armedIdleAssoc ||
-			CTimer::GetTimeInMilliseconds() <= m_nWaitTimer && curWeapon != WEAPONTYPE_UNARMED && curWeapon != WEAPONTYPE_MOLOTOV && curWeapon != WEAPONTYPE_GRENADE) {
-
-			if ((!GetWeapon()->IsType2Handed() || curWeapon == WEAPONTYPE_SHOTGUN) && curWeapon != WEAPONTYPE_BASEBALLBAT
-				|| !unarmedIdleAssoc || unarmedIdleAssoc->blendAmount <= 0.95f || m_nWaitState != WAITSTATE_FALSE || CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
+	if (m_nMoveState != PEDMOVE_STILL && !IsPlayer())
+		SetMoveState(PEDMOVE_STILL);
 
-				m_moved = CVector2D(0.0f, 0.0f);
-				return;
-			}
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_IDLE_ARMED, 3.0f);
-			waitTime = CGeneral::GetRandomNumberInRange(4000, 7500);
-		} else {
-			armedIdleAssoc->blendDelta = -2.0f;
-			armedIdleAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			waitTime = CGeneral::GetRandomNumberInRange(3000, 8500);
-		}
-		m_nWaitTimer = CTimer::GetTimeInMilliseconds() + waitTime;
-	} else {
-		if (armedIdleAssoc) {
-			armedIdleAssoc->blendDelta = -8.0f;
-			armedIdleAssoc->flags |= ASSOC_DELETEFADEDOUT;
-			m_nWaitTimer = 0;
-		}
-		if (!IsPlayer())
-			SetMoveState(PEDMOVE_STILL);
-	}
 	m_moved = CVector2D(0.0f, 0.0f);
 }
 
+// --MIAMI: Done
 void
 CPed::InTheAir(void)
 {
@@ -7895,17 +8687,11 @@ CPed::InTheAir(void)
 	if (m_vecMoveSpeed.z < 0.0f && !bIsPedDieAnimPlaying) {
 		if (!DyingOrDead()) {
 			if (CWorld::ProcessLineOfSight(ourPos, bitBelow, foundCol, foundEnt, true, true, false, true, false, false, false)) {
-				if (GetPosition().z - foundCol.point.z < 1.3f
-#ifdef VC_PED_PORTS
-					|| bIsStanding
-#endif
-					)
+				if (GetPosition().z - foundCol.point.z < 1.3f || bIsStanding)
 					SetLanding();
-			} else {
-				if (!RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL)) {
-					if (m_vecMoveSpeed.z < -0.1f)
-						CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FALL, 4.0f);
-				}
+			} else if (m_nPedState != PED_ABSEIL && !RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL)) {
+				if (m_vecMoveSpeed.z < -0.1f)
+					CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_FALL, 4.0f);
 			}
 		}
 	}
@@ -7920,14 +8706,22 @@ CPed::SetLanding(void)
 	CAnimBlendAssociation *fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL);
 	CAnimBlendAssociation *landAssoc;
 
+	if (fallAssoc && bIsDrowning)
+		return;
+
 	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
-	if (fallAssoc) {
+	if (fallAssoc || m_nPedType == PEDTYPE_COP && bKnockedUpIntoAir) {
 		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_COLLAPSE);
 		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_COLLAPSE, 1.0f);
 
 		if (IsPlayer())
 			Say(SOUND_PED_LAND);
 
+		if (m_nPedType == PEDTYPE_COP) {
+			if (bKnockedUpIntoAir)
+				bKnockedUpIntoAir = false;
+		}
+
 	} else {
 		landAssoc = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND);
 		DMAudio.PlayOneShot(m_audioEntityId, SOUND_FALL_LAND, 1.0f);
@@ -7948,11 +8742,29 @@ CPed::Initialise(void)
 	debug("CPed ready\n");
 }
 
+// --MIAMI: Done
 void
 CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 {
 	// FIX: If there were no translations on enter anims, there were overflows all over this function.
 
+	int vanBlock = CAnimManager::GetAnimationBlockIndex("van");
+	int bikesBlock = CAnimManager::GetAnimationBlockIndex("bikes");
+	int bikevBlock = CAnimManager::GetAnimationBlockIndex("bikev");
+	int bikehBlock = CAnimManager::GetAnimationBlockIndex("bikeh");
+	int bikedBlock = CAnimManager::GetAnimationBlockIndex("biked");
+	CStreaming::RequestAnim(vanBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikesBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikevBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikehBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::RequestAnim(bikedBlock, STREAMFLAGS_DEPENDENCY);
+	CStreaming::LoadAllRequestedModels(false);
+	CAnimManager::AddAnimBlockRef(vanBlock);
+	CAnimManager::AddAnimBlockRef(bikesBlock);
+	CAnimManager::AddAnimBlockRef(bikevBlock);
+	CAnimManager::AddAnimBlockRef(bikehBlock);
+	CAnimManager::AddAnimBlockRef(bikedBlock);
+
 	CAnimBlendHierarchy *enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_CAR_JACKED_LHS)->hierarchy;
 	CAnimBlendSequence *seq = enterAssoc->sequences;
 	CAnimManager::UncompressAnimation(enterAssoc);
@@ -8001,7 +8813,7 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 		}
 	}
 
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_VAN_GETIN_L)->hierarchy;
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_VAN, ANIM_VAN_GETIN_L)->hierarchy;
 	seq = enterAssoc->sequences;
 	CAnimManager::UncompressAnimation(enterAssoc);
 	if (seq->numFrames > 0) {
@@ -8012,8 +8824,8 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 			vecPedVanRearDoorAnimOffset = lastFrame->translation;
 		}
 	}
-
-	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_TRAIN_GETOUT)->hierarchy;
+	// I think this is leftover and ANIM_TRAIN_GETOUT
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_IDLE_STANCE3)->hierarchy;
 	seq = enterAssoc->sequences;
 	CAnimManager::UncompressAnimation(enterAssoc);
 	if (seq->numFrames > 0) {
@@ -8024,6 +8836,72 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 			vecPedTrainDoorAnimOffset = lastFrame->translation;
 		}
 	}
+
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_STANDARD, ANIM_BIKE_JUMPON_R)->hierarchy;
+	seq = enterAssoc->sequences;
+	CAnimManager::UncompressAnimation(enterAssoc);
+	if (seq->numFrames > 0) {
+		if (!seq->HasTranslation())
+			vecPedStdBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
+		else {
+			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
+			vecPedStdBikeJumpRhsAnimOffset = lastFrame->translation;
+		}
+	}
+
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_VESPA, ANIM_BIKE_JUMPON_R)->hierarchy;
+	seq = enterAssoc->sequences;
+	CAnimManager::UncompressAnimation(enterAssoc);
+	if (seq->numFrames > 0) {
+		if (!seq->HasTranslation())
+			vecPedVespaBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
+		else {
+			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
+			vecPedVespaBikeJumpRhsAnimOffset = lastFrame->translation;
+		}
+	}
+
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_HARLEY, ANIM_BIKE_JUMPON_R)->hierarchy;
+	seq = enterAssoc->sequences;
+	CAnimManager::UncompressAnimation(enterAssoc);
+	if (seq->numFrames > 0) {
+		if (!seq->HasTranslation())
+			vecPedHarleyBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
+		else {
+			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
+			vecPedHarleyBikeJumpRhsAnimOffset = lastFrame->translation;
+		}
+	}
+
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_DIRT, ANIM_BIKE_JUMPON_R)->hierarchy;
+	seq = enterAssoc->sequences;
+	CAnimManager::UncompressAnimation(enterAssoc);
+	if (seq->numFrames > 0) {
+		if (!seq->HasTranslation())
+			vecPedDirtBikeJumpRhsAnimOffset = CVector(0.0f, 0.0f, 0.0f);
+		else {
+			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
+			vecPedDirtBikeJumpRhsAnimOffset = lastFrame->translation;
+		}
+	}
+
+	enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_BIKE_HARLEY, ANIM_BIKE_KICK)->hierarchy;
+	seq = enterAssoc->sequences;
+	CAnimManager::UncompressAnimation(enterAssoc);
+	if (seq->numFrames > 0) {
+		if (!seq->HasTranslation())
+			vecPedBikeKickAnimOffset = CVector(0.0f, 0.0f, 0.0f);
+		else {
+			KeyFrameTrans* lastFrame = (KeyFrameTrans*)seq->GetKeyFrame(seq->numFrames - 1);
+			vecPedBikeKickAnimOffset = lastFrame->translation;
+		}
+	}
+
+	CAnimManager::RemoveAnimBlockRef(vanBlock);
+	CAnimManager::RemoveAnimBlockRef(bikesBlock);
+	CAnimManager::RemoveAnimBlockRef(bikevBlock);
+	CAnimManager::RemoveAnimBlockRef(bikehBlock);
+	CAnimManager::RemoveAnimBlockRef(bikedBlock);
 }
 
 void
@@ -8229,7 +9107,11 @@ CPed::InvestigateEvent(void)
 bool
 CPed::IsPedDoingDriveByShooting(void)
 {
+#ifdef FIX_BUGS
+	if (FindPlayerPed() == this && CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nWeaponSlot == 5) {
+#else
 	if (FindPlayerPed() == this && GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI) {
+#endif
 		if (TheCamera.Cams[TheCamera.ActiveCam].LookingLeft || TheCamera.Cams[TheCamera.ActiveCam].LookingRight)
 			return true;
 	}
@@ -8479,7 +9361,7 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 
 		if ((m_nPedState == PED_FALL || m_nPedState == PED_DIE || m_nPedState == PED_DEAD)
 			&& !m_pCollidingEntity &&
-		    (!IsPlayer() || bHasHitWall || car->GetModelIndex() == MI_TRAIN || m_vecDamageNormal.z < -0.8f)) {
+			(!IsPlayer() || bHasHitWall || car->GetModelIndex() == MI_TRAIN || m_vecDamageNormal.z < -0.8f)) {
 
 			m_pCollidingEntity = car;
 		}
@@ -8515,7 +9397,7 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 void
 CPed::Look(void)
 {
-	// UNUSED: This is a perfectly empty function.
+	TurnBody();
 }
 
 bool
@@ -8860,7 +9742,7 @@ CPed::MoveHeadToLook(void)
 		}
 
 		if (m_pLookTarget->IsPed()) {
-			((CPed*)m_pLookTarget)->m_pedIK.GetComponentPosition((RwV3d*) &lookPos, PED_MID);
+			((CPed*)m_pLookTarget)->m_pedIK.GetComponentPosition(*(RwV3d *)&lookPos, PED_MID);
 		} else {
 			lookPos = m_pLookTarget->GetPosition();
 		}
@@ -8880,7 +9762,7 @@ CPed::MoveHeadToLook(void)
 
 		bool notRocketLauncher = false;
 		bool notTwoHanded = false;
-		AnimationId animToPlay = NUM_ANIMS;
+		AnimationId animToPlay = NUM_STD_ANIMS;
 
 		if (!GetWeapon()->IsType2Handed())
 			notTwoHanded = true;
@@ -8909,7 +9791,7 @@ CPed::MoveHeadToLook(void)
 			animToPlay = ANIM_FUCKU;
 		}
 
-		if (animToPlay != NUM_ANIMS) {
+		if (animToPlay != NUM_STD_ANIMS) {
 			CAnimBlendAssociation *newAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, animToPlay, 4.0f);
 
 			if (newAssoc) {
@@ -8979,7 +9861,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 	bool itsLow = !!veh->bLowVehicle;
 #endif
 	eDoors enterDoor;
-	AnimationId enterAnim;
 
 	switch (ped->m_vehEnterType) {
 		case CAR_DOOR_RF:
@@ -9009,28 +9890,27 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 		}
 		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
 			if (itsVan) {
-				enterAnim = ANIM_VAN_GETIN;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN);
 			} else if (itsBus) {
-				enterAnim = ANIM_COACH_IN_R;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_R);
 #ifdef FIX_BUGS
 			} else if (itsLow) {
-				enterAnim = ANIM_CAR_GETIN_LOW_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
 #endif
 			} else {
-				enterAnim = ANIM_CAR_GETIN_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
 			}
 		} else if (itsVan) {
-			enterAnim = ANIM_VAN_GETIN_L;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN_L);
 		} else if (itsBus) {
-			enterAnim = ANIM_COACH_IN_L;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_L);
 #ifdef FIX_BUGS
 		} else if (itsLow) {
-			enterAnim = ANIM_CAR_GETIN_LOW_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
 #endif
 		} else {
-			enterAnim = ANIM_CAR_GETIN_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
 		}
-		ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, enterAnim);
 		ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
 
 	} else if (veh->CanPedOpenLocks(ped)) {
@@ -9038,16 +9918,16 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 		veh->AutoPilot.m_nCruiseSpeed = 0;
 		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
 			if (itsVan) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_VAN_OPEN);
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_OPEN);
 			} else if (itsBus) {
-				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_COACH_OPEN_R);
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_OPEN_R);
 			} else {
 				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_OPEN_RHS);
 			}
 		} else if (itsVan) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_VAN_OPEN_L);
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_OPEN_L);
 		} else if (itsBus) {
-			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_COACH_OPEN_L);
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_OPEN_L);
 		} else {
 
 			if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER && veh->pDriver) {
@@ -9086,9 +9966,6 @@ CPed::ProcessControl(void)
 	CColPoint foundCol;
 	CEntity *foundEnt = nil;
 
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
-		return;
-
 	int alpha = CVisibilityPlugins::GetClumpAlpha(GetClump());
 	if (!bFadeOut) {
 		if (alpha < 255) {
@@ -9106,6 +9983,7 @@ CPed::ProcessControl(void)
 	bIsShooting = false;
 	BuildPedLists();
 	bIsInWater = false;
+	bIsDrowning = false;
 	ProcessBuoyancy();
 
 	if (m_nPedState != PED_ARRESTED) {
@@ -9200,7 +10078,7 @@ CPed::ProcessControl(void)
 			++m_panicCounter;
 
 		if (m_fHealth <= 1.0f && m_nPedState <= PED_STATES_NO_AI && !bIsInTheAir && !bIsLanding)
-			SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
+			SetDie();
 
 		bCollidedWithMyVehicle = false;
 
@@ -9217,7 +10095,7 @@ CPed::ProcessControl(void)
 			} else if (m_nPedStateTimer < 1001) {
 				m_nPedStateTimer = 0;
 			}
-		} else {
+		} else if (!GetPedAttractorManager()->IsInQueue(this, m_attractor)) {
 			if (m_panicCounter == 50 && IsPedInControl()) {
 				SetWaitState(WAITSTATE_STUCK, nil);
 				// Leftover
@@ -9267,6 +10145,13 @@ CPed::ProcessControl(void)
 
 					float oldDestRot = CGeneral::LimitRadianAngle(m_fRotationDest);
 
+					if (m_nPedState == PED_FOLLOW_PATH) {
+						if (DotProduct(m_vecDamageNormal, GetForward()) < -0.866f && CanPedJumpThis(collidingEnt, &m_vecDamageNormal)) {
+							SetJump();
+						}
+						break;
+					}
+
 					if (m_pedInObjective &&
 						(m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT)) {
 
@@ -9846,7 +10731,7 @@ CPed::ProcessControl(void)
 							flyDir = 1;
 						}
 
-						if (flyDir != 0 && !bSomeVCflag1) {
+						if (flyDir != 0 && !bHeadStuckInCollision) {
 							SetPosition((flyDir == 2 ? obstacleForFlyingOtherDir.point : obstacleForFlying.point));
 							GetMatrix().GetPosition().z += FEET_OFFSET;
 							GetMatrix().UpdateRW();
@@ -9953,11 +10838,11 @@ CPed::ProcessControl(void)
 
 					if (CWorld::ProcessVerticalLine(offsetToCheck, GetPosition().z - FEET_OFFSET, foundCol, foundEnt, true, true, false, true, false, false, nil)) {
 #ifdef VC_PED_PORTS
-						if (!bSomeVCflag1 || FEET_OFFSET + foundCol.point.z < GetPosition().z) {
+						if (!bHeadStuckInCollision || FEET_OFFSET + foundCol.point.z < GetPosition().z) {
 							GetMatrix().GetPosition().z = FEET_OFFSET + foundCol.point.z;
 							GetMatrix().UpdateRW();
-							if (bSomeVCflag1)
-								bSomeVCflag1 = false;
+							if (bHeadStuckInCollision)
+								bHeadStuckInCollision = false;
 						}
 #else
 						GetMatrix().GetPosition().z = FEET_OFFSET + foundCol.point.z;
@@ -10017,24 +10902,27 @@ CPed::ProcessControl(void)
 		CPhysical::ProcessControl();
 #endif
 		if (m_nPedState != PED_DIE || bIsPedDieAnimPlaying) {
+			RequestDelayedWeapon();
+			PlayFootSteps();
 			if (m_nPedState != PED_DEAD) {
 				CalculateNewVelocity();
 				CalculateNewOrientation();
 			}
 			UpdatePosition();
-			PlayFootSteps();
-			if (IsPedInControl() && !bIsStanding && !m_pDamageEntity && CheckIfInTheAir()) {
-				SetInTheAir();
-#ifdef VC_PED_PORTS
-				bSomeVCflag1 = false;
-#endif
+			if (IsPedInControl() && !bIsStanding && !m_pDamageEntity) {
+				if (m_attachedTo) {
+					bIsInTheAir = false;
+				} else if (CheckIfInTheAir()) {
+					SetInTheAir();
+					bHeadStuckInCollision = false;
+				}
 			}
 #ifdef VC_PED_PORTS
-			if (bSomeVCflag1) {
+			if (bHeadStuckInCollision) {
 				CVector posToCheck = GetPosition();
 				posToCheck.z += 0.9f;
 				if (!CWorld::TestSphereAgainstWorld(posToCheck, 0.2f, this, true, true, false, true, false, false))
-					bSomeVCflag1 = false;
+					bHeadStuckInCollision = false;
 			}
 #endif
 			ProcessObjective();
@@ -10101,7 +10989,6 @@ CPed::ProcessControl(void)
 				case PED_FOLLOW_ROUTE:
 				case PED_CPR:
 				case PED_SOLICIT:
-				case PED_BUY_ICECREAM:
 				case PED_STEP_AWAY:
 				case PED_UNKNOWN:
 				case PED_STATES_NO_AI:
@@ -10192,6 +11079,9 @@ CPed::ProcessControl(void)
 				case PED_SEEK_IN_BOAT:
 					SeekBoatPosition();
 					break;
+				case PED_BUY_ICECREAM:
+					BuyIceCream();
+					break;
 				case PED_INVESTIGATE:
 					InvestigateEvent();
 					break;
@@ -10212,18 +11102,23 @@ CPed::ProcessControl(void)
 							m_pFire->Extinguish();
 					}
 					break;
+				case PED_ANSWER_MOBILE:
+					AnswerMobile();
+					break;
 				case PED_FALL:
 					Fall();
 					break;
 				case PED_GETUP:
 					SetGetUp();
 					break;
+#ifdef GTA_TRAIN
 				case PED_ENTER_TRAIN:
 					EnterTrain();
 					break;
 				case PED_EXIT_TRAIN:
 					ExitTrain();
 					break;
+#endif
 				case PED_DRIVING:
 				{
 					if (!m_pMyVehicle) {
@@ -10232,122 +11127,55 @@ CPed::ProcessControl(void)
 						return;
 					}
 
-					if (m_pMyVehicle->pDriver != this || m_pMyVehicle->IsBoat()) {
-						LookForSexyPeds();
-						LookForSexyCars();
-						break;
-					}
-
-					if (m_pMyVehicle->m_vehType == VEHICLE_TYPE_BIKE || !m_pMyVehicle->pDriver->IsPlayer()) {
-						break;
-					}
-
-					CPad* pad = CPad::GetPad(0);
-
 #ifdef CAR_AIRBREAK
-					if (!pad->ArePlayerControlsDisabled()) {
-						if (pad->GetHorn()) {
-							float c = Cos(m_fRotationCur);
-							float s = Sin(m_fRotationCur);
-							m_pMyVehicle->GetRight() = CVector(1.0f, 0.0f, 0.0f);
-							m_pMyVehicle->GetForward() = CVector(0.0f, 1.0f, 0.0f);
-							m_pMyVehicle->GetUp() = CVector(0.0f, 0.0f, 1.0f);
-							if (pad->GetAccelerate()) {
-								m_pMyVehicle->ApplyMoveForce(GetForward() * 30.0f);
-							} else if (pad->GetBrake()) {
-								m_pMyVehicle->ApplyMoveForce(-GetForward() * 30.0f);
-							} else {
-								int16 lr = pad->GetSteeringLeftRight();
-								if (lr < 0) {
-									//m_pMyVehicle->ApplyTurnForce(20.0f * -GetRight(), GetForward());
-									m_pMyVehicle->ApplyMoveForce(-GetRight() * 30.0f);
-								} else if (lr > 0) {
-									m_pMyVehicle->ApplyMoveForce(GetRight() * 30.0f);
-								} else {
-									m_pMyVehicle->ApplyMoveForce(0.0f, 0.0f, 50.0f);
+					if (IsPlayer()) {
+						CPad* pad = CPad::GetPad(0);
+						if (!pad->ArePlayerControlsDisabled()) {
+							if (pad->GetHorn()) {
+								float c = Cos(m_fRotationCur);
+								float s = Sin(m_fRotationCur);
+								m_pMyVehicle->GetRight() = CVector(1.0f, 0.0f, 0.0f);
+								m_pMyVehicle->GetForward() = CVector(0.0f, 1.0f, 0.0f);
+								m_pMyVehicle->GetUp() = CVector(0.0f, 0.0f, 1.0f);
+								if (pad->GetAccelerate()) {
+									m_pMyVehicle->ApplyMoveForce(GetForward() * 30.0f);
+								}
+								else if (pad->GetBrake()) {
+									m_pMyVehicle->ApplyMoveForce(-GetForward() * 30.0f);
+								}
+								else {
+									int16 lr = pad->GetSteeringLeftRight();
+									if (lr < 0) {
+										//m_pMyVehicle->ApplyTurnForce(20.0f * -GetRight(), GetForward());
+										m_pMyVehicle->ApplyMoveForce(-GetRight() * 30.0f);
+									}
+									else if (lr > 0) {
+										m_pMyVehicle->ApplyMoveForce(GetRight() * 30.0f);
+									}
+									else {
+										m_pMyVehicle->ApplyMoveForce(0.0f, 0.0f, 50.0f);
+									}
 								}
 							}
 						}
 					}
 #endif
-					float steerAngle = m_pMyVehicle->m_fSteerAngle;
-					CAnimBlendAssociation *lDriveAssoc;
-					CAnimBlendAssociation *rDriveAssoc;
-					CAnimBlendAssociation *lbAssoc;
-					CAnimBlendAssociation *sitAssoc;
-					if (m_pMyVehicle->bLowVehicle) {
-						sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT);
-
-						if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
-							break;
-						}
 
-						lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_L);
-						lbAssoc = nil;
-						rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_R);
+					if (m_pMyVehicle->pDriver == this) {
+						DriveVehicle();
+						if (!m_pMyVehicle)
+							return;
 					} else {
-						sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT);
-
-						if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
-							break;
-						}
-
-						lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_L);
-						rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_R);
-						lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LB);
-
-						if (lbAssoc &&
-							TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON
-							&& TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_LEFT) {
-							lbAssoc->blendDelta = -1000.0f;
-						}
+						LookForSexyPeds();
+						LookForSexyCars();
 					}
-
-					CAnimBlendAssociation *driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_L);
-
-					if (!driveByAssoc)
-						driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_R);
-
-					if (m_pMyVehicle->bLowVehicle || m_pMyVehicle->m_fGasPedal >= 0.0f || driveByAssoc) {
-						if (steerAngle == 0.0f || driveByAssoc) {
-							if (lDriveAssoc)
-								lDriveAssoc->blendAmount = 0.0f;
-							if (rDriveAssoc)
-								rDriveAssoc->blendAmount = 0.0f;
-
-						} else if (steerAngle <= 0.0f) {
-							if (lDriveAssoc)
-								lDriveAssoc->blendAmount = 0.0f;
-
-							if (rDriveAssoc)
-								rDriveAssoc->blendAmount = clamp(steerAngle * -100.0f / 61.0f, 0.0f, 1.0f);
-							else if (m_pMyVehicle->bLowVehicle)
-								CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_R);
-							else
-								CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_R);
-
-						} else {
-							if (rDriveAssoc)
-								rDriveAssoc->blendAmount = 0.0f;
-
-							if (lDriveAssoc)
-								lDriveAssoc->blendAmount = clamp(steerAngle * 100.0f / 61.0f, 0.0f, 1.0f);
-							else if (m_pMyVehicle->bLowVehicle)
-								CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_L);
-							else
-								CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_L);
-						}
-
-						if (lbAssoc)
-							lbAssoc->blendDelta = -4.0f;
-					} else {
-
-						if ((TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON
-							|| TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking != LOOKING_LEFT)
-							&& (!lbAssoc || lbAssoc->blendAmount < 1.0f)) {
-							CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LB, 4.0f);
-						}
+					if (!IsPlayer() && m_pMyVehicle->IsBoat()
+						&& FindPlayerPed()->m_pCurrentPhysSurface == m_pMyVehicle
+						&& CharCreatedBy != MISSION_CHAR || !bIsPlayerFriend) {
+						SetObjective(OBJ_50, FindPlayerPed());
+						Say(SOUND_PED_CAR_JACKED);
 					}
+
 					break;
 				}
 				case PED_DIE:
@@ -10367,8 +11195,11 @@ CPed::ProcessControl(void)
 				default: break;
 			}
 			SetMoveAnim();
-			if (bPedIsBleeding) {
+			if (bPedIsBleeding || m_bleedCounter != 0) {
 				if (CGame::nastyGame) {
+					if (m_bleedCounter != 0)
+						m_bleedCounter--;
+
 					if (!(CTimer::GetFrameCounter() & 3)) {
 						CVector cameraDist = GetPosition() - TheCamera.GetPosition();
 						if (cameraDist.MagnitudeSqr() < sq(50.0f)) {
@@ -10399,9 +11230,11 @@ CPed::ProcessControl(void)
 			}
 			m_pCurrentPhysSurface = nil;
 		}
-	}
+	} else
+		ServiceTalking();
 }
 
+// --MIAMI: Done
 void
 CPed::SetInTheAir(void)
 {
@@ -10420,26 +11253,52 @@ CPed::SetInTheAir(void)
 
 }
 
+// --MIAMI: Done
 void
 CPed::RestoreHeadPosition(void)
 {
+	// TODO(Miami): This is inlined CanUseTorsoWhenLooking
+	bool canUseMyBody = false;
+	if (m_nPedState != PED_DRIVING && m_nPedState != PED_DRAG_FROM_CAR && !bIsDucking) {
+		if (m_animGroup != ASSOCGRP_SEXYWOMAN && m_animGroup != ASSOCGRP_WOMAN)
+			canUseMyBody = true;
+	}
+	if (!canUseMyBody)
+		m_pedIK.m_flags |= CPedIK::LOOKAROUND_HEAD_ONLY;
+
 	if (m_pedIK.RestoreLookAt()) {
 		bIsRestoringLook = false;
+		canUseMyBody = false;
+		if (m_nPedState != PED_DRIVING && m_nPedState != PED_DRAG_FROM_CAR && !bIsDucking) {
+			if (m_animGroup != ASSOCGRP_SEXYWOMAN && m_animGroup != ASSOCGRP_WOMAN)
+				canUseMyBody = true;
+		}
+		if(canUseMyBody)
+			m_pedIK.m_flags &= ~CPedIK::LOOKAROUND_HEAD_ONLY;
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::PointGunAt(void)
 {
 	CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weaponInfo->m_AnimToPlay);
-	if (!weaponAssoc || weaponAssoc->blendDelta < 0.0f)
-		weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), weaponInfo->m_Anim2ToPlay);
+	float animLoopStart = weaponInfo->m_fAnimLoopStart;
+	CAnimBlendAssociation *weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_FIRE);
+	if (!weaponAssoc || weaponAssoc->blendDelta < 0.0f) {
+		if (!!weaponInfo->m_bCrouchFire) {
+			weaponAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weaponInfo));
+			animLoopStart = weaponInfo->m_fAnim2LoopStart;
+		}
+	}
 
-	if (weaponAssoc && weaponAssoc->currentTime > weaponInfo->m_fAnimLoopStart) {
-		weaponAssoc->SetCurrentTime(weaponInfo->m_fAnimLoopStart);
+	if (weaponAssoc && weaponAssoc->currentTime > animLoopStart * 0.4f) {
+		weaponAssoc->SetCurrentTime(animLoopStart);
 		weaponAssoc->flags &= ~ASSOC_RUNNING;
 
+		if (bIsDucking)
+			m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
+
 		if (weaponInfo->m_bCanAimWithArm)
 			m_pedIK.m_flags |= CPedIK::AIMS_WITH_ARM;
 		else
@@ -10618,28 +11477,26 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
 		isVan = false;
 
 	if (ped->m_nPedState != PED_CARJACK || isBus) {
-		AnimationId animToPlay;
 		if (ped->m_vehEnterType != CAR_DOOR_LF && ped->m_vehEnterType != CAR_DOOR_LR) {
 
 			if (isVan) {
-				animToPlay = ANIM_VAN_GETIN;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN);
 			} else if (isBus) {
-				animToPlay = ANIM_COACH_IN_R;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_R);
 			} else if (isLow) {
-				animToPlay = ANIM_CAR_GETIN_LOW_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_RHS);
 			} else {
-				animToPlay = ANIM_CAR_GETIN_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_RHS);
 			}
 		} else if (isVan) {
-			animToPlay = ANIM_VAN_GETIN_L;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETIN_L);
 		} else if (isBus) {
-			animToPlay = ANIM_COACH_IN_L;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_COACH, ANIM_COACH_IN_L);
 		} else if (isLow) {
-			animToPlay = ANIM_CAR_GETIN_LOW_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LOW_LHS);
 		} else {
-			animToPlay = ANIM_CAR_GETIN_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_GETIN_LHS);
 		}
-		ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, animToPlay);
 		ped->m_pVehicleAnim->SetFinishCallback(PedAnimGetInCB, ped);
 	} else {
 		CPed *pedToDragOut = nil;
@@ -10742,51 +11599,17 @@ CPed::SetJump(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::RemoveInCarAnims(void)
 {
-	if (!IsPlayer())
-		return;
-
-	CAnimBlendAssociation *animAssoc;
+	CAnimBlendAssociation* assoc;
 
-	if (m_pMyVehicle && m_pMyVehicle->bLowVehicle) {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_L);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_R);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_L);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_R);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-	} else {
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_L);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_R);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_L);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
-		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_R);
-		if (animAssoc)
-			animAssoc->blendDelta = -1000.0f;
+	for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_DRIVING); assoc;
+		assoc = RpAnimBlendGetNextAssociation(assoc, ASSOC_DRIVING)) {
+		assoc->flags |= ASSOC_DELETEFADEDOUT;
+		assoc->blendDelta = -1000.0f;
 	}
-
-#ifdef VC_PED_PORTS
-	animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT);
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
-#endif
-
-	animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LB);
-	if (animAssoc)
-		animAssoc->blendDelta = -1000.0f;
 }
 
 void
@@ -10908,32 +11731,32 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 	if (veh->IsDoorMissing(enterDoor) || isBus) {
 		PedAnimDoorCloseCB(nil, ped);
 	} else {
-		AnimationId animToPlay;
 		if (enterDoor != DOOR_FRONT_LEFT && enterDoor != DOOR_REAR_LEFT) {
 			if (isVan) {
-				animToPlay = ANIM_VAN_CLOSE;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_CLOSE);
 			} else if (isLow) {
-				animToPlay = ANIM_CAR_CLOSEDOOR_LOW_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LOW_RHS);
 			} else {
-				animToPlay = ANIM_CAR_CLOSEDOOR_RHS;
+				ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_RHS);
 			}
 		} else if (isVan) {
-			animToPlay = ANIM_VAN_CLOSE_L;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_VAN, ANIM_VAN_CLOSE_L);
 		} else if (isLow) {
-			animToPlay = ANIM_CAR_CLOSEDOOR_LOW_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LOW_LHS);
 		} else {
-			animToPlay = ANIM_CAR_CLOSEDOOR_LHS;
+			ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_CLOSEDOOR_LHS);
 		}
-		ped->m_pVehicleAnim = CAnimManager::AddAnimation(ped->GetClump(), ASSOCGRP_STD, animToPlay);
 		ped->m_pVehicleAnim->SetFinishCallback(PedAnimDoorCloseCB, ped);
 	}
 }
 
+#ifdef GTA_TRAIN
 void
 CPed::SetPedPositionInTrain(void)
 {
 	LineUpPedWithTrain();
 }
+#endif
 
 void
 CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
@@ -11530,19 +12353,7 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 			ped->SetObjective(OBJECTIVE_NONE);
 	}
 
-	if (veh->pDriver == ped) {
-		if (veh->bLowVehicle) {
-			ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(),	ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f);
-		} else {
-			ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-		}
-	} else if (veh->bLowVehicle) {
-		ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_SITPLO, 100.0f);
-	} else {
-		ped->m_pVehicleAnim = CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_CAR_SITP, 100.0f);
-	}
-	
-	ped->StopNonPartialAnims();
+	ped->AddInCarAnims(veh, veh->pDriver == ped);
 	if (veh->bIsBus)
 		ped->bRenderPedInCar = false;
 
@@ -11654,7 +12465,7 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker)
 	}
 
 	if (attackerPed && attackerPed->IsPlayer() && (attackerPed->m_nPedState == PED_CARJACK || attackerPed->bInVehicle)) {
-		if (!attackerPed->m_pMyVehicle || attackerPed->m_pMyVehicle->GetModelIndex() != MI_TOYZ) {
+		if (!attackerPed->m_pMyVehicle || attackerPed->m_pMyVehicle->GetModelIndex() != MI_TOPFUN) {
 			int16 lastVehicle;
 			CEntity *vehicles[8];
 			CWorld::FindObjectsInRange(GetPosition(), 30.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
@@ -11784,12 +12595,10 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 
 	if (ped->m_objective == OBJECTIVE_LEAVE_VEHICLE)
 		ped->RestorePreviousObjective();
-#ifdef VC_PED_PORTS
 	else if (ped->m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) {
 		ped->m_fHealth = 0.0f;
 		ped->SetDie(ANIM_FLOOR_HIT, 4.0f, 0.5f);
 	}
-#endif
 
 	ped->bInVehicle = false;
 	if (veh && veh->IsCar() && !veh->IsRoomForPedToLeaveCar(ped->m_vehEnterType, nil)) {
@@ -11849,7 +12658,7 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 		}
 	}
 #ifdef VC_PED_PORTS
-	else {
+	else if (ped->m_nPedState == PED_DRIVING) {
 		ped->m_nPedState = PED_IDLE;
 	}
 #endif
@@ -11930,14 +12739,14 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// It was inlined in III but not in VC.
-inline void
+// --MIAMI: Done, but enumarate weapon slots
+void
 CPed::ReplaceWeaponWhenExitingVehicle(void)
 {
 	eWeaponType weaponType = GetWeapon()->m_eWeaponType;
 
 	// If it's Uzi, we may have stored weapon. Uzi is the only gun we can use in car.
-	if (IsPlayer() && weaponType == WEAPONTYPE_UZI) {
+	if (IsPlayer() && GetWeaponSlot(weaponType) == 5) {
 		if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
 			SetCurrentWeapon(m_storedWeapon);
 			m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
@@ -11947,14 +12756,14 @@ CPed::ReplaceWeaponWhenExitingVehicle(void)
 	}
 }
 
-// Same, it's inlined in III.
-inline void
+// --MIAMI: Done
+void
 CPed::RemoveWeaponWhenEnteringVehicle(void)
 {
-	if (IsPlayer() && HasWeapon(WEAPONTYPE_UZI) && GetWeapon(WEAPONTYPE_UZI).m_nAmmoTotal > 0) {
+	if (IsPlayer() && HasWeaponSlot(5) && GetWeapon(5).m_nAmmoTotal > 0 && ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed()->m_bDriveByAllowed) {
 		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
 			m_storedWeapon = GetWeapon()->m_eWeaponType;
-		SetCurrentWeapon(WEAPONTYPE_UZI);
+		SetCurrentWeapon(GetWeapon(5).m_eWeaponType);
 	} else {
 		CWeaponInfo *ourWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
 		RemoveWeaponModel(ourWeapon->m_nModelId);
@@ -12348,13 +13157,7 @@ CPed::Render(void)
 		bRenderPedInCar && sq(25.0f * TheCamera.LODDistMultiplier) >= (TheCamera.GetPosition() - GetPosition()).MagnitudeSqr()) {
 		CEntity::Render();
 
-#ifdef PED_SKIN
-		if(IsClumpSkinned(GetClump())){
-			renderLimb(PED_HEAD);
-			renderLimb(PED_HANDL);
-			renderLimb(PED_HANDR);
-		}
-		if(m_pWeaponModel && IsClumpSkinned(GetClump())){
+		if(m_pWeaponModel){
 			RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
 			int idx = RpHAnimIDGetIndex(hier, m_pFrames[PED_HANDR]->nodeID);
 			RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
@@ -12363,51 +13166,9 @@ CPed::Render(void)
 			RwFrameUpdateObjects(frame);
 			RpAtomicRender(m_pWeaponModel);
 		}
-#endif
 	}
 }
 
-#ifdef PED_SKIN
-static RpMaterial*
-SetLimbAlphaCB(RpMaterial *material, void *data)
-{
-	((RwRGBA*)RpMaterialGetColor(material))->alpha = *(uint8*)data;
-	return material;
-}
-
-void
-CPed::renderLimb(int node)
-{
-	RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-	int idx = RpHAnimIDGetIndex(hier, m_pFrames[node]->nodeID);
-	RwMatrix *mat = &RpHAnimHierarchyGetMatrixArray(hier)[idx];
-	CPedModelInfo *mi = (CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex());
-	RpAtomic *atomic;
-	switch(node){
-	case PED_HEAD:
-		atomic = mi->getHead();
-		break;
-	case PED_HANDL:
-		atomic = mi->getLeftHand();
-		break;
-	case PED_HANDR:
-		atomic = mi->getRightHand();
-		break;
-	default:
-		return;
-	}
-	if(atomic == nil)
-		return;
-
-	RwFrame *frame = RpAtomicGetFrame(atomic);
-	*RwFrameGetMatrix(frame) = *mat;
-	RwFrameUpdateObjects(frame);
-	int alpha = CVisibilityPlugins::GetClumpAlpha(GetClump());
-	RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), SetLimbAlphaCB, &alpha);
-	RpAtomicRender(atomic);
-}
-#endif
-
 void
 CPed::ProcessObjective(void)
 {
@@ -12450,14 +13211,26 @@ CPed::ProcessObjective(void)
 			case OBJECTIVE_FOLLOW_CAR_IN_CAR:
 			case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE:
 			case OBJECTIVE_DESTROY_OBJ:
-			case OBJECTIVE_23:
-			case OBJECTIVE_24:
+			case OBJECTIVE_26:
+			case OBJECTIVE_27:
 			case OBJECTIVE_SET_LEADER:
 				break;
 			case OBJECTIVE_IDLE:
-				SetIdle();
-				m_objective = OBJECTIVE_NONE;
-				SetMoveState(PEDMOVE_STILL);
+				if (GetPedState() == PED_DRIVING)
+					m_objective = OBJECTIVE_NONE;
+				else {
+					SetIdle();
+					if (m_attractor) {
+						if (m_objectiveTimer && CTimer::GetTimeInMilliseconds() > m_nWaitTimer) {
+							GetPedAttractorManager()->BroadcastDeparture(this, m_attractor);
+							m_objectiveTimer = 0;
+						}
+					}
+					else {
+						m_objective = OBJECTIVE_NONE;
+						SetMoveState(PEDMOVE_STILL);
+					}
+				}
 				break;
 			case OBJECTIVE_FLEE_TILL_SAFE:
 				if (InVehicle()) {
@@ -12535,7 +13308,8 @@ CPed::ProcessObjective(void)
 						} else {
 							bool targetHasVeh = m_pedInObjective->bInVehicle;
 							if (!targetHasVeh
-								|| targetHasVeh && m_pedInObjective->m_pMyVehicle->CanPedExitCar()) {
+// TODO(MIAMI): argument
+								|| targetHasVeh && m_pedInObjective->m_pMyVehicle->CanPedExitCar(false)) {
 								m_pMyVehicle->AutoPilot.m_nCruiseSpeed = 0;
 								m_pMyVehicle->AutoPilot.m_nCarMission = MISSION_NONE;
 								SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
@@ -12587,8 +13361,8 @@ CPed::ProcessObjective(void)
 										int chosenModel = CCarCtrl::ChooseModel(&zoneInfo, &ourPos, &chosenCarClass);
 										CAutomobile *newVeh = new CAutomobile(chosenModel, RANDOM_VEHICLE);
 										if (newVeh) {
-										    newVeh->GetMatrix().GetPosition() = ThePaths.m_pathNodes[closestNode].GetPosition();
-										    newVeh->GetMatrix().GetPosition().z += 4.0f;
+											newVeh->GetMatrix().GetPosition() = ThePaths.m_pathNodes[closestNode].GetPosition();
+											newVeh->GetMatrix().GetPosition().z += 4.0f;
 											newVeh->SetHeading(DEGTORAD(200.0f));
 											newVeh->SetStatus(STATUS_ABANDONED);
 											newVeh->m_nDoorLock = CARLOCK_UNLOCKED;
@@ -12838,7 +13612,7 @@ CPed::ProcessObjective(void)
 						CVector target;
 						CVector ourHead = GetMatrix() * CVector(0.5f, 0.0f, 0.6f);
 						if (m_pedInObjective->IsPed())
-							m_pedInObjective->m_pedIK.GetComponentPosition((RwV3d*)&target, PED_MID);
+							m_pedInObjective->m_pedIK.GetComponentPosition(*(RwV3d *)&target, PED_MID);
 						else
 							target = m_pedInObjective->GetPosition();
 
@@ -13515,14 +14289,14 @@ CPed::ProcessObjective(void)
 					float distWithTargetScSqr = distWithTarget.MagnitudeSqr();
 					if (distWithTargetScSqr <= sq(10.0f)) {
 						if (distWithTargetScSqr <= sq(1.4f)) {
-							CAnimBlendAssociation *reloadAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_AK_RELOAD);
+							CAnimBlendAssociation *reloadAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FUCKU);
 							m_fRotationDest = CGeneral::GetRadianAngleBetweenPoints(
 								m_pedInObjective->GetPosition().x, m_pedInObjective->GetPosition().y,
 								GetPosition().x, GetPosition().y);
 
 							if (reloadAssoc || !m_pedInObjective->IsPedShootable()) {
 								if (reloadAssoc &&
-									(!reloadAssoc->IsRunning() || reloadAssoc->currentTime / reloadAssoc->hierarchy->totalLength > 0.8f)) {
+									(!reloadAssoc->IsRunning() || reloadAssoc->GetProgress() > 0.8f)) {
 									CAnimBlendAssociation *punchAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FIGHT_PPUNCH, 8.0f);
 									punchAssoc->flags |= ASSOC_DELETEFADEDOUT;
 									punchAssoc->flags |= ASSOC_FADEOUTWHENDONE;
@@ -13552,7 +14326,7 @@ CPed::ProcessObjective(void)
 								if (weaponType != WEAPONTYPE_UNARMED && weaponType != WEAPONTYPE_BASEBALLBAT)
 									SetCurrentWeapon(WEAPONTYPE_UNARMED);
 
-								CAnimBlendAssociation *newReloadAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_AK_RELOAD, 8.0f);
+								CAnimBlendAssociation *newReloadAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FUCKU, 8.0f);
 								newReloadAssoc->flags |= ASSOC_DELETEFADEDOUT;
 								newReloadAssoc->flags |= ASSOC_FADEOUTWHENDONE;
 							}
@@ -13585,23 +14359,21 @@ CPed::ProcessObjective(void)
 			case OBJECTIVE_LEAVE_VEHICLE:
 				if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer) {
 					if (InVehicle()
-#ifdef VC_PED_PORTS
 						&& (FindPlayerPed() != this || !CPad::GetPad(0)->GetAccelerate()
 							|| bBusJacked)
-#endif
 						) {
 						if (m_nPedState != PED_EXIT_CAR && m_nPedState != PED_DRAG_FROM_CAR && m_nPedState != PED_EXIT_TRAIN
 							&& (m_nPedType != PEDTYPE_COP
-#ifdef VC_PED_PORTS
 								|| m_pMyVehicle->IsBoat()
-#endif
 								|| m_pMyVehicle->m_vecMoveSpeed.MagnitudeSqr2D() < sq(0.005f))) {
+#ifdef GTA_TRAIN
 							if (m_pMyVehicle->IsTrain())
 								SetExitTrain(m_pMyVehicle);
-#ifdef VC_PED_PORTS
-							else if (m_pMyVehicle->IsBoat())
-								SetExitBoat(m_pMyVehicle);
+							else
 #endif
+							if (m_pMyVehicle->IsBoat())
+								SetExitBoat(m_pMyVehicle);
+
 							else
 								SetExitCar(m_pMyVehicle, 0);
 						}
@@ -13638,6 +14410,187 @@ CPed::ProcessObjective(void)
 				}
 				break;
 			}
+			case OBJECTIVE_USE_SEAT_ATTRACTOR:
+			case OBJECTIVE_USE_ATM_ATTRACTOR:
+			case OBJECTIVE_USE_STOP_ATTRACTOR:
+			case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+			case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+			case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
+				if (CTimer::GetTimeInMilliseconds() > m_objectiveTimer) {
+					m_objectiveTimer = 0;
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+				}
+				else {
+					CVector distance = m_nextRoutePointPos - GetPosition();
+					distance.z = 0.0f;
+					if (m_objective == OBJECTIVE_USE_SHELTER_ATTRACTOR) {
+						if (m_nMoveState == PEDMOVE_SPRINT && distance.Magnitude() < SQR(2.0f)) {
+							SetMoveState(PEDMOVE_WALK);
+							bIsRunning = false;
+						}
+						else if (CWeather::Rain < 0.2f && m_attractor) {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							return;
+						}
+					}
+					else if (m_objective == OBJECTIVE_USE_ICECREAM_ATTRACTOR) {
+						if (m_nMoveState == PEDMOVE_SPRINT && distance.Magnitude() < SQR(4.0f)) {
+							SetMoveState(PEDMOVE_WALK);
+							bIsRunning = false;
+						}
+						CVehicle* pIceCreamVan = GetPedAttractorManager()->GetIceCreamVanForEffect(m_attractor->GetEffect());
+						if (0.01f * CTimer::GetTimeStep() * 5.0f < pIceCreamVan->m_fDistanceTravelled) {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							return;
+						}
+						if (!pIceCreamVan->pDriver ||
+							!pIceCreamVan->pDriver->IsPlayer() ||
+							pIceCreamVan->pDriver->GetPedState() == PED_ARRESTED ||
+							pIceCreamVan->pDriver->GetPedState() == PED_DEAD) {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							return;
+						}
+						if (!pIceCreamVan->m_bSirenOrAlarm) {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							return;
+						}
+						if (pIceCreamVan->GetStatus() == STATUS_WRECKED) {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							return;
+						}
+					}
+					if (sq(m_distanceToCountSeekDone) < distance.MagnitudeSqr()) {
+						if (CTimer::GetTimeInMilliseconds() > m_nPedStateTimer || GetPedState() != PED_SEEK_POS)
+							SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
+					}
+					else {
+						if (!bReachedAttractorHeadingTarget) {
+							float fHeadingDistance = m_fRotationCur - m_attractorHeading;
+							float fSinHeading = Sin(fHeadingDistance);
+							float fCosHeading = Cos(fHeadingDistance);
+							if (fSinHeading > 0.0f) {
+								if (fCosHeading > 0.0f)
+									m_attractorHeading = m_fRotationCur - Asin(fSinHeading);
+								else
+									m_attractorHeading = m_fRotationCur - Acos(fCosHeading);
+							}
+							else {
+								if (fCosHeading > 0.0f)
+									m_attractorHeading = m_fRotationCur - Asin(fSinHeading);
+								else
+									m_attractorHeading = m_fRotationCur + Acos(fCosHeading);
+							}
+							m_fRotationDest = m_attractorHeading;
+							m_headingRate = 3.5f;
+							bReachedAttractorHeadingTarget = true;
+							bTurnedAroundOnAttractor = false;
+						}
+						if (Abs(m_fRotationCur - m_attractorHeading) >= m_acceptableHeadingOffset &&
+							Abs(m_fRotationCur - m_attractorHeading + TWOPI) >= m_acceptableHeadingOffset &&
+							Abs(m_fRotationCur - m_attractorHeading - TWOPI) >= m_acceptableHeadingOffset)
+							SetMoveState(PEDMOVE_STILL);
+						else {
+							m_fRotationDest = m_fRotationCur;
+							bReachedAttractorHeadingTarget = false;
+							bObjectiveCompleted = true;
+							bScriptObjectiveCompleted = true;
+							RestoreHeadingRate();
+							GetPedAttractorManager()->BroadcastArrival(this, m_attractor);
+							if (GetPedAttractorManager()->IsAtHeadOfQueue(this, m_attractor)) {
+								switch (m_objective) {
+								case OBJECTIVE_USE_SEAT_ATTRACTOR:
+									if (!bTurnedAroundOnAttractor) {
+										ClearObjective();
+										SetWaitState(WAITSTATE_SIT_DOWN, 0);
+									}
+									else {
+										ClearObjective();
+										SetWaitState(WAITSTATE_SIT_DOWN_RVRS, 0);
+									}
+									break;
+								case OBJECTIVE_USE_ATM_ATTRACTOR:
+									ClearObjective();
+									SetWaitState(WAITSTATE_USE_ATM, 0);
+									break;
+								case OBJECTIVE_USE_STOP_ATTRACTOR:
+									ClearObjective();
+									SetObjective(OBJECTIVE_WAIT_FOR_BUS);
+									break;
+								case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+									ClearObjective();
+									m_prevObjective = OBJECTIVE_NONE;
+									SetObjective(OBJECTIVE_IDLE);
+									m_objectiveTimer = CTimer::GetTimeInMilliseconds() + m_attractor->GetHeadOfQueueWaitTime();
+									break;
+								case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+									m_prevObjective = OBJECTIVE_NONE;
+									SetObjective(OBJECTIVE_WAIT_FOR_RAIN_TO_END);
+									break;
+								case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
+									m_prevObjective = OBJECTIVE_NONE;
+									SetObjective(OBJECTIVE_PURCHASE_ICECREAM);
+									break;
+								}
+							}
+						}
+					}
+				}
+				return;
+			case OBJECTIVE_WAIT_FOR_RAIN_TO_END:
+				SetIdle();
+				if (m_attractor && CWeather::Rain < 0.2f)
+					GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+				break;
+			case OBJECTIVE_WAIT_FOR_BUS:
+				SetIdle();
+				if (m_attractor) {
+					float left = GetPosition().x - 10.0f;
+					float right = GetPosition().x + 10.0f;
+					float top = GetPosition().y - 10.0f;
+					float bottom = GetPosition().y + 10.0f;
+					int xstart = Max(0, CWorld::GetSectorIndexX(left));
+					int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(right));
+					int ystart = Max(0, CWorld::GetSectorIndexY(top));
+					int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(bottom));
+					assert(xstart <= xend);
+					assert(ystart <= yend);
+
+					float minDistance = SQR(10.0f);
+					CVehicle* pBus = nil;
+
+					for (int y = ystart; y <= yend; y++) {
+						for (int x = xstart; x <= xend; x++) {
+							CSector* s = CWorld::GetSector(x, y);
+							for (CPtrNode* pNode = s->m_lists[ENTITYLIST_VEHICLES].first; pNode != nil; pNode = pNode->next) {
+								CEntity* pEntity = (CEntity*)pNode->item;
+								if (!pEntity->IsVehicle())
+									continue;
+								CVehicle* pVehicle = (CVehicle*)pEntity;
+								if (!pVehicle->bIsBus)
+									continue;
+								if (pVehicle->GetMoveSpeed().MagnitudeSqr() >= SQR(0.005f))
+									continue;
+								float distanceSq = (GetPosition() - pVehicle->GetPosition()).MagnitudeSqr();
+								if (distanceSq < minDistance) {
+									minDistance = distanceSq;
+									pBus = pVehicle;
+								}
+							}
+						}
+					}
+
+					if (pBus) {
+						if (pBus->m_nNumPassengers >= pBus->m_nNumMaxPassengers - 1)
+							SetObjective(OBJECTIVE_IDLE);
+						else {
+							GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+							SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, pBus);
+							bDontDragMeOutCar = true; // TODO(MIAMI): check, add more flags
+						}
+					}
+				}
+				break;
 #endif
 		}
 		if (bObjectiveCompleted
@@ -13705,6 +14658,7 @@ CPed::SetSeekBoatPosition(CVehicle *boat)
 	m_nPedState = PED_SEEK_IN_BOAT;
 }
 
+#ifdef GTA_TRAIN
 void
 CPed::SetExitTrain(CVehicle* train)
 {
@@ -13722,6 +14676,7 @@ CPed::SetExitTrain(CVehicle* train)
 	bUsesCollision = false;
 	LineUpPedWithTrain();
 }
+#endif
 
 #ifdef NEW_WALK_AROUND_ALGORITHM
 CVector
@@ -14366,10 +15321,10 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 				if (CCollision::IsStoredPolyStillValidVerticalLine(pos, potentialGroundZ, intersectionPoint, &m_collPoly)) {
 					bStillOnValidPoly = true;
 #ifdef VC_PED_PORTS
-					if(!bSomeVCflag1 || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
+					if(!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
 						GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
-						if (bSomeVCflag1)
-							bSomeVCflag1 = false;
+						if (bHeadStuckInCollision)
+							bHeadStuckInCollision = false;
 					}
 #else
 					GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
@@ -14409,13 +15364,13 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 				}
 				float minDist = 1.0f;
 				belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
-					intersectionPoint, minDist, false, &m_collPoly);
+					intersectionPoint, minDist, false, false, &m_collPoly);
 
 				if (collidedWithBoat && bWasStanding && !belowTorsoCollided) {
 					ourLine.p0.z = ourLine.p1.z;
 					ourLine.p1.z = ourLine.p1.z + gravityEffect;
 					belowTorsoCollided = CCollision::ProcessVerticalLine(ourLine, collidingEnt->GetMatrix(), *hisCol,
-						intersectionPoint, minDist, false, &m_collPoly);
+						intersectionPoint, minDist, false, false, &m_collPoly);
 				}
 				if (belowTorsoCollided) {
 #ifndef VC_PED_PORTS
@@ -14444,13 +15399,13 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 								}
 							}
 #ifdef VC_PED_PORTS
-							if (!bSomeVCflag1 || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
+							if (!bHeadStuckInCollision || FEET_OFFSET + intersectionPoint.point.z < GetPosition().z) {
 								GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
-								if (bSomeVCflag1)
-									bSomeVCflag1 = false;
+								if (bHeadStuckInCollision)
+									bHeadStuckInCollision = false;
 							}
 #else
-						    GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
+							GetMatrix().GetPosition().z = FEET_OFFSET + intersectionPoint.point.z;
 #endif
 							m_nSurfaceTouched = intersectionPoint.surfaceB;
 							if (m_nSurfaceTouched == SURFACE_STEEP_CLIFF) {
@@ -14458,8 +15413,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 								m_vecDamageNormal = intersectionPoint.normal;
 							}
 						}
-						// VC code is working perfectly, but we don't want mega jumps to damage us significantly :shrug:
-#if 0 // #ifdef VC_PED_PORTS
+
 						float upperSpeedLimit = 0.33f;
 						float lowerSpeedLimit = -0.25f;
 						float speed = m_vecMoveSpeed.Magnitude2D();
@@ -14467,7 +15421,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 							upperSpeedLimit *= 2.0f;
 							lowerSpeedLimit *= 1.5f;
 						}
-						if (!m_ped_flagA2) {
+						if (!bWasStanding) {
 							if ((speed <= upperSpeedLimit /* || (bfFlagsL >> 5) & 1 */) && m_vecMoveSpeed.z >= lowerSpeedLimit
 								|| m_pCollidingEntity == collidingEnt) {
 
@@ -14490,27 +15444,6 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 									Say(SOUND_PED_LAND);
 							}
 						}
-#else
-						float speedSqr = 0.0f;
-						if (!bWasStanding) {
-							if (m_vecMoveSpeed.z >= -0.25f && (speedSqr = m_vecMoveSpeed.MagnitudeSqr()) <= sq(0.5f)) {
-
-								if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_FALL) && -0.016f * CTimer::GetTimeStep() > m_vecMoveSpeed.z) {
-									InflictDamage(collidingEnt, WEAPONTYPE_FALL, 15.0f, PEDPIECE_TORSO, 2);
-								}
-							} else {
-								if (speedSqr == 0.0f)
-									speedSqr = sq(m_vecMoveSpeed.z);
-
-								uint8 dir = 2; // from backward
-								if (m_vecMoveSpeed.x > 0.01f || m_vecMoveSpeed.x < -0.01f || m_vecMoveSpeed.y > 0.01f || m_vecMoveSpeed.y < -0.01f) {
-									CVector2D offset = -m_vecMoveSpeed;
-									dir = GetLocalDirection(offset);
-								}
-								InflictDamage(collidingEnt, WEAPONTYPE_FALL, 350.0f * sq(speedSqr), PEDPIECE_TORSO, dir);
-							}
-						}
-#endif
 						m_vecMoveSpeed.z = 0.0f;
 						bIsStanding = true;
 #ifndef VC_PED_PORTS
@@ -14556,7 +15489,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 					sphereNormal.x = -m_vecMoveSpeed.x / Max(0.001f, speed);
 					sphereNormal.y = -m_vecMoveSpeed.y / Max(0.001f, speed);
 					GetMatrix().GetPosition().z -= 0.05f;
-					bSomeVCflag1 = true;
+					bHeadStuckInCollision = true;
 				}
 #endif
 				sphereNormal.Normalise();
@@ -14618,6 +15551,7 @@ CPed::WanderRange(void)
 	}
 }
 
+// --MIAMI: Done
 bool
 CPed::WillChat(CPed *stranger)
 {
@@ -14634,11 +15568,16 @@ CPed::WillChat(CPed *stranger)
 		return true;
 	if (m_nPedType == PEDTYPE_CRIMINAL)
 		return false;
+	if (stranger->m_nPedType == PEDTYPE_COP)
+		return false;
+	if (stranger->IsPlayer())
+		return false;
 	if ((IsGangMember() || stranger->IsGangMember()) && m_nPedType != stranger->m_nPedType)
 		return false;
 	return true;
 }
 
+#ifdef GTA_TRAIN
 void
 CPed::SetEnterTrain(CVehicle *train, uint32 unused)
 {
@@ -14664,20 +15603,24 @@ CPed::SetEnterTrain(CVehicle *train, uint32 unused)
 			((CPlayerPed*)this)->ClearAdrenaline();
 	}
 }
+#endif
 
+// --MIAMI: Done, but what is this parameter for?
 void
-CPed::SetDuck(uint32 time)
+CPed::SetDuck(uint32 time, bool sth)
 {
-	if (bIsDucking || CTimer::GetTimeInMilliseconds() <= m_duckTimer)
+	if (bIsDucking || CTimer::GetTimeInMilliseconds() <= m_duckTimer && !sth) {
+		if (sth && CTimer::GetTimeInMilliseconds() + time > m_duckTimer)
+			m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
 		return;
+	}
 
-	if (bCrouchWhenShooting && (m_nPedState == PED_ATTACK || m_nPedState == PED_AIM_GUN)) {
-		CAnimBlendAssociation *duckAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_LOW);
-		if (!duckAssoc || duckAssoc->blendDelta < 0.0f) {
-			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DUCK_LOW, 4.0f);
-			bIsDucking = true;
-			m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
-		}
+	CAnimBlendAssociation *duckAssoc;
+	if (bCrouchWhenShooting) {
+		duckAssoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_WEAPON_CROUCH, 4.0f);
+		duckAssoc->flags &= ~ASSOC_FADEOUTWHENDONE;
+		bIsDucking = true;
+		m_duckTimer = CTimer::GetTimeInMilliseconds() + time;
 	} else {
 		CAnimBlendAssociation *duckAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DUCK_DOWN);
 		if (!duckAssoc || duckAssoc->blendDelta < 0.0f) {
@@ -14752,17 +15695,18 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
 void
 CPed::SetRadioStation(void)
 {
+	// TODO: this should be gone
 	static const uint8 radiosPerRadioCategories[10][4] = {
-		{JAH_RADIO, RISE_FM, GAME_FM, MSX_FM},
-		{HEAD_RADIO, DOUBLE_CLEF, LIPS_106, FLASHBACK},
-		{RISE_FM, GAME_FM, MSX_FM, FLASHBACK},
-		{HEAD_RADIO, RISE_FM, LIPS_106, MSX_FM},
-		{HEAD_RADIO, RISE_FM, MSX_FM, FLASHBACK},
-		{JAH_RADIO, RISE_FM, LIPS_106, FLASHBACK},
-		{HEAD_RADIO, RISE_FM, LIPS_106, FLASHBACK},
-		{HEAD_RADIO, JAH_RADIO, LIPS_106, FLASHBACK},
-		{HEAD_RADIO, DOUBLE_CLEF, LIPS_106, FLASHBACK},
-		{CHATTERBOX, HEAD_RADIO, LIPS_106, GAME_FM}
+		{KCHAT, FEVER, VCPR, RADIO_ESPANTOSO},
+		{WILDSTYLE, FLASH_FM, V_ROCK, EMOTION},
+		{FEVER, VCPR, RADIO_ESPANTOSO, EMOTION},
+		{WILDSTYLE, FEVER, V_ROCK, RADIO_ESPANTOSO},
+		{WILDSTYLE, FEVER, RADIO_ESPANTOSO, EMOTION},
+		{KCHAT, FEVER, V_ROCK, EMOTION},
+		{WILDSTYLE, FEVER, V_ROCK, EMOTION},
+		{WILDSTYLE, KCHAT, V_ROCK, EMOTION},
+		{WILDSTYLE, FLASH_FM, V_ROCK, EMOTION},
+		{WAVE, WILDSTYLE, V_ROCK, VCPR}
 	};
 	uint8 orderInCat = 0; // BUG: this wasn't initialized
 
@@ -14961,6 +15905,7 @@ CPed::ProcessBuoyancy(void)
 				m_vecMoveSpeed.y *= speedMult;
 				m_vecMoveSpeed.z *= speedMult;
 				bIsStanding = false;
+				bIsDrowning = true;
 				InflictDamage(nil, WEAPONTYPE_DROWNING, 3.0f * CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
 			}
 			if (buoyancyImpulse.z / m_fMass > 0.002f * CTimer::GetTimeStep()) {
@@ -15073,8 +16018,9 @@ CPed::SetSolicit(uint32 time)
 }
 
 bool
-CPed::SetFollowPath(CVector dest)
+CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* pFollowedPed, CEntity*, int time)
 {
+	// TODO(MIAMI): new follow
 	if (m_nPedState == PED_FOLLOW_PATH)
 		return false;
 
@@ -15136,7 +16082,8 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 	uint32 optedDoorNode = wantedDoorNode;
 	bool teleportNeeded = false;
 	bool isLow = !!veh->bLowVehicle;
-	if (!veh->CanPedExitCar()) {
+// TODO(MIAMI): argument
+	if (!veh->CanPedExitCar(false)) {
 		if (veh->pDriver && !veh->pDriver->IsPlayer()) {
 			veh->AutoPilot.m_nCruiseSpeed = 0;
 			veh->AutoPilot.m_nCarMission = MISSION_NONE;
@@ -15209,6 +16156,12 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 		return;
 	}
 	if (!someoneExitsFromOurExitDoor || m_nPedType == PEDTYPE_COP && veh->bIsBus) {
+#if defined GTAVC_JP_PATCH || defined FIX_BUGS
+		if (veh->pDriver == this && !IsPlayer() && veh == CGameLogic::pShortCutTaxi) {
+			m_objective = OBJECTIVE_NONE;
+			return;
+		}
+#endif
 		// Again, unused...
 		// CVector exitPos = GetPositionToOpenCarDoor(veh, optedDoorNode);
 		bool thereIsRoom = veh->IsRoomForPedToLeaveCar(optedDoorNode, nil);
@@ -15336,13 +16289,13 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 		} else {
 			if (veh->GetUp().z > -0.8f) {
 				bool addDoorSmoke = false;
-				if (veh->GetModelIndex() == MI_YARDIE)
+				if (veh->GetModelIndex() == MI_VOODOO)
 					addDoorSmoke = true;
 
 				switch (m_vehEnterType) {
 					case CAR_DOOR_RF:
 						if (veh->bIsBus) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_COACH_OUT_L);
+							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_COACH, ANIM_COACH_OUT_L);
 						} else {
 							if (isLow)
 								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_RHS);
@@ -15355,7 +16308,7 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 						break;
 					case CAR_DOOR_RR:
 						if (veh->bIsVan) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_VAN_GETOUT);
+							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETOUT);
 						} else if (isLow) {
 							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_RHS);
 						} else {
@@ -15364,7 +16317,7 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 						break;
 					case CAR_DOOR_LF:
 						if (veh->bIsBus) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_COACH_OUT_L);
+							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_COACH, ANIM_COACH_OUT_L);
 						} else {
 							if (isLow)
 								m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_LHS);
@@ -15377,7 +16330,7 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 						break;
 					case CAR_DOOR_LR:
 						if (veh->bIsVan) {
-							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_VAN_GETOUT_L);
+							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_VAN, ANIM_VAN_GETOUT_L);
 						} else if (isLow) {
 							m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_GETOUT_LOW_LHS);
 						} else {
@@ -15590,6 +16543,7 @@ CPed::ScanForInterestingStuff(void)
 	}
 }
 
+// --MIAMI: Done except comments
 uint32
 CPed::ScanForThreats(void)
 {
@@ -15602,18 +16556,25 @@ CPed::ScanForThreats(void)
 		return PED_FLAG_EXPLOSION;
 	}
 	
-	CPed *shooter = nil;
-	if ((fearFlags & PED_FLAG_GUN) && (shooter = CheckForGunShots()) && (m_nPedType != shooter->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE)) {
-		if (!IsGangMember()) {
-			m_threatEntity = shooter;
-			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
-			return PED_FLAG_GUN;
-		}
+	if (fearFlags & PED_FLAG_GUN) {
+		CPed *shooter = CheckForGunShots();
+		if (shooter && (m_nPedType != shooter->m_nPedType || m_nPedType == PEDTYPE_CIVMALE || m_nPedType == PEDTYPE_CIVFEMALE)) {
+			if (!IsGangMember()) {
+				m_threatEntity = shooter;
+				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
+				return PED_FLAG_GUN;
+			}
 
-		if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags) {
-			m_threatEntity = shooter;
-			m_threatEntity->RegisterReference((CEntity **) &m_threatEntity);
-			return CPedType::GetFlag(shooter->m_nPedType);
+			if (CPedType::GetFlag(shooter->m_nPedType) & fearFlags || m_nPedType == PEDTYPE_GANG5) {
+
+				// TODO(Miami)
+				// if (m_threatEntity)
+				//	m_threatEntity->CleanUpOldReference(&m_threatEntity);
+
+				m_threatEntity = shooter;
+				m_threatEntity->RegisterReference((CEntity**)&m_threatEntity);
+				return CPedType::GetFlag(shooter->m_nPedType);
+			}
 		}
 	}
 
@@ -15627,32 +16588,6 @@ CPed::ScanForThreats(void)
 		uint32 flagsOfSomePed = 0;
 
 		CPed *pedToFearFrom = nil;
-#ifndef VC_PED_PORTS
-		for (int i = 0; i < m_numNearPeds; i++) {
-			if (CharCreatedBy != RANDOM_CHAR || m_nearPeds[i]->CharCreatedBy != MISSION_CHAR || m_nearPeds[i]->IsPlayer()) {
-				CPed *nearPed = m_nearPeds[i];
-
-				// BUG: WTF Rockstar?! Putting this here will result in returning the flags of farthest ped to us, since m_nearPeds is sorted by distance.
-				// Fixed at the bottom of the function.
-				flagsOfSomePed = CPedType::GetFlag(nearPed->m_nPedType);
-
-				if (CPedType::GetFlag(nearPed->m_nPedType) & fearFlags) {
-					if (nearPed->m_fHealth > 0.0f && OurPedCanSeeThisOne(m_nearPeds[i])) {
-						// FIX: Taken from VC
-#ifdef FIX_BUGS
-						float nearPedDistSqr = (nearPed->GetPosition() - ourPos).MagnitudeSqr2D();
-#else
-						float nearPedDistSqr = (CVector2D(ourPos) - explosionPos).MagnitudeSqr();
-#endif
-						if (sq(closestPedDist) > nearPedDistSqr) {
-							closestPedDist = Sqrt(nearPedDistSqr);
-							pedToFearFrom = m_nearPeds[i];
-						}
-					}
-				}
-			}
-		}
-#else
 		bool weSawOurEnemy = false;
 		bool weMaySeeOurEnemy = false;
 		float closestEnemyDist = 60.0f;
@@ -15669,7 +16604,7 @@ CPed::ScanForThreats(void)
 				if (flagsOfSomePed & fearFlags) {
 					if (m_nearPeds[i]->m_fHealth > 0.0f) {
 
-						// VC also has ability to include objects to line of sight check here (via last bit of flagsL)
+						// TODO(Miami): include objects to line of sight check here (via last bit of flagsL)
 						if (OurPedCanSeeThisOne(m_nearPeds[i])) {
 							if (m_nearPeds[i]->m_nPedState == PED_ATTACK) {
 								if (m_nearPeds[i]->m_pedInObjective == this) {
@@ -15696,8 +16631,8 @@ CPed::ScanForThreats(void)
 								CColPoint foundCol;
 								CEntity *foundEnt;
 
+								// TODO(Miami): include objects to line of sight check here (via last bit of flagsL)
 								// We don't see him yet but he's behind a ped, vehicle or object
-								// VC also has ability to include objects to line of sight check here (via last bit of flagsL)
 								if (!CWorld::ProcessLineOfSight(ourPos, nearPed->GetPosition(), foundCol, foundEnt,
 									true, false, false, false, false, false, false)) {
 
@@ -15725,7 +16660,7 @@ CPed::ScanForThreats(void)
 				}
 			}
 		}
-#endif
+
 		int16 lastVehicle;
 		CEntity* vehicles[8];
 		CWorld::FindObjectsInRange(ourPos, 20.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false);
@@ -15739,6 +16674,8 @@ CPed::ScanForThreats(void)
 				// BUG: Same bug as above. Fixed at the bottom of function.
 				flagsOfSomePed = CPedType::GetFlag(driver->m_nPedType);
 				if (CPedType::GetFlag(driver->m_nPedType) & fearFlags) {
+
+					// TODO(Miami): Last param
 					if (driver->m_fHealth > 0.0f && OurPedCanSeeThisOne(nearVeh->pDriver)) {
 						// FIX: Taken from VC
 #ifdef FIX_BUGS
@@ -15876,9 +16813,12 @@ CPed::SeekCar(void)
 	if (Seek()) {
 		if (!foundBetterPosToSeek) {
 			if (1.5f + GetPosition().z > dest.z && GetPosition().z - 0.5f < dest.z) {
+#ifdef GTA_TRAIN
 				if (vehToSeek->IsTrain()) {
 					SetEnterTrain(vehToSeek, m_vehEnterType);
-				} else {
+				} else
+#endif
+				{
 					m_fRotationCur = m_fRotationDest;
 					if (!bVehEnterDoorIsBlocked) {
 						vehToSeek->bIsStatic = false;
@@ -16349,10 +17289,11 @@ CPed::UpdateFromLeader(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::UpdatePosition(void)
 {
-	if (CReplay::IsPlayingBack() || !bIsStanding)
+	if (CReplay::IsPlayingBack() || !bIsStanding || m_attachedTo)
 		return;
 
 	CVector2D velocityChange;
@@ -16399,7 +17340,7 @@ CPed::UpdatePosition(void)
 	}
 	
 	// Take time step into account
-	if (m_pCurrentPhysSurface) {
+	if (m_pCurrentPhysSurface && (!m_pCurrentPhysSurface->bInfiniteMass || m_pCurrentPhysSurface->m_phy_flagA08)) {
 		float speedChange = velocityChange.Magnitude();
 		float changeMult = speedChange;
 		if (m_nPedState != PED_DIE || !m_pCurrentPhysSurface->IsVehicle()) {
@@ -16417,27 +17358,39 @@ CPed::UpdatePosition(void)
 	m_vecMoveSpeed.y += velocityChange.y;
 }
 
+// --MIAMI: Done
 void
 CPed::SetPedPositionInCar(void)
 {
+	bool notYet = false;
 	if (CReplay::IsPlayingBack())
 		return;
 
 	if (bChangedSeat) {
-		bool notYet = false;
-		if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_GETIN_LHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_GETIN_LOW_LHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_CLOSEDOOR_LHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_CLOSEDOOR_LOW_LHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SHUFFLE_RHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSHUFFLE_RHS)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_CLOSE_L)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_CLOSE)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_GETIN_L)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_GETIN)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_COACH_IN_L)
-			|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_COACH_IN_R)) {
-			notYet = true;
+		if (m_pMyVehicle->IsBike()) {
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_JUMPON_R)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_JUMPON_L)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_KICK)) {
+				LineUpPedWithCar(LINE_UP_TO_CAR_START);
+				return;
+			}
+			bChangedSeat = false;
+		} else {
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_GETIN_LHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_GETIN_LOW_LHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_CLOSEDOOR_LHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_CLOSEDOOR_LOW_LHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SHUFFLE_RHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSHUFFLE_RHS)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_CLOSE_L)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_CLOSE)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_GETIN_L)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_VAN_GETIN)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_COACH_IN_L)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_COACH_IN_R)
+				|| RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_JUMPIN_LHS)) {
+				notYet = true;
+			}
 		}
 		if (notYet) {
 			LineUpPedWithCar(LINE_UP_TO_CAR_START);
@@ -16450,14 +17403,16 @@ CPed::SetPedPositionInCar(void)
 	CVector seatPos;
 	if (m_pMyVehicle->pDriver == this) {
 		seatPos = vehModel->GetFrontSeatPosn();
-		if (!m_pMyVehicle->IsBoat() && m_pMyVehicle->m_vehType != VEHICLE_TYPE_BIKE)
+		if (!m_pMyVehicle->IsBoat() && !m_pMyVehicle->IsBike())
 			seatPos.x = -seatPos.x;
 
 	} else if (m_pMyVehicle->pPassengers[0] == this) {
-		seatPos = vehModel->GetFrontSeatPosn();
+		seatPos = m_pMyVehicle->IsBike() ? vehModel->m_positions[CAR_POS_BACKSEAT]: vehModel->GetFrontSeatPosn();
+
 	} else if (m_pMyVehicle->pPassengers[1] == this) {
 		seatPos = vehModel->m_positions[CAR_POS_BACKSEAT];
 		seatPos.x = -seatPos.x;
+
 	} else {
 		if (m_pMyVehicle->pPassengers[2] == this) {
 			seatPos = vehModel->m_positions[CAR_POS_BACKSEAT];
@@ -16465,6 +17420,10 @@ CPed::SetPedPositionInCar(void)
 			seatPos = vehModel->GetFrontSeatPosn();
 		}
 	}
+	if (m_pMyVehicle->IsBike()) {
+		((CBike*)m_pMyVehicle)->CalculateLeanMatrix();
+		newMat = ((CBike*)m_pMyVehicle)->m_leanMatrix;
+	}
 	newMat.GetPosition() += Multiply3x3(newMat, seatPos);
 	// Already done below (SetTranslate(0.0f, 0.0f, 0.0f))
 	// tempMat.SetUnity();
@@ -16596,6 +17555,7 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
 	return obj;
 }
 
+// --MIAMI: Done
 void
 CPed::WarpPedIntoCar(CVehicle *car)
 {
@@ -16604,7 +17564,7 @@ CPed::WarpPedIntoCar(CVehicle *car)
 	m_pMyVehicle->RegisterReference((CEntity **) &m_pMyVehicle);
 	m_carInObjective = car;
 	m_carInObjective->RegisterReference((CEntity **) &m_carInObjective);
-	m_nPedState = PED_DRIVING;
+	SetPedState(m_nPedState);
 	bUsesCollision = false;
 	bIsInTheAir = false;
 	bVehExitWillBeInstant = true;
@@ -16613,6 +17573,10 @@ CPed::WarpPedIntoCar(CVehicle *car)
 		car->pDriver->RegisterReference((CEntity **) &car->pDriver);
 
 	} else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER) {
+		if (car->IsBike() && !car->pPassengers[0]) {
+			car->pPassengers[0] = this;
+			car->pPassengers[0]->RegisterReference((CEntity**) &car->pPassengers[0]);
+		}
 		for (int i = 0; i < 4; i++) {
 			if (!car->pPassengers[i]) {
 				car->pPassengers[i] = this;
@@ -16648,33 +17612,11 @@ CPed::WarpPedIntoCar(CVehicle *car)
 		DMAudio.PlayOneShot(car->m_audioEntityId, SOUND_CAR_ENGINE_START, 1.0f);
 	}
 
-#ifdef VC_PED_PORTS
 	RpAnimBlendClumpSetBlendDeltas(GetClump(), ASSOC_PARTIAL, -1000.0f);
 
-	// VC uses AddInCarAnims but we don't have that
-	m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f);
+	AddInCarAnims(car, car->pDriver == this);
 	RemoveWeaponWhenEnteringVehicle();
-#else
-	if (car->IsBoat()) {
-#ifndef FIX_BUGS
-		m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
-#else
-		m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f);
-#endif
-		CWeaponInfo *ourWeapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		RemoveWeaponModel(ourWeapon->m_nModelId);
-	} else {
-		// Because we can use Uzi for drive by
-		RemoveWeaponWhenEnteringVehicle();
-
-		if (car->bLowVehicle)
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f);
-		else
-			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-	}
-#endif
 
-	StopNonPartialAnims();
 	if (car->bIsBus)
 		bRenderPedInCar = false;
 
@@ -16682,6 +17624,22 @@ CPed::WarpPedIntoCar(CVehicle *car)
 }
 
 void
+CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
+{
+	switch (newObj) {
+	case OBJECTIVE_USE_SEAT_ATTRACTOR:
+	case OBJECTIVE_USE_ATM_ATTRACTOR:
+	case OBJECTIVE_USE_STOP_ATTRACTOR:
+	case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+	case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+	case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
+		ClearPointGunAt();
+		SetObjective(newObj, pos);
+		m_attractorHeading = heading;
+	}
+}
+
+void
 CPed::SetObjective(eObjective newObj, CVector dest)
 {
 	if (DyingOrDead())
@@ -16730,14 +17688,50 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 			break;
 		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
 		case OBJECTIVE_GOTO_AREA_ON_FOOT:
+		case OBJECTIVE_USE_SEAT_ATTRACTOR:
+		case OBJECTIVE_USE_ATM_ATTRACTOR:
+		case OBJECTIVE_USE_STOP_ATTRACTOR:
+		case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+		case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+		case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
 			bIsRunning = false;
 			m_pNextPathNode = nil;
 			m_nextRoutePointPos = dest;
 			m_vecSeekPos = m_nextRoutePointPos;
 			m_distanceToCountSeekDone = 0.5f;
-			bUsePedNodeSeek = true;
-			if (sq(m_distanceToCountSeekDone) > (m_nextRoutePointPos - GetPosition()).MagnitudeSqr2D())
-				return;
+			if (m_objective == OBJECTIVE_USE_ATM_ATTRACTOR) {
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			if (m_objective == OBJECTIVE_USE_SEAT_ATTRACTOR) {
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			if (m_objective == OBJECTIVE_USE_STOP_ATTRACTOR) {
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			if (m_objective == OBJECTIVE_USE_PIZZA_ATTRACTOR) {
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			if (m_objective == OBJECTIVE_USE_SHELTER_ATTRACTOR) {
+				bIsRunning = true;
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			if (m_objective == OBJECTIVE_USE_ICECREAM_ATTRACTOR) {
+				bIsRunning = true;
+				m_distanceToCountSeekDone = m_attractor->GetDistanceToCountSeekDone();
+				m_acceptableHeadingOffset = m_attractor->GetAcceptableHeading();
+			}
+			bUsePedNodeSeek = false;
+			if (sq(m_distanceToCountSeekDone) > (m_nextRoutePointPos - GetPosition()).MagnitudeSqr2D()) {
+				if (!IsUseAttractorObjective(m_objective))
+					return;
+				if (Abs(m_fRotationCur - m_attractorHeading) < m_acceptableHeadingOffset)
+					return;
+			}
 			break;
 		case OBJECTIVE_RUN_TO_AREA:
 			bIsRunning = true;
@@ -16762,10 +17756,11 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetMoveAnim(void)
 {
-	if (m_nStoredMoveState == m_nMoveState || !IsPedInControl())
+	if (m_nStoredMoveState == m_nMoveState || !IsPedInControl() || m_attachedTo)
 		return;
 
 	if (m_nMoveState == PEDMOVE_NONE) {
@@ -16781,12 +17776,14 @@ CPed::SetMoveAnim(void)
 
 	CAnimBlendAssociation *animAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_BLOCK);
 	if (!animAssoc) {
-		CAnimBlendAssociation *fightIdleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
-		animAssoc = fightIdleAssoc;
-		if (fightIdleAssoc && m_nPedState == PED_FIGHT)
+		animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FIGHT_IDLE);
+		if (!animAssoc)
+			animAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCHRELOAD);
+
+		if (animAssoc && m_nPedState == PED_FIGHT)
 			return;
 
-		if (fightIdleAssoc) {
+		if (animAssoc) {
 			CAnimBlendAssociation *idleAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_STANCE);
 			if (!idleAssoc || idleAssoc->blendDelta <= 0.0f) {
 				animAssoc->flags |= ASSOC_DELETEFADEDOUT;
@@ -16904,27 +17901,16 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
 	m_vecOffsetSeek = doorOpenPos - GetPosition();
 	m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 600;
 	if (car->IsBoat()) {
-#ifdef VC_PED_PORTS
-		// VC checks for handling flag, but we can't do that
-		if(car->GetModelIndex() == MI_SPEEDER)
+		if(car->pHandling->Flags & HANDLING_SIT_IN_BOAT)
 			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
 		else
 			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
 
 		PedSetInCarCB(nil, this);
 		bVehExitWillBeInstant = true;
-#else
-
-#ifndef FIX_BUGS
-		m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
-#else
-		m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f);
-#endif
-
-		m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, this);
-#endif
-		if (IsPlayer())
-			CWaterLevel::AllocateBoatWakeArray();
+		// TODO(Miami):
+		//if (IsPlayer())
+		//	CWaterLevel::AllocateBoatWakeArray();
 	} else {
 		if (zDiff > 4.4f) {
 			if (m_vehEnterType == CAR_DOOR_RF || m_vehEnterType == CAR_DOOR_RR)
@@ -16943,6 +17929,7 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::WanderPath(void)
 {
@@ -16955,14 +17942,14 @@ CPed::WanderPath(void)
 		if (m_nMoveState == PEDMOVE_STILL || m_nMoveState == PEDMOVE_NONE)
 			SetMoveState(PEDMOVE_WALK);
 	}
-	m_vecSeekPos = m_pNextPathNode->GetPosition();
+	m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
 	m_vecSeekPos.z += 1.0f;
 
 	// Only returns true when ped is stuck(not stopped) I think, then we should assign new direction or wait state to him.
 	if (!Seek())
 		return;
 
-  	CPathNode *previousLastNode = m_pLastPathNode;
+	CPathNode *previousLastNode = m_pLastPathNode;
 	uint8 randVal = (m_randomSeed + 3 * CTimer::GetFrameCounter()) % 100;
 
 	// We don't prefer 180-degree turns in normal situations
@@ -16975,6 +17962,8 @@ CPed::WanderPath(void)
 	CPathNode *nodeWeWouldntPrefer = nil;
 	uint8 dirToSet = 9; // means undefined
 	uint8 dirWeWouldntPrefer2 = 9; // means undefined
+	uint8 tryCount = 0;
+
 	if (randVal <= 90) {
 		if (randVal > 80) {
 			m_nPathDir += 2;
@@ -16990,7 +17979,13 @@ CPed::WanderPath(void)
 	ThePaths.FindNextNodeWandering(PATH_PED, GetPosition(), &m_pLastPathNode, &m_pNextPathNode,
 		m_nPathDir, &dirToSet);
 
-	uint8 tryCount = 0;
+	if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
+		if (m_pNextPathNode) {
+			CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
+			if (!CPopulation::IsSkateable(unpacked))
+				m_pNextPathNode = nil;
+		}
+	}
 
 	// NB: SetWanderPath checks for m_nPathDir == dirToStartWith, this one checks for tryCount > 7
 	while (!m_pNextPathNode) {
@@ -17018,6 +18013,13 @@ CPed::WanderPath(void)
 					m_pNextPathNode = nil;
 				}
 			}
+			if (((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->m_pedStatType == PEDSTAT_SKATER) {
+				if (m_pNextPathNode) {
+					CVector unpacked(m_pNextPathNode->GetPosition() / 8.f);
+					if (!CPopulation::IsSkateable(unpacked))
+						m_pNextPathNode = nil;
+				}
+			}
 		}
 	}
 
@@ -17233,7 +18235,7 @@ CPed::SetCarJack(CVehicle* car)
 		pedInSeat = car->pDriver;
 
 	if (m_fHealth > 0.0f && (IsPlayer() || m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS ||
-		                     (car->VehicleCreatedBy != MISSION_VEHICLE && car->GetModelIndex() != MI_DODO)))
+							 (car->VehicleCreatedBy != MISSION_VEHICLE && car->GetModelIndex() != MI_DODO)))
 			if (pedInSeat && !pedInSeat->IsPedDoingDriveByShooting() && pedInSeat->m_nPedState == PED_DRIVING)
 				if (m_nPedState != PED_CARJACK && !m_pVehicleAnim)
 					if ((car->IsDoorReady(door) || car->IsDoorFullyOpen(door)))
@@ -17281,31 +18283,13 @@ CPed::Solicit(void)
 	}
 }
 
-// Seperate function in VC, more logical. Not sure is it inlined in III.
+// --MIAMI: Done
 void
 CPed::SetExitBoat(CVehicle *boat)
 {
-#ifndef VC_PED_PORTS
-	m_nPedState = PED_IDLE;
-	CVector firstPos = GetPosition();
-	CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 100.0f);
-	if (boat->GetModelIndex() == MI_SPEEDER && boat->IsUpsideDown()) {
-		m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_CRAWLOUT_RHS, 8.0f);
-		m_pVehicleAnim->SetFinishCallback(CPed::PedSetOutCarCB, this);
-		m_vehEnterType = CAR_DOOR_RF;
-		m_nPedState = PED_EXIT_CAR;
-	} else {
-		m_vehEnterType = CAR_DOOR_RF;
-		CPed::PedSetOutCarCB(nil, this);
-		bIsStanding = true;
-		m_pCurSurface = boat;
-		m_pCurSurface->RegisterReference((CEntity**)&m_pCurSurface);
+	if (m_nPedState == PED_FOLLOW_PATH) {
+		ClearFollowPath();
 	}
-	SetPosition(firstPos);
-	SetMoveState(PEDMOVE_STILL);
-	m_vecMoveSpeed = boat->m_vecMoveSpeed;
-	bTryingToReachDryLand = true;
-#else
 	m_nPedState = PED_IDLE;
 	CVector newPos = GetPosition();
 	RemoveInCarAnims();
@@ -17321,10 +18305,10 @@ CPed::SetExitBoat(CVehicle *boat)
 		m_pCurSurface->RegisterReference((CEntity**)&m_pCurSurface);
 		m_pCurrentPhysSurface = boat;
 	} else {
-/*		if (boat->m_modelIndex != MI_SKIMMER || boat->bIsInWater) {
+		if (boat->m_modelIndex != MI_SKIMMER || boat->bIsInWater) {
 			if (boat->m_modelIndex == MI_SKIMMER)
-				newPos.z += 2.0f
-*/
+				newPos.z += 2.0f;
+
 			m_vehEnterType = CAR_DOOR_RF;
 			PedSetOutCarCB(nil, this);
 			bIsStanding = true;
@@ -17335,7 +18319,6 @@ CPed::SetExitBoat(CVehicle *boat)
 			CEntity *foundEnt = nil;
 			if (CWorld::ProcessVerticalLine(newPos, newPos.z - 1.4f, foundCol, foundEnt, false, true, false, false, false, false, nil))
 				newPos.z = FEET_OFFSET + foundCol.point.z;
-/*		// VC specific
 		} else {
 			m_vehEnterType = CAR_DOOR_RF;
 			PedSetOutCarCB(nil, this);
@@ -17345,7 +18328,7 @@ CPed::SetExitBoat(CVehicle *boat)
 			float upMult = 1.04f + boatCol->boundingBox.min.z;
 			float rightMult = 0.6f * boatCol->boundingBox.max.x;
 			newPos = upMult * boat->GetUp() + rightMult * boat->GetRight() + boat->GetPosition();
-			GetPosition() = newPos;
+			SetPosition(newPos);
 			if (m_pMyVehicle) {
 				PositionPedOutOfCollision();
 			} else {
@@ -17355,13 +18338,134 @@ CPed::SetExitBoat(CVehicle *boat)
 			}
 			return;
 		}
-*/	}
+	}
 	SetPosition(newPos);
 	SetMoveState(PEDMOVE_STILL);
 	m_vecMoveSpeed = boat->m_vecMoveSpeed;
-#endif
-	// Not there in VC.
-	CWaterLevel::FreeBoatWakeArray();
+}
+
+void
+CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
+{
+	if (!m_attractor)
+		m_attractor = pAttractor;
+	if (m_attractor != pAttractor)
+		return;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: SetObjective(OBJECTIVE_USE_ATM_ATTRACTOR, heading, pos); break;
+	case ATTRACTOR_SEAT: SetObjective(OBJECTIVE_USE_SEAT_ATTRACTOR, heading, pos); break;
+	case ATTRACTOR_STOP: SetObjective(OBJECTIVE_USE_STOP_ATTRACTOR, heading, pos); break;
+	case ATTRACTOR_PIZZA: SetObjective(OBJECTIVE_USE_PIZZA_ATTRACTOR, heading, pos); break;
+	case ATTRACTOR_SHELTER: SetObjective(OBJECTIVE_USE_SHELTER_ATTRACTOR, heading, pos); break;
+	case ATTRACTOR_ICECREAM: SetObjective(OBJECTIVE_USE_ICECREAM_ATTRACTOR, heading, pos); break;
+	default: return;
+	}
+	SetObjectiveTimer(time);
+	m_positionInQueue = qid;
+}
+
+// --MIAMI: Done
+void
+CPed::ClearWaitState(void)
+{
+	CAnimBlendAssociation *assoc;
+	switch (m_nWaitState) {
+		case WAITSTATE_PLAYANIM_CHAT:
+		case WAITSTATE_SIT_DOWN:
+		case WAITSTATE_SIT_DOWN_RVRS:
+		case WAITSTATE_SIT_UP:
+		case WAITSTATE_SIT_IDLE:
+		case WAITSTATE_USE_ATM:
+			if (CTimer::GetTimeInMilliseconds() <= m_nWaitTimer) {
+				if (m_nWaitState == WAITSTATE_USE_ATM) {
+					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_ATM);
+					if (assoc)
+						assoc->blendDelta = -8.0f;
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+
+				} else if (m_nWaitState == WAITSTATE_PLAYANIM_CHAT) {
+					assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_IDLE_CHAT);
+					if (assoc)
+						assoc->blendDelta = -8.0f;
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+
+				} else if (m_nWaitState == WAITSTATE_SIT_DOWN || m_nWaitState == WAITSTATE_SIT_DOWN_RVRS || m_nWaitState == WAITSTATE_SIT_IDLE || m_nWaitState == WAITSTATE_SIT_UP) {
+					switch (m_nWaitState) {
+						case WAITSTATE_SIT_DOWN:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_DOWN);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						case WAITSTATE_SIT_IDLE:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_IDLE);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						case WAITSTATE_SIT_UP:
+							assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SEAT_UP);
+							if (assoc)
+								assoc->blendDelta = -8.0f;
+							break;
+						default:
+							break;
+					}
+					if (m_attractor)
+						GetPedAttractorManager()->DeRegisterPed(this, m_attractor);
+				}
+			}
+			break;
+		case WAITSTATE_RIOT:
+		{
+			CAnimBlock* riotAnimBlock = CAnimManager::GetAnimationBlock("riot");
+
+			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				int first = riotAnimBlock->firstIndex;
+				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+				if (index >= first && index < first + riotAnimBlock->numAnims) {
+					assoc->blendDelta = -1000.0f;
+				}
+			}
+			break;
+		}
+		case WAITSTATE_FAST_FALL:
+			if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_KO_SKID_FRONT))
+				SetGetUp();
+
+			break;
+		case WAITSTATE_BOMBER:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BOMBER);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		case WAITSTATE_STRIPPER:
+		{
+			CAnimBlock* stripAnimBlock = CAnimManager::GetAnimationBlock("strip");
+
+			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				int first = stripAnimBlock->firstIndex;
+				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+				if (index >= first && index < first + stripAnimBlock->numAnims) {
+					assoc->blendDelta = -1000.0f;
+				}
+			}
+			break;
+		}
+		case WAITSTATE_LANCESITTING:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_SUNBATHE);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		case WAITSTATE_PLAYANIM_HANDSUP_SIMPLE:
+			assoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_HANDSUP);
+			if (assoc)
+				assoc->blendDelta = -8.0f;
+			break;
+		default:
+			break;
+	}
+	m_nWaitState = WAITSTATE_FALSE;
 }
 
 #ifdef COMPATIBLE_SAVES
@@ -17400,8 +18504,26 @@ CPed::Load(uint8*& buf)
 	CopyFromBuf(buf, m_fHealth);
 	CopyFromBuf(buf, m_fArmour);
 	SkipSaveBuf(buf, 148);
-	for (int i = 0; i < 13; i++) // has to be hardcoded
-		m_weapons[i].Load(buf);
+
+	CWeapon bufWeapon;
+	for (int i = 0; i < 13; i++) { // has to be hardcoded
+		bufWeapon.Load(buf);
+		if (i >= 10)
+			continue; // tmp hack before we fix save/load
+
+		if (bufWeapon.m_eWeaponType != WEAPONTYPE_UNARMED) {
+			int modelId = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModelId;
+			if (modelId != -1) {
+				CStreaming::RequestModel(modelId, STREAMFLAGS_DEPENDENCY);
+				int modelId2 = CWeaponInfo::GetWeaponInfo(bufWeapon.m_eWeaponType)->m_nModel2Id;
+				if (modelId2 != -1)
+					CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+				CStreaming::LoadAllRequestedModels(false);
+			}
+			GiveWeapon(bufWeapon.m_eWeaponType, bufWeapon.m_nAmmoTotal);
+		}
+	}
 	SkipSaveBuf(buf, 5);
 	CopyFromBuf(buf, m_maxWeaponTypeAllowed);
 	SkipSaveBuf(buf, 162);
@@ -17409,3 +18531,683 @@ CPed::Load(uint8*& buf)
 #undef CopyFromBuf
 #undef CopyToBuf
 #endif
+
+// --MIAMI: Done
+void
+CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo)
+{
+	m_delayedWeapon = weapon;
+	m_delayedWeaponAmmo = ammo;
+	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
+		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
+		if (modelId1 != -1)
+			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
+		if (modelId2 != -1)
+			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
+			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
+			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, true);
+			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
+		}
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::RequestDelayedWeapon()
+{
+	if (m_delayedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		int modelId1 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModelId;
+		int modelId2 = CWeaponInfo::GetWeaponInfo(m_delayedWeapon)->m_nModel2Id;
+		if (modelId1 != -1)
+			CStreaming::RequestModel(modelId1, STREAMFLAGS_DEPENDENCY);
+		if (modelId2 != -1)
+			CStreaming::RequestModel(modelId2, STREAMFLAGS_DEPENDENCY);
+
+		if ((modelId1 == -1 || CStreaming::HasModelLoaded(modelId1))
+			&& (modelId2 == -1 || CStreaming::HasModelLoaded(modelId2))) {
+			GiveWeapon(m_delayedWeapon, m_delayedWeaponAmmo, 1);
+			m_delayedWeapon = WEAPONTYPE_UNIDENTIFIED;
+		}
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::ClearFollowPath()
+{
+	for (int i = 0; i < ARRAY_SIZE(m_pPathNodesStates); i++) {
+		m_pPathNodesStates[i] = nil;
+	}
+	m_nPathNodes = 0;
+	m_nCurPathNode = 0;
+}
+
+// --MIAMI: Done
+void
+CPed::AddInCarAnims(CVehicle* car, bool isDriver)
+{
+	if (car->IsBoat()) {
+		if (car->pHandling->Flags & HANDLING_SIT_IN_BOAT) {
+			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
+		} else {
+			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT, 100.0f);
+		}
+	} else if (car->IsBike()) {
+		if (isDriver) {
+			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_RIDE, 100.0f);
+		} else {
+			m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ((CBike*)car)->m_bikeAnimType, ANIM_BIKE_PASSENGER, 100.0f);
+		}
+	} else {
+		if (isDriver) {
+			if (car->bLowVehicle) {
+				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LSIT, 100.0f);
+			} else {
+				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
+			}
+		} else {
+			if (car->bLowVehicle) {
+				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITPLO, 100.0f);
+			} else {
+				m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_SITP, 100.0f);
+			}
+		}
+	}
+
+	StopNonPartialAnims();
+}
+
+// --MIAMI: Done
+bool
+CPed::CanBeDamagedByThisGangMember(CPed* who)
+{
+	return m_gangFlags & (1 << (uint8)(who->m_nPedType - PEDTYPE_GANG1));
+}
+
+// --MIAMI: Done
+void
+CPed::Undress(const char* name)
+{
+	int mi = GetModelIndex();
+	CAnimBlendAssociation* pAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
+	if (pAnim)
+		FinishTalkingOnMobileCB(pAnim, this);
+
+	DeleteRwObject();
+	if (IsPlayer())
+		mi = MI_PLAYER;
+	CStreaming::RequestSpecialModel(mi, name, STREAMFLAGS_DEPENDENCY | STREAMFLAGS_SCRIPTOWNED);
+	CWorld::Remove(this);
+}
+
+// --MIAMI: Done
+void
+FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg)
+{
+	CPed *ped = (CPed*)arg;
+	if (ped->m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+		ped->RemoveWeaponModel(MI_MOBILE);
+		ped->SetCurrentWeapon(ped->m_storedWeapon);
+		ped->m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+	}
+	ped->m_lookTimer = 0;
+}
+
+// --MIAMI: Done
+void
+StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg)
+{
+	CPed* ped = (CPed*)arg;
+	if (ped->m_nPedState == PED_ANSWER_MOBILE)
+		CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
+}
+
+// --MIAMI: Done
+void
+CPed::SetAnswerMobile(void)
+{
+	if (m_nPedState != PED_ANSWER_MOBILE && !DyingOrDead()) {
+		SetPedState(PED_ANSWER_MOBILE);
+		RemoveWeaponAnims(GetWeapon()->m_eWeaponType, -4.0f);
+		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_IN, 4.0f);
+		assoc->SetFinishCallback(StartTalkingOnMobileCB, this);
+		m_lookTimer = INT32_MAX;
+		if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED)
+			m_storedWeapon = GetWeapon()->m_eWeaponType;
+
+		RemoveWeaponModel(-1);
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::ClearAnswerMobile(void)
+{
+	if (m_nLastPedState == PED_ANSWER_MOBILE)
+		m_nLastPedState = PED_NONE;
+
+	if (RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK)) {
+		CAnimBlendAssociation *assoc = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_OUT, 8.0f);
+		assoc->SetFinishCallback(FinishTalkingOnMobileCB, this);
+	} else
+		FinishTalkingOnMobileCB(nil, this);
+
+	if (m_nPedState == PED_ANSWER_MOBILE) {
+		m_nPedState = PED_IDLE;
+		RestorePreviousState();
+		m_pMyVehicle = nil;
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::Dress(void)
+{
+	int mi = GetModelIndex();
+	m_modelIndex = -1;
+	SetModelIndex(mi);
+	m_nPedState = PED_IDLE;
+	m_nLastPedState = PED_NONE;
+	m_objective = OBJECTIVE_NONE;
+	m_prevObjective = OBJECTIVE_NONE;
+	m_nWaitState = WAITSTATE_FALSE;
+	CWorld::Add(this);
+	m_headingRate = m_pedStats->m_headingChangeRate;
+}
+
+// --MIAMI: Done
+void
+CPed::AnswerMobile(void)
+{
+	if (!IsPedInControl())
+		return;
+
+	CAnimBlendAssociation *phoneInAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_IN);
+	CAnimBlendAssociation *phoneOutAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_OUT);
+	CAnimBlendAssociation *phoneTalkAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_PHONE_TALK);
+	if (phoneInAssoc || phoneTalkAssoc || phoneOutAssoc) {
+		if (phoneInAssoc) {
+			if (phoneInAssoc->currentTime >= 0.85f && !m_pWeaponModel) {
+				CBaseModelInfo *phoneModel = CModelInfo::GetModelInfo(MI_MOBILE);
+				m_pWeaponModel = (RpAtomic*)phoneModel->CreateInstance();
+				phoneModel->AddRef();
+				m_wepModelID = MI_MOBILE;
+
+				// They copied AddWeaponModel and forgot that here
+				// bool unused = IsPlayer();
+			}
+		} else if (phoneOutAssoc) {
+			if (phoneOutAssoc->currentTime >= 0.5f && phoneOutAssoc->currentTime - phoneOutAssoc->timeStep < 0.5f) {
+				RemoveWeaponModel(MI_MOBILE);
+				SetCurrentWeapon(m_storedWeapon);
+				m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+			}
+		}
+	} else {
+		CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
+	}
+}
+
+// --MIAMI: Done except commented thing
+void
+CPed::AttachPedToEntity(CEntity *ent, CVector offset, uint16 type, float rot, eWeaponType weapon)
+{
+	if (!ent || bInVehicle)
+		return;
+
+	m_attachedTo = ent;
+	m_attachedTo->RegisterReference(&m_attachedTo);
+	m_vecAttachOffset = offset;
+	m_attachType = type;
+	m_attachRot = rot;
+	if (IsPlayer()) {
+		bUsesCollision = false;
+	} else if (ent->IsVehicle()) {
+		m_pCollidingEntity = ent;
+	}
+
+	if (IsPlayer()) {
+		m_objective = OBJECTIVE_NONE;
+		m_prevObjective = OBJECTIVE_NONE;
+	}
+	SetStoredState();
+	SetPedState(PED_IDLE);
+	CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
+
+	if (m_storedWeapon == WEAPONTYPE_UNIDENTIFIED) {
+		m_storedWeapon = GetWeapon()->m_eWeaponType;
+		m_attachWepAmmo = GetWeapon()->m_nAmmoTotal;
+	}
+	if (IsPlayer()) {
+		GiveWeapon(weapon, 30000, 1);
+#ifndef FIX_BUGS
+		((CPlayerPed*)this)->m_nSelectedWepSlot = weapon;
+#else
+		((CPlayerPed*)this)->m_nSelectedWepSlot = GetWeaponSlot(weapon);
+#endif
+		((CPlayerPed*)this)->MakeChangesForNewWeapon(weapon);
+		TheCamera.SetNewPlayerWeaponMode(CCam::MODE_HELICANNON_1STPERSON, 0, 0);
+		SetPedState(PED_SNIPER_MODE);
+	} else {
+		GiveWeapon(weapon, 30000, true);
+		SetCurrentWeapon(weapon);
+	}
+
+	// TODO(Miami)
+	// PositionAttachedPed();
+}
+
+// --MIAMI: Done
+void
+CPed::DettachPedFromEntity(void)
+{
+	m_attachedTo = nil;
+	if (m_nPedState == PED_DIE) {
+		m_pCollidingEntity = m_attachedTo;
+		ApplyMoveForce(m_attachedTo->GetForward() * -4.0f);
+		bIsStanding = false;
+	} else if (m_nPedState != PED_DEAD) {
+		RestorePreviousState();
+		CAnimManager::BlendAnimation(GetClump(), m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
+		bUsesCollision = true;
+		if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
+			GetWeapon()->m_nAmmoInClip = 0;
+			GetWeapon()->m_nAmmoTotal = 0;
+			SetCurrentWeapon(m_storedWeapon);
+			GetWeapon()->m_nAmmoTotal = m_attachWepAmmo;
+			m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
+		}
+	}
+}
+
+// --MIAMI: Done
+void
+CPed::PedShuffle(void)
+{
+	if (m_pMyVehicle->pPassengers[0] == this) {
+		CPed *driver = m_pMyVehicle->pDriver;
+		if (!driver || driver->m_objective == OBJECTIVE_LEAVE_VEHICLE) {
+			m_pVehicleAnim = CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, m_pMyVehicle->bLowVehicle ? ANIM_CAR_LSHUFFLE_RHS : ANIM_CAR_SHUFFLE_RHS);
+			m_objective = OBJECTIVE_ENTER_CAR_AS_DRIVER;
+			m_pMyVehicle->RemovePassenger(this);
+			bInVehicle = false;
+			m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, this);
+		}
+	}
+}
+
+// --MIAMI: Bike part is done
+void
+CPed::DriveVehicle(void)
+{
+	if (bOffscreen)
+		return;
+
+	CVehicle *veh = m_pMyVehicle;
+	if (veh->IsBike()) {
+		CBike *bike = (CBike*)veh;
+		float blendDelta = 1.0f;
+		float targetUDLean = 0.0f;
+		CAnimBlendAssociation *leftAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_LEFT);
+		CAnimBlendAssociation *rightAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_RIGHT);
+		CAnimBlendAssociation *stillAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_STILL);
+		CAnimBlendAssociation *fwdAssoc, *backAssoc;
+		if (IsPlayer()) {
+			fwdAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_FWD);
+			backAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_BACK);
+		}
+		CAnimBlendAssociation *walkbackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_PUSHES);
+		CAnimBlendAssociation *drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_RHS);
+		if (!drivebyAssoc)
+			drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_LHS);
+		if (!drivebyAssoc)
+			drivebyAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BIKE_DRIVEBY_FT);
+
+		float velocityFwdDotProd = DotProduct(bike->m_vecMoveSpeed, bike->GetForward());
+		if (m_vecTurnSpeed.MagnitudeSqr() > 0.09f) {
+			bike->KnockOffRider(WEAPONTYPE_FALL, 2, this, false);
+			if (bike->pPassengers[0])
+				bike->KnockOffRider(WEAPONTYPE_FALL, 2, bike->pPassengers[0], false);
+			return;
+		}
+		if (!drivebyAssoc && Abs(velocityFwdDotProd) < 0.02f) {
+			if (!stillAssoc || stillAssoc->blendAmount < 1.0 && stillAssoc->blendDelta <= 0.0) {
+				stillAssoc = CAnimManager::BlendAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_STILL, 2.0f);
+			}
+		} else {
+			if (velocityFwdDotProd >= 0.0f) {
+				if (stillAssoc && stillAssoc->blendDelta >= 0.0f)
+					stillAssoc->blendDelta = -4.0f;
+				if (walkbackAssoc && walkbackAssoc->blendDelta >= 0.0f)
+					walkbackAssoc->blendDelta = -4.0f;
+			} else {
+				float maxReverseSpeed = bike->pHandling->Transmission.fMaxReverseVelocity;
+				if (3.5f * maxReverseSpeed > velocityFwdDotProd && (bike->m_nWheelsOnGround || bike->GetUp().z < -0.5f)) {
+					bike->KnockOffRider(WEAPONTYPE_FALL, 2, this, false);
+					if (bike->pPassengers[0])
+						bike->KnockOffRider(WEAPONTYPE_FALL, 2, bike->pPassengers[0], false);
+					return;
+				}
+				if (bike->m_fGasPedal >= 0.0 || velocityFwdDotProd <= maxReverseSpeed * 1.5) {
+					if (IsPlayer() && velocityFwdDotProd < maxReverseSpeed * 1.5)
+						targetUDLean = -1.0f;
+
+					if (stillAssoc && stillAssoc->blendDelta >= 0.0f)
+						stillAssoc->blendDelta = -4.0f;
+
+					if (walkbackAssoc && walkbackAssoc->blendDelta >= 0.0f) {
+						walkbackAssoc->blendDelta = -4.0f;
+					}
+				} else if (!walkbackAssoc || walkbackAssoc->blendAmount < 1.0f && walkbackAssoc->blendDelta <= 0.0f) {
+					walkbackAssoc = CAnimManager::BlendAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_PUSHES, 4.0f);
+				}
+			}
+		}
+		if (stillAssoc)
+			blendDelta -= Min(1.0f, CTimer::GetTimeStepNonClipped() * 0.02f * stillAssoc->blendDelta + stillAssoc->blendAmount);
+
+		if (drivebyAssoc)
+			blendDelta -= Min(blendDelta, CTimer::GetTimeStepNonClipped() * 0.02f * drivebyAssoc->blendDelta + drivebyAssoc->blendAmount);
+
+		if (walkbackAssoc)
+			blendDelta -= Min(blendDelta, CTimer::GetTimeStepNonClipped() * 0.02f * walkbackAssoc->blendDelta + walkbackAssoc->blendAmount);
+
+		float targetLRLean, timeBlend, neededAngForWheelie, stoppieAng;
+
+		// Smooth the lean amount
+		if (targetUDLean == -1.0f) {
+			targetLRLean = 0.0f;
+			timeBlend = Pow(0.86f, CTimer::GetTimeStep());
+		} else {
+			targetLRLean = clamp(bike->m_fLeanLRAngle / bike->pBikeHandling->fFullAnimLean, -1.0f, 1.0f);
+			timeBlend = Pow(0.86f, CTimer::GetTimeStep());
+		}
+
+		bike->m_fPedLeanAmountLR = bike->m_fPedLeanAmountLR * timeBlend + (1.0 - timeBlend) * targetLRLean;
+
+		if (!IsPlayer()) {
+			targetUDLean = 0.0f;
+
+		} else if (targetUDLean > -1.0f) {
+			targetUDLean = bike->m_fLeanInput;
+			bike->m_bike_flag80 = false;
+			neededAngForWheelie = 1.0f;
+			if (bike->m_aWheelTimer[0] != 0.0f || bike->m_aWheelTimer[1] != 0.0f || bike->GetForward().z <= 0.0f ||
+				(0.0f == bike->m_aWheelTimer[2] && 0.0f == bike->m_aWheelTimer[3])) {
+
+				if (0.0f == bike->m_aWheelTimer[2] && 0.0f == bike->m_aWheelTimer[3] &&
+					(bike->GetForward().y < 0.0f && (bike->m_aWheelTimer[0] != 0.0f || bike->m_aWheelTimer[1] != 0.0f))) {
+
+					stoppieAng = bike->pBikeHandling->fStoppieAng;
+					if (stoppieAng - bike->GetForward().z > 0.6f * stoppieAng)
+						bike->m_bike_flag80 = true;
+				}
+			} else {
+				float wheelieAng = bike->pBikeHandling->fWheelieAng;
+				neededAngForWheelie = wheelieAng - bike->GetForward().z;
+				if (neededAngForWheelie < wheelieAng / 2.f)
+					bike->m_bike_flag80 = true;
+			}
+			if (neededAngForWheelie >= 0.15f) {
+				if (bike->m_fBrakePedal <= 0.5f || velocityFwdDotProd <= 0.01f) {
+					if (bike->m_fGasPedal > 0.5f && targetUDLean <= 0.0f && 0.3f * bike->pHandling->Transmission.fUnkMaxVelocity > velocityFwdDotProd) {
+						targetUDLean = Min(0.1f, targetUDLean);
+					}
+				} else {
+					targetUDLean = Max(0.1f, targetUDLean);
+				}
+			} else {
+				targetUDLean = Max(0.25f, targetUDLean);
+			}
+			float targetLRLeanABS = Abs(targetLRLean);
+			if (targetLRLeanABS > 0.3f) {
+				// Yes, UD
+				targetUDLean *= Max(0.0f, 1.0f - (targetLRLeanABS - 0.3f) * 50.f / 13.f);
+			}
+		}
+		if (IsPlayer()) {
+			float timeBlend = Pow(0.89f, CTimer::GetTimeStep());
+			bike->m_fPedLeanAmountUD = (timeBlend * bike->m_fPedLeanAmountUD) + ((1.0f - timeBlend) * targetUDLean);
+		} else {
+			bike->m_fPedLeanAmountUD = 0.0f;
+		}
+
+		float fwdBackLeanAmount, leftRightLeanAmount;
+		if (Abs(bike->m_fPedLeanAmountLR) <= 0.56f && IsPlayer()) {
+
+			if (Abs(bike->m_fPedLeanAmountUD) <= 0.56f) {
+				CVector2D smoothedLean(bike->m_fPedLeanAmountLR, bike->m_fPedLeanAmountUD);
+				float smoothLeanMag = smoothedLean.Magnitude();
+				if (smoothLeanMag <= 0.01f) {
+					fwdBackLeanAmount = Abs(smoothedLean.y);
+					leftRightLeanAmount = Abs(smoothedLean.x);
+				} else {
+					fwdBackLeanAmount = Abs(smoothedLean.y / smoothLeanMag);
+					leftRightLeanAmount = Abs(smoothedLean.x / smoothLeanMag);
+				}
+			} else {
+				fwdBackLeanAmount = 1.0f;
+				leftRightLeanAmount = 0.0f;
+			}
+		} else {
+			fwdBackLeanAmount = 0.0f;
+			leftRightLeanAmount = 1.0f;
+		}
+		float fwdBackBlend = fwdBackLeanAmount * blendDelta;
+		float leftRightBlend = leftRightLeanAmount * blendDelta;
+		if (IsPlayer()) {
+			if (!fwdAssoc)
+				fwdAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_FWD);
+			if (!backAssoc)
+				backAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_BACK);
+
+			if (bike->m_fPedLeanAmountUD < 0.0f) {
+				backAssoc->blendAmount = fwdBackBlend;
+				backAssoc->SetCurrentTime(-(bike->m_fPedLeanAmountUD * backAssoc->hierarchy->totalLength));
+				backAssoc->flags &= ~ASSOC_RUNNING;
+				fwdAssoc->blendAmount = 0.0f;
+			} else {
+				fwdAssoc->blendAmount = fwdBackBlend;
+				fwdAssoc->SetCurrentTime(bike->m_fPedLeanAmountUD* fwdAssoc->hierarchy->totalLength);
+				fwdAssoc->flags &= ~ASSOC_RUNNING;
+				backAssoc->blendAmount = 0.0f;
+			}
+		}
+		if (!leftAssoc)
+			leftAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_LEFT);
+		if (!rightAssoc)
+			rightAssoc = CAnimManager::AddAnimation(GetClump(), bike->m_bikeAnimType, ANIM_BIKE_RIGHT);
+
+		if (bike->m_fPedLeanAmountLR < 0.0f) {
+			leftAssoc->blendAmount = leftRightBlend;
+			leftAssoc->SetCurrentTime(-(bike->m_fPedLeanAmountLR * leftAssoc->hierarchy->totalLength));
+			leftAssoc->flags &= ~ASSOC_RUNNING;
+			rightAssoc->blendAmount = 0.0f;
+		} else {
+			rightAssoc->blendAmount = leftRightBlend;
+			rightAssoc->SetCurrentTime(bike->m_fPedLeanAmountLR* rightAssoc->hierarchy->totalLength);
+			rightAssoc->flags &= ~ASSOC_RUNNING;
+			leftAssoc->blendAmount = 0.0f;
+		}
+		if (velocityFwdDotProd > 0.3f) {
+			RwV3d Xaxis = { 1.0f, 0.0f, 0.0f };
+			RwV3d Yaxis = { 0.0f, 1.0f, 0.0f };
+			RtQuatRotate(&m_pFrames[PED_HEAD]->hanimFrame->q, &Xaxis, CGeneral::GetRandomNumberInRange(-6.0f * velocityFwdDotProd, 6.0f * velocityFwdDotProd), rwCOMBINEPOSTCONCAT);
+			RtQuatRotate(&m_pFrames[PED_HEAD]->hanimFrame->q, &Yaxis, CGeneral::GetRandomNumberInRange(-6.0f * velocityFwdDotProd, 6.0f * velocityFwdDotProd), rwCOMBINEPOSTCONCAT);
+			bDontAcceptIKLookAts = true;
+		}
+		return;
+	}
+
+	if (!IsPlayer())
+		return;
+
+	float steerAngle = m_pMyVehicle->m_fSteerAngle;
+	CAnimBlendAssociation* lDriveAssoc;
+	CAnimBlendAssociation* rDriveAssoc;
+	CAnimBlendAssociation* lbAssoc;
+	CAnimBlendAssociation* sitAssoc;
+	if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT)) {
+		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT);
+
+		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
+			return;
+		}
+
+		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT_L);
+		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_BOAT_R);
+		lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_BOAT_LB);
+	}
+	else if (m_pMyVehicle->bLowVehicle) {
+		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LSIT);
+
+		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
+			return;
+		}
+
+		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_L);
+		lbAssoc = nil;
+		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_LOW_R);
+	}
+	else {
+		sitAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_SIT);
+
+		if (!sitAssoc || sitAssoc->blendAmount < 1.0f) {
+			return;
+		}
+
+		lDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_L);
+		rDriveAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVE_R);
+		lbAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_CAR_LB);
+	}
+
+	if (lbAssoc &&
+		TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON
+		&& TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_LEFT) {
+		lbAssoc->blendDelta = -1000.0f;
+	}
+
+	CAnimBlendAssociation* driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_L);
+	if (!driveByAssoc)
+		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_R);
+	if (!driveByAssoc)
+		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_LOW_L);
+	if (!driveByAssoc)
+		driveByAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_DRIVEBY_LOW_R);
+
+	if (m_pMyVehicle->bLowVehicle || m_pMyVehicle->m_fGasPedal >= 0.0f || driveByAssoc) {
+		if (steerAngle == 0.0f || driveByAssoc) {
+			if (lDriveAssoc)
+				lDriveAssoc->blendAmount = 0.0f;
+			if (rDriveAssoc)
+				rDriveAssoc->blendAmount = 0.0f;
+
+		}
+		else if (steerAngle <= 0.0f) {
+			if (lDriveAssoc)
+				lDriveAssoc->blendAmount = 0.0f;
+
+			if (rDriveAssoc)
+				rDriveAssoc->blendAmount = clamp(steerAngle * -100.0f / 61.0f, 0.0f, 1.0f);
+			else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT_R);
+			else if (m_pMyVehicle->bLowVehicle)
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_R);
+			else
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_R);
+
+		}
+		else {
+			if (rDriveAssoc)
+				rDriveAssoc->blendAmount = 0.0f;
+
+			if (lDriveAssoc)
+				lDriveAssoc->blendAmount = clamp(steerAngle * 100.0f / 61.0f, 0.0f, 1.0f);
+			else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_BOAT_L);
+			else if (m_pMyVehicle->bLowVehicle)
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_LOW_L);
+			else
+				CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_DRIVE_L);
+		}
+
+		if (lbAssoc)
+			lbAssoc->blendDelta = -4.0f;
+	}
+	else {
+
+		if ((TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON
+			|| TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking != LOOKING_LEFT)
+			&& (!lbAssoc || lbAssoc->blendAmount < 1.0f && lbAssoc->blendDelta <= 0.0f)) {
+
+			if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
+				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_BOAT_LB, 4.0f);
+			else
+				CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_CAR_LB, 4.0f);
+		}
+	}
+}
+
+void
+PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount)
+{
+	if (!ped->IsPedInControl())
+		return;
+
+	const char *groupName = CAnimManager::GetAnimGroupName(animGroup);
+	CAnimBlock *animBlock = CAnimManager::GetAnimationBlock(groupName);
+	CAnimBlendAssociation *assoc;
+	for (assoc = RpAnimBlendClumpGetFirstAssociation(ped->GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+		int first = animBlock->firstIndex;
+		int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+		if (index >= first && index < first + animBlock->numAnims) {
+			break;
+		}
+	}
+
+	if (CTimer::GetTimeInMilliseconds() > ped->m_nWaitTimer && assoc)
+		assoc->flags &= ~ASSOC_REPEAT;
+
+	if (!assoc || assoc->blendDelta < 0.0f) {
+		int selectedAnimOffset;
+		do
+			selectedAnimOffset = CGeneral::GetRandomNumberInRange(0, amount);
+		while (assoc && first + selectedAnimOffset == assoc->animId);
+
+		assoc = CAnimManager::BlendAnimation(ped->GetClump(), animGroup, (AnimationId)(first + selectedAnimOffset), 3.0f);
+
+		assoc->SetFinishCallback(CPed::FinishedWaitCB, ped);
+		if (assoc->flags & ASSOC_REPEAT)
+			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + CGeneral::GetRandomNumberInRange(3000, 8000);
+		else
+			ped->m_nWaitTimer = CTimer::GetTimeInMilliseconds() + 8000;
+	}
+}
+
+bool
+IsPedPointerValid_NotInWorld(CPed* pPed)
+{
+	if (!pPed)
+		return false;
+	int index = CPools::GetPedPool()->GetJustIndex(pPed);
+#ifdef FIX_BUGS
+	if (index < 0 || index >= NUMPEDS)
+#else
+	if (index < 0 || index > NUMPEDS)
+#endif
+		return false;
+	return true;
+}
+
+bool
+IsPedPointerValid(CPed* pPed)
+{
+	if (!IsPedPointerValid_NotInWorld(pPed))
+		return false;
+	if (pPed->bInVehicle && pPed->m_pMyVehicle)
+		return IsEntityPointerValid(pPed->m_pMyVehicle);
+	return pPed->m_entryInfoList.first || pPed == FindPlayerPed();
+}
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 6e536ede..8e8e3b75 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -9,6 +9,7 @@
 #include "Physical.h"
 #include "Weapon.h"
 #include "WeaponInfo.h"
+#include "AnimationId.h"
 
 #define FEET_OFFSET	1.04f
 #define CHECK_NEARBY_THINGS_MAX_DIST	15.0f
@@ -19,6 +20,7 @@ class CObject;
 class CFire;
 struct AnimBlendFrameData;
 class CAnimBlendAssociation;
+class CPedAttractor;
 
 struct PedAudioData
 {
@@ -78,11 +80,11 @@ struct FightMove
 	float endFireTime;
 	float comboFollowOnTime;
 	float strikeRadius;
+	float extendReachMultiplier;
 	uint8 hitLevel; // FightMoveHitLevel
 	uint8 damage;
 	uint8 flags;
 };
-VALIDATE_SIZE(FightMove, 0x18);
 
 // TODO: This is eFightState on mobile.
 enum PedFightMoves
@@ -93,13 +95,21 @@ enum PedFightMoves
 	FIGHTMOVE_IDLE,
 	FIGHTMOVE_SHUFFLE_F,
 	FIGHTMOVE_KNEE,
-	FIGHTMOVE_HEADBUTT,
-	FIGHTMOVE_PUNCHJAB,
 	FIGHTMOVE_PUNCHHOOK,
-	FIGHTMOVE_KICK,
+	FIGHTMOVE_PUNCHJAB,
+	FIGHTMOVE_PUNCH,
+	FIGHTMOVE_BODYBLOW = FIGHTMOVE_PUNCH,
 	FIGHTMOVE_LONGKICK,
 	FIGHTMOVE_ROUNDHOUSE,
-	FIGHTMOVE_BODYBLOW,
+	// Directionals
+	FIGHTMOVE_FWDLEFT,
+	FIGHTMOVE_FWDRIGHT,
+	FIGHTMOVE_BACKKICK,
+	FIGHTMOVE_BACKFLIP,
+	FIGHTMOVE_BACKLEFT,
+	FIGHTMOVE_BACKRIGHT,
+	FIGHTMOVE_RIGHTSWEEP,
+	// Special
 	FIGHTMOVE_GROUNDKICK,
 	// Opponent
 	FIGHTMOVE_HITFRONT,
@@ -112,6 +122,9 @@ enum PedFightMoves
 	FIGHTMOVE_HITBIGSTEP,
 	FIGHTMOVE_HITONFLOOR,
 	FIGHTMOVE_HITBEHIND,
+	FIGHTMOVE_MELEE1,
+	FIGHTMOVE_MELEE2,
+	FIGHTMOVE_MELEE3,
 	FIGHTMOVE_IDLE2NORM,
 	NUM_FIGHTMOVES
 };
@@ -148,12 +161,28 @@ enum eWaitState {
 	WAITSTATE_PLAYANIM_HANDSUP,
 	WAITSTATE_PLAYANIM_HANDSCOWER,
 	WAITSTATE_PLAYANIM_CHAT,
-	WAITSTATE_FINISH_FLEE
+	WAITSTATE_FINISH_FLEE,
+	WAITSTATE_SIT_DOWN,
+	WAITSTATE_SIT_DOWN_RVRS,
+	WAITSTATE_SIT_UP,
+	WAITSTATE_SIT_IDLE,
+	WAITSTATE_USE_ATM,
+	WAITSTATE_SUN_BATHE_PRE,
+	WAITSTATE_SUN_BATHE_DOWN,
+	WAITSTATE_SUN_BATHE_IDLE,
+	WAITSTATE_RIOT,
+	WAITSTATE_FAST_FALL,
+	WAITSTATE_BOMBER,
+	WAITSTATE_STRIPPER,
+	WAITSTATE_GROUND_ATTACK,
+	WAITSTATE_LANCESITTING,
+	WAITSTATE_PLAYANIM_HANDSUP_SIMPLE,
 };
 
 enum eObjective : uint32 {
 	OBJECTIVE_NONE,
 	OBJECTIVE_IDLE,
+	OBJ_2,
 	OBJECTIVE_FLEE_TILL_SAFE,
 	OBJECTIVE_GUARD_SPOT,
 	OBJECTIVE_GUARD_AREA,	// not implemented
@@ -165,6 +194,8 @@ enum eObjective : uint32 {
 	OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS,
 	OBJECTIVE_GOTO_CHAR_ON_FOOT,
 	OBJECTIVE_FOLLOW_PED_IN_FORMATION,
+	OBJ_14,
+	OBJ_15,
 	OBJECTIVE_LEAVE_VEHICLE,
 	OBJECTIVE_ENTER_CAR_AS_PASSENGER,
 	OBJECTIVE_ENTER_CAR_AS_DRIVER,
@@ -175,8 +206,8 @@ enum eObjective : uint32 {
 	OBJECTIVE_GOTO_AREA_ANY_MEANS,
 	OBJECTIVE_GOTO_AREA_ON_FOOT,
 	OBJECTIVE_RUN_TO_AREA,
-	OBJECTIVE_23,	// not implemented
-	OBJECTIVE_24,	// not implemented
+	OBJECTIVE_26,	// not implemented
+	OBJECTIVE_27,	// not implemented
 	OBJECTIVE_FIGHT_CHAR,
 	OBJECTIVE_SET_LEADER,
 	OBJECTIVE_FOLLOW_ROUTE,
@@ -185,22 +216,44 @@ enum eObjective : uint32 {
 	OBJECTIVE_CATCH_TRAIN,
 	OBJECTIVE_BUY_ICE_CREAM,
 	OBJECTIVE_STEAL_ANY_CAR,
+	OBJ_36,
 	OBJECTIVE_MUG_CHAR,
+	OBJECTIVE_LEAVE_CAR_AND_DIE,
+	OBJECTIVE_USE_SEAT_ATTRACTOR,
+	OBJECTIVE_USE_ATM_ATTRACTOR,
 	OBJECTIVE_FLEE_CAR,
-#ifdef VC_PED_PORTS
-	OBJECTIVE_LEAVE_CAR_AND_DIE
-#endif
+	OBJ_42,
+	OBJECTIVE_USE_STOP_ATTRACTOR,
+	OBJECTIVE_USE_PIZZA_ATTRACTOR,
+	OBJECTIVE_USE_SHELTER_ATTRACTOR,
+	OBJECTIVE_AIM_GUN_AT_PED,
+	OBJ_47,
+	OBJECTIVE_WAIT_FOR_RAIN_TO_END,
+	OBJECTIVE_SPRINT_TO_COORD,
+	OBJ_50,
+	OBJ_51,
+	OBJECTIVE_WAIT_FOR_BUS,
+	OBJECTIVE_USE_ICECREAM_ATTRACTOR,
+	OBJECTIVE_PURCHASE_ICECREAM,
+	OBJ_55,
+	OBJ_56,
+	OBJ_57,
+	OBJ_58,
+	OBJ_59
+
 };
 
 enum {
 	RANDOM_CHAR = 1,
 	MISSION_CHAR,
+	TODO_CHAR, // TODO(Miami)
 };
 
 enum PedLineUpPhase {
 	LINE_UP_TO_CAR_START,
 	LINE_UP_TO_CAR_END,
-	LINE_UP_TO_CAR_2 // Buggy. Used for cops arresting you from passenger door
+	LINE_UP_TO_CAR_2, // Buggy. Used for cops arresting you from passenger door
+	LINE_UP_TO_CAR_FALL
 };
 
 enum PedOnGroundState {
@@ -251,12 +304,17 @@ enum PedState
 	PED_INVESTIGATE,
 	PED_STEP_AWAY,
 	PED_ON_FIRE,
+	PED_SUN_BATHE,
+	PED_FLASH,
+	PED_JOG,
+	PED_ANSWER_MOBILE,
 
 	PED_UNKNOWN,	// Same with IDLE, but also infects up to 5 peds with same pedType and WANDER_PATH, so they become stone too. HANG_OUT in Fire_Head's idb
 
 	PED_STATES_NO_AI,
 
-	// One of these states isn't on PS2 - start
+	PED_ABSEIL,
+	PED_SIT,
 	PED_JUMP,
 	PED_FALL,
 	PED_GETUP,
@@ -267,7 +325,6 @@ enum PedState
 	PED_ENTER_TRAIN,
 	PED_EXIT_TRAIN,
 	PED_ARREST_PLAYER,
-	// One of these states isn't on PS2 - end
 
 	PED_DRIVING,
 	PED_PASSENGER,
@@ -282,6 +339,7 @@ enum PedState
 	PED_EXIT_CAR,
 	PED_HANDS_UP,
 	PED_ARRESTED,
+	PED_DEPLOY_STINGER
 };
 
 enum eMoveState {
@@ -379,22 +437,62 @@ public:
 	uint32 bVehExitWillBeInstant : 1;
 	uint32 bHasAlreadyBeenRecorded : 1;
 	uint32 bFallenDown : 1;
-#ifdef VC_PED_PORTS
-	uint32 bSomeVCflag1 : 1;
-#endif
 #ifdef PED_SKIN
 	uint32 bDontAcceptIKLookAts : 1;	// TODO: find uses of this
 #endif
+	uint32 bReachedAttractorHeadingTarget : 1;
+	uint32 bTurnedAroundOnAttractor : 1;
+
+	uint32 bHasAlreadyUsedAttractor : 1;
+	//uint32 b155_2
+	uint32 bCarPassenger : 1;
+	//uint32 b155_8
+	//uint32 b155_10
+	uint32 bMiamiViceCop : 1;
+	uint32 bMoneyHasBeenGivenByScript : 1; //
+	uint32 bHasBeenPhotographed : 1;  //
+
+	uint32 bIsDrowning : 1;
+	uint32 bDrownsInWater : 1;
+	//uint32 b156_4
+	uint32 b156_8 : 1;
+	uint32 bIsPlayerFriend : 1;
+#ifdef VC_PED_PORTS
+	uint32 bHeadStuckInCollision : 1;
+#endif
+	uint32 bDeadPedInFrontOfCar : 1;
+	uint32 bStayInCarOnJack : 1;
+
+	uint32 bDontFight : 1;
+	uint32 bDoomAim : 1;
+	uint32 bCanBeShotInVehicle : 1;
+	//uint32 b157_8
+	//uint32 b157_10
+	//uint32 b157_20
+	//uint32 b157_40
+	uint32 bIgnoreThreatsBehindObjects : 1;
+
+	uint32 bNeverEverTargetThisPed : 1;
+	//uint32 b158_2
+	uint32 b158_4 : 1;
+	//uint32 b158_8
+	//uint32 b158_10
+	uint32 bBoughtIceCream : 1;
+	//uint32 b158_40
+	//uint32 b158_80
+
 	// our own flags
 	uint32 m_ped_flagI40 : 1; // bMakePedsRunToPhonesToReportCrimes makes use of this as runover by car indicator
 	uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle 
 
+	uint8 m_gangFlags;
 	uint8 CharCreatedBy;
 	eObjective m_objective;
 	eObjective m_prevObjective;
 	CPed *m_pedInObjective;
 	CVehicle *m_carInObjective;
 	CVector m_nextRoutePointPos;
+	float m_attractorHeading;
 	CPed *m_leader;
 	eFormation m_pedFormation;
 	uint32 m_fearFlags;
@@ -428,11 +526,11 @@ public:
 	uint16 m_nPathNodes;
 	int16 m_nCurPathNode;
 	int8 m_nPathDir;
-public:
 	CPathNode *m_pLastPathNode;
 	CPathNode *m_pNextPathNode;
 	float m_fHealth;
 	float m_fArmour;
+	uint32 m_nExtendedRangeTimer;
 	int16 m_routeLastPoint;
 	uint16 m_routeStartPoint;
 	int16 m_routePointsPassed;
@@ -452,6 +550,11 @@ public:
 	CVehicle *m_pMyVehicle;
 	bool bInVehicle;
 	float m_distanceToCountSeekDone;
+	float m_acceptableHeadingOffset;
+	CPedAttractor* m_attractor;
+	int32 m_positionInQueue;
+	CVehicle* m_vehicleInAccident;
+
 	bool bRunningToPhone;
 	int16 m_phoneId;
 	eCrimeType m_crimeToReportOnPhone;
@@ -463,14 +566,17 @@ public:
 	float m_fleeFromPosY;
 	CEntity *m_fleeFrom;
 	uint32 m_fleeTimer;
+	CEntity* pThreatEx; // TODO(Miami): What is this?
 	CEntity* m_collidingEntityWhileFleeing;
 	uint32 m_collidingThingTimer;
 	CEntity *m_pCollidingEntity;
 	uint8 m_stateUnused;
 	uint32 m_timerUnused;
 	class CRange2D *m_wanderRangeBounds;
-	CWeapon m_weapons[WEAPONTYPE_TOTAL_INVENTORY_WEAPONS];
+	CWeapon m_weapons[TOTAL_WEAPON_SLOTS];
 	eWeaponType m_storedWeapon;
+	eWeaponType m_delayedWeapon;
+	uint32 m_delayedWeaponAmmo;
 	uint8 m_currentWeapon;			// eWeaponType
 	uint8 m_maxWeaponTypeAllowed;	// eWeaponType
 	uint8 m_wepSkills;
@@ -481,6 +587,7 @@ public:
 	uint8 m_fightButtonPressure;
 	FightState m_fightState;
 	bool m_takeAStepAfterAttack;
+	uint8 m_bleedCounter;
 	CFire *m_pFire;
 	CEntity *m_pLookTarget;
 	float m_fLookDirection;
@@ -496,12 +603,26 @@ public:
 	uint32 m_duckTimer;
 	uint32 m_duckAndCoverTimer;
 	uint32 m_bloodyFootprintCountOrDeathTime;	// Death time when bDoBloodyFootprints is false. Weird decision
+	uint32 m_shotTime;
+	uint32 m_ceaseAttackTimer;
 	uint8 m_panicCounter;
 	bool m_deadBleeding;
 	int8 m_bodyPartBleeding;		// PedNode, but -1 if there isn't
 	CPed *m_nearPeds[10];
 	uint16 m_numNearPeds;
-	int8 m_lastWepDam;
+	uint16 m_nPedMoney;
+ 	int8 m_lastWepDam;
+	CEntity *m_lastDamEntity;
+	CEntity *m_attachedTo;
+	CVector m_vecAttachOffset;
+	uint16 m_attachType;
+	float m_attachRot;
+	uint32 m_attachWepAmmo;
+	uint32 m_threatFlags;
+	uint32 m_threatCheck;
+	uint32 m_lastThreatCheck;
+	uint32 m_sayType;
+	uint32 m_sayTimer;
 	uint32 m_lastSoundStart;
 	uint32 m_soundStart;
 	uint16 m_lastQueuedSound;
@@ -536,7 +657,7 @@ public:
 	void SetLookFlag(CEntity *target, bool keepTryingToLook);
 	void SetLookFlag(float direction, bool keepTryingToLook);
 	void SetLookTimer(int time);
-	void SetDie(AnimationId anim, float arg1, float arg2);
+	void SetDie(AnimationId anim = ANIM_KO_SHOT_FRONT1, float arg1 = 4.0f, float arg2 = 0.0f);
 	void SetDead(void);
 	void ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer);
 	void RemoveBodyPart(PedNode nodeId, int8 direction);
@@ -549,9 +670,10 @@ public:
 	void ClearAttack(void);
 	bool IsPedHeadAbovePos(float zOffset);
 	void RemoveWeaponModel(int modelId);
-	void SetCurrentWeapon(uint32 weaponType);
+	void SetCurrentWeapon(eWeaponType weaponType);
+	void SetCurrentWeapon(int weapon);
 	void Duck(void);
-	void ClearDuck(void);
+	void ClearDuck(bool = false);
 	void ClearPointGunAt(void);
 	void BeingDraggedFromCar(void);
 	void RestartNonPartialAnims(void);
@@ -560,7 +682,7 @@ public:
 	void PlayFootSteps(void);
 	void QuitEnteringCar(void);
 	void BuildPedLists(void);
-	uint32 GiveWeapon(eWeaponType weaponType, uint32 ammo);
+	int32 GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused = false);
 	void CalculateNewOrientation(void);
 	float WorkOutHeadingForMovingFirstPerson(float);
 	void CalculateNewVelocity(void);
@@ -575,10 +697,11 @@ public:
 	void SetObjective(eObjective, int16, int16);
 	void SetObjective(eObjective, CVector);
 	void SetObjective(eObjective, CVector, float);
+	void SetObjective(eObjective, float, const CVector&);
 	void ClearChat(void);
 	void InformMyGangOfAttack(CEntity*);
 	void ReactToAttack(CEntity*);
-	void SetDuck(uint32);
+	void SetDuck(uint32, bool = false);
 	void RegisterThreatWithGangPeds(CEntity*);
 	bool TurnBody(void);
 	void Chat(void);
@@ -596,7 +719,9 @@ public:
 	void SetPointGunAt(CEntity*);
 	bool Seek(void);
 	bool SetWanderPath(int8);
-	bool SetFollowPath(CVector);
+	bool SetFollowPath(CVector dest, float radius, eMoveState state, CEntity*, CEntity*, int);
+	bool SetFollowPathStatic(void);
+	bool SetFollowPathDynamic(void);
 	void ClearAttackByRemovingAnim(void);
 	void SetStoredState(void);
 	void StopNonPartialAnims(void);
@@ -632,8 +757,10 @@ public:
 	void RemoveInCarAnims(void);
 	void CollideWithPed(CPed*);
 	void SetDirectionToWalkAroundObject(CEntity*);
+	void RemoveWeaponAnims(int, float);
 	void CreateDeadPedMoney(void);
 	void CreateDeadPedWeaponPickups(void);
+	void CreateDeadPedPickupCoors(float *x, float *y, float *z);
 	void SetAttackTimer(uint32);
 	void SetBeingDraggedFromCar(CVehicle*, uint32, bool);
 	void SetRadioStation(void);
@@ -647,7 +774,6 @@ public:
 	void EnterCar(void);
 	uint8 GetNearestTrainPedPosition(CVehicle*, CVector&);
 	uint8 GetNearestTrainDoor(CVehicle*, CVector&);
-	void LineUpPedWithTrain(void);
 	void ExitCar(void);
 	void Fight(void);
 	bool FindBestCoordsFromNodes(CVector, CVector*);
@@ -694,7 +820,6 @@ public:
 	void SetExitCar(CVehicle*, uint32);
 	void SetFormation(eFormation);
 	bool WillChat(CPed*);
-	void SetEnterTrain(CVehicle*, uint32);
 	void SetEnterCar_AllClear(CVehicle*, uint32, uint32);
 	void SetSolicit(uint32 time);
 	void ScanForInterestingStuff(void);
@@ -703,6 +828,20 @@ public:
 	bool WarpPedToNearLeaderOffScreen(void);
 	void Solicit(void);
 	void SetExitBoat(CVehicle*);
+	void ClearFollowPath();
+	void GiveDelayedWeapon(eWeaponType weapon, uint32 ammo);
+	void RequestDelayedWeapon();
+	void AddInCarAnims(CVehicle* car, bool isDriver);
+	bool CanBeDamagedByThisGangMember(CPed*);
+	void AnswerMobile(void);
+	void BuyIceCream(void);
+	void CheckThreatValidity(void);
+	void ClearAnswerMobile(void);
+	void SetAnswerMobile(void);
+	void AttachPedToEntity(CEntity*, CVector, uint16, float, eWeaponType);
+	void DettachPedFromEntity();
+	void PedShuffle();
+	void DriveVehicle();
 
 	// Static methods
 	static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset);
@@ -730,8 +869,9 @@ public:
 	static void PedSetDraggedOutCarCB(CAnimBlendAssociation *assoc, void *arg);
 	static void PedAnimStepOutCarCB(CAnimBlendAssociation *assoc, void *arg);
 	static void PedSetInTrainCB(CAnimBlendAssociation *assoc, void *arg);
-	static void PedSetOutTrainCB(CAnimBlendAssociation *assoc, void *arg);
+	static void PedSetOutTrainCB(CAnimBlendAssociation *assoc, void *arg); // TODO(Miami): Should be under GTA_TRAIN
 	static void FinishedAttackCB(CAnimBlendAssociation *assoc, void *arg);
+	static void FinishedReloadCB(CAnimBlendAssociation *assoc, void *arg);
 	static void FinishFightMoveCB(CAnimBlendAssociation *assoc, void *arg);
 	static void PedAnimDoorCloseRollingCB(CAnimBlendAssociation *assoc, void *arg);
 	static void FinishJumpCB(CAnimBlendAssociation *assoc, void *arg);
@@ -741,6 +881,7 @@ public:
 	static void PedSetDraggedOutCarPositionCB(CAnimBlendAssociation *assoc, void *arg);
 
 	bool IsPlayer(void);
+	bool IsFemale(void) { return m_nPedType == PEDTYPE_CIVFEMALE || m_nPedType == PEDTYPE_PROSTITUTE; }
 	bool UseGroundColModel(void);
 	bool CanSetPedState(void);
 	bool IsPedInControl(void);
@@ -760,8 +901,14 @@ public:
 	void SetPedStats(ePedStats);
 	bool IsGangMember(void);
 	void Die(void);
+#ifdef GTA_TRAIN
 	void EnterTrain(void);
 	void ExitTrain(void);
+	void SetExitTrain(CVehicle*);
+	void SetPedPositionInTrain(void);
+	void LineUpPedWithTrain(void);
+	void SetEnterTrain(CVehicle*, uint32);
+#endif
 	void Fall(void);
 	bool IsPedShootable(void);
 	void Look(void);
@@ -769,29 +916,33 @@ public:
 	void RestoreHeadPosition(void);
 	void PointGunAt(void);
 	bool ServiceTalkingWhenDead(void);
-	void SetPedPositionInTrain(void);
 	void SetShootTimer(uint32);
 	void SetSeekCar(CVehicle*, uint32);
 	void SetSeekBoatPosition(CVehicle*);
-	void SetExitTrain(CVehicle*);
 	void WanderRange(void);
 	void SetFollowRoute(int16, int16);
 	void SeekBoatPosition(void);
 	void UpdatePosition(void);
 	CObject *SpawnFlyingComponent(int, int8);
 	void SetCarJack_AllClear(CVehicle*, uint32, uint32);
-#ifdef VC_PED_PORTS
 	bool CanPedJumpThis(CEntity*, CVector*);
-#else
-	bool CanPedJumpThis(CEntity*);
-#endif
 
-	bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; }
-	CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; }
+	void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int);
+	void ClearWaitState(void);
+	void Undress(const char*);
+	void Dress(void);
+
+	bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; }
+	CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }
 	CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; }
 
 	PedState GetPedState(void) { return m_nPedState; }
-	void SetPedState(PedState state) { m_nPedState = state; }
+	void SetPedState(PedState state) 
+	{
+		if (GetPedState() == PED_FOLLOW_PATH)
+			ClearFollowPath();
+		m_nPedState = state;
+	}
 	bool Dead(void) { return m_nPedState == PED_DEAD; }
 	bool Dying(void) { return m_nPedState == PED_DIE; }
 	bool DyingOrDead(void) { return m_nPedState == PED_DIE || m_nPedState == PED_DEAD; }
@@ -800,10 +951,65 @@ public:
 	bool Driving(void) { return m_nPedState == PED_DRIVING; }
 	bool InVehicle(void) { return bInVehicle && m_pMyVehicle; } // True when ped is sitting/standing in vehicle, not in enter/exit state.
 	bool EnteringCar(void) { return m_nPedState == PED_ENTER_CAR || m_nPedState == PED_CARJACK; }
+	bool HasAttractor(void) { return m_attractor != nil; }
+	bool IsUseAttractorObjective(eObjective obj) {
+		return obj == OBJECTIVE_USE_ATM_ATTRACTOR || obj == OBJECTIVE_USE_ICECREAM_ATTRACTOR ||
+			obj == OBJECTIVE_USE_PIZZA_ATTRACTOR || obj == OBJECTIVE_USE_SEAT_ATTRACTOR ||
+			obj == OBJECTIVE_USE_SHELTER_ATTRACTOR || obj == OBJECTIVE_USE_STOP_ATTRACTOR;
+	}
 
 	void ReplaceWeaponWhenExitingVehicle(void);
 	void RemoveWeaponWhenEnteringVehicle(void);
 	bool IsNotInWreckedVehicle();
+
+	// My names. Inlined in VC
+	AnimationId GetFireAnimNotDucking(CWeaponInfo* weapon) {
+		if (m_nPedType == PEDTYPE_COP && !!weapon->m_bCop3rd)
+			return ANIM_WEAPON_FIRE_3RD;
+		else
+			return GetPrimaryFireAnim(weapon);
+	}
+
+	static AnimationId GetFireAnimGround(CWeaponInfo* weapon, bool kickFloorIfNone = true) {
+		if (!!weapon->m_bGround2nd)
+			return ANIM_WEAPON_CROUCHFIRE;
+		else if (!!weapon->m_bGround3rd)
+			return ANIM_WEAPON_FIRE_3RD;
+		else if (kickFloorIfNone)
+			return ANIM_KICK_FLOOR;
+		else
+			return (AnimationId)0;
+	}
+
+	static AnimationId GetPrimaryFireAnim(CWeaponInfo* weapon) {
+		if (weapon->m_bAnimDetonate)
+			return ANIM_BOMBER;
+		else
+			return ANIM_WEAPON_FIRE;
+	}
+
+	static AnimationId GetCrouchReloadAnim(CWeaponInfo* weapon) {
+		if (!!weapon->m_bReload)
+			return ANIM_WEAPON_CROUCHRELOAD;
+		else
+			return (AnimationId)0;
+	}
+
+	static AnimationId GetCrouchFireAnim(CWeaponInfo* weapon) {
+		if (!!weapon->m_bCrouchFire)
+			return ANIM_WEAPON_CROUCHFIRE;
+		else
+			return (AnimationId)0;
+	}
+
+	static AnimationId GetReloadAnim(CWeaponInfo* weapon) {
+		if (!!weapon->m_bReload)
+			return ANIM_WEAPON_RELOAD;
+		else
+			return (AnimationId)0;
+	}
+	// --
+
 	// My additions, because there were many, many instances of that.
 	inline void SetFindPathAndFlee(CEntity *fleeFrom, int time, bool walk = false)
 	{
@@ -822,43 +1028,24 @@ public:
 		if (walk)
 			SetMoveState(PEDMOVE_WALK);
 	}
+	// --
 
 	// Using this to abstract nodes of skinned and non-skinned meshes
 	CVector GetNodePosition(int32 node)
 	{
-#ifdef PED_SKIN
-		if(IsClumpSkinned(GetClump())){
-			RwV3d pos = { 0.0f, 0.0f, 0.0f };
-			RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-			int32 idx = RpHAnimIDGetIndex(hier, m_pFrames[node]->nodeID);
-			RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
-			// this is just stupid
-			//RwV3dTransformPoints(&pos, &pos, 1, &mats[idx]);
-			pos = mats[idx].pos;
-			return pos;
-		}else
-#endif
-		{
-			RwMatrix mat;
-			CPedIK::GetWorldMatrix(m_pFrames[node]->frame, &mat);
-			return mat.pos;
-		}
+		RwV3d pos = { 0.0f, 0.0f, 0.0f };
+		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
+		int32 idx = RpHAnimIDGetIndex(hier, m_pFrames[node]->nodeID);
+		RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
+		pos = mats[idx].pos;
+		return pos;
 	}
 	void TransformToNode(CVector &pos, int32 node)
 	{
-#ifdef PED_SKIN
-		if(IsClumpSkinned(GetClump())){
-			RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
-			int32 idx = RpHAnimIDGetIndex(hier, m_pFrames[node]->nodeID);
-			RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
-			RwV3dTransformPoints((RwV3d*)&pos, (RwV3d*)&pos, 1, &mats[idx]);
-		}else
-#endif
-		{
-			RwFrame *frame;
-			for (frame = m_pFrames[node]->frame; frame; frame = RwFrameGetParent(frame))
-				RwV3dTransformPoints((RwV3d*)&pos, (RwV3d*)&pos, 1, RwFrameGetMatrix(frame));
-		}
+		RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(GetClump());
+		int32 idx = RpHAnimIDGetIndex(hier, m_pFrames[node]->nodeID);
+		RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
+		RwV3dTransformPoints((RwV3d*)&pos, (RwV3d*)&pos, 1, &mats[idx]);
 	}
 
 	// set by 0482:set_threat_reaction_range_multiplier opcode
@@ -896,18 +1083,21 @@ public:
 	void DebugRenderClosePedText();
 #endif
 
-#ifdef PED_SKIN
-	void renderLimb(int node);
-#endif
-
 #ifdef COMPATIBLE_SAVES
 	virtual void Save(uint8*& buf);
 	virtual void Load(uint8*& buf);
 #endif
 };
 
+void FinishTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg);
+void StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg);
 void FinishFuckUCB(CAnimBlendAssociation *assoc, void *arg);
+void PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount);
 
+// TODO(Miami): Change those when Ped struct is done
 #ifndef PED_SKIN
 VALIDATE_SIZE(CPed, 0x53C);
 #endif
+
+bool IsPedPointerValid(CPed*);
+bool IsPedPointerValid_NotInWorld(CPed*);
diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp
new file mode 100644
index 00000000..3d35b8a3
--- /dev/null
+++ b/src/peds/PedAttractor.cpp
@@ -0,0 +1,775 @@
+#include "common.h"
+#include "PedAttractor.h"
+
+#include "General.h"
+#include "Vehicle.h"
+#include "World.h"
+
+const int gcMaxSizeOfAtmQueue = 1;
+const int gcMaxSizeOfSeatQueue = 1;
+const int gcMaxSizeOfStopQueue = 5;
+const int gcMaxSizeOfPizzaQueue = 5;
+const int gcMaxSizeOfShelterQueue = 5;
+const int gcMaxSizeOfIceCreamQueue = 1;
+
+//--MIAMI: file done
+
+std::vector<CVector> CPedShelterAttractor::ms_displacements;
+
+CPedAttractorManager* GetPedAttractorManager()
+{
+	static CPedAttractorManager manager;
+	return &manager;
+}
+
+CVehicleToEffect::CVehicleToEffect(CVehicle* pVehicle) : m_pVehicle(pVehicle)
+{
+	m_effects[1].col = CRGBA(0, 0, 0, 0);
+	m_effects[1].type = EFFECT_PED_ATTRACTOR;
+	m_effects[1].pos = CVector(2.0f, 1.0f, 0.0f);
+	m_effects[1].pedattr.useDir = CVector(-1.0f, 0.0f, 0.0f);
+	m_effects[1].pedattr.queueDir = CVector(-1.0f, 0.0f, 0.0f);
+	m_effects[1].pedattr.type = ATTRACTOR_ICECREAM;
+
+	m_effects[3].col = CRGBA(0, 0, 0, 0);
+	m_effects[3].type = EFFECT_PED_ATTRACTOR;
+	m_effects[3].pos = CVector(2.0f, -0.5f, 0.0f);
+	m_effects[3].pedattr.useDir = CVector(-1.0f, 0.0f, 0.0f);
+	m_effects[3].pedattr.queueDir = CVector(-1.0f, 0.0f, 0.0f);
+	m_effects[3].pedattr.type = ATTRACTOR_ICECREAM;
+
+	m_effects[0].col = CRGBA(0, 0, 0, 0);
+	m_effects[0].type = EFFECT_PED_ATTRACTOR;
+	m_effects[0].pos = CVector(-2.0f, 1.0f, 0.0f);
+	m_effects[0].pedattr.useDir = CVector(1.0f, 0.0f, 0.0f);
+	m_effects[0].pedattr.queueDir = CVector(1.0f, 0.0f, 0.0f);
+	m_effects[0].pedattr.type = ATTRACTOR_ICECREAM;
+
+	m_effects[2].col = CRGBA(0, 0, 0, 0);
+	m_effects[2].type = EFFECT_PED_ATTRACTOR;
+	m_effects[2].pos = CVector(-2.0f, -0.5f, 0.0f);
+	m_effects[2].pedattr.useDir = CVector(1.0f, 0.0f, 0.0f);
+	m_effects[2].pedattr.queueDir = CVector(1.0f, 0.0f, 0.0f);
+	m_effects[2].pedattr.type = ATTRACTOR_ICECREAM;
+}
+
+CVehicleToEffect& CVehicleToEffect::From(const CVehicleToEffect& other)
+{
+	m_pVehicle = other.m_pVehicle;
+	for (int i = 0; i < NUM_ATTRACTORS_FOR_ICECREAM_VAN; i++) {
+		m_effects[i].col = other.m_effects[i].col;
+		m_effects[i].type = other.m_effects[i].type;
+		m_effects[i].pos = other.m_effects[i].pos;
+		m_effects[i].pedattr = other.m_effects[i].pedattr;
+	}
+	return *this;
+}
+
+const C2dEffect* CVehicleToEffect::ChooseEffect(const CVector& pos) const
+{
+	if (!m_pVehicle)
+		return nil;
+	if (DotProduct(pos - m_pVehicle->GetPosition(), m_pVehicle->GetRight()) > 0.0f) {
+		if (DotProduct(pos - m_pVehicle->GetPosition(), m_pVehicle->GetForward()) > 0.0f)
+			return &m_effects[0];
+		else
+			return &m_effects[2];
+	}
+	else {
+		if (DotProduct(pos - m_pVehicle->GetPosition(), m_pVehicle->GetForward()) > 0.0f)
+			return &m_effects[1];
+		else
+			return &m_effects[3];
+	}
+}
+
+bool CVehicleToEffect::HasThisEffect(C2dEffect* pEffect) const
+{
+	for (int i = 0; i < NUM_ATTRACTORS_FOR_ICECREAM_VAN; i++) {
+		if (pEffect == &m_effects[i])
+			return true;
+	}
+	return false;
+}
+
+const C2dEffect* CPedAttractorManager::GetEffectForIceCreamVan(CVehicle* pVehicle, const CVector& pos)
+{
+	if (!vVehicleToEffect.empty()) {
+		for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend(); ++assoc) {
+			if (assoc->GetVehicle() == pVehicle)
+				return assoc->ChooseEffect(pos);
+		}
+	}
+	CVehicleToEffect effect(pVehicle);
+	vVehicleToEffect.push_back(effect);
+	return effect.ChooseEffect(pos);
+}
+
+CVehicle* CPedAttractorManager::GetIceCreamVanForEffect(C2dEffect* pEffect)
+{
+	if (vVehicleToEffect.empty())
+		return nil;
+	for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend(); ++assoc) {
+		if (assoc->HasThisEffect(pEffect))
+			return assoc->GetVehicle();
+	}
+	return nil;
+}
+
+const CPedAttractor* CPedAttractorManager::FindAssociatedAttractor(const C2dEffect* pEffect, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (vecAttractors.empty())
+		return nil;
+	for (std::vector<CPedAttractor*>::const_iterator attractor = vecAttractors.cbegin(); attractor != vecAttractors.cend(); ++attractor) {
+		if ((*attractor)->GetEffect() == pEffect)
+			return *attractor;
+	}
+	return nil;
+}
+
+void CPedAttractorManager::RemoveIceCreamVanEffects(C2dEffect* pEffect)
+{
+	CVehicle* pVehicle = GetIceCreamVanForEffect(pEffect);
+	if (!pVehicle)
+		return;
+	if (vVehicleToEffect.empty())
+		return;
+	for (std::vector<CVehicleToEffect>::const_iterator assoc = vVehicleToEffect.cbegin(); assoc != vVehicleToEffect.cend();) {
+		if (assoc->GetVehicle() != pVehicle)
+			return;
+		size_t total = 0;
+		for (size_t j = 0; j < NUM_ATTRACTORS_FOR_ICECREAM_VAN; j++) {
+			if (FindAssociatedAttractor(assoc->GetEffect(j), vIceCreamAttractors))
+				total++;
+		}
+		if (total > 0)
+			assoc++;
+		else
+			assoc = vVehicleToEffect.erase(assoc);
+	}
+}
+
+CPedAttractor::CPedAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+	p2dEffect(pEffect),
+	m_nMaxPedsInAttractor(maxpeds),
+	m_fQueueDistance(qdist),
+	m_fTimeInWaitQueue(waitTime),
+	m_fTimeInApproachingQueue(approachTime),
+	m_fDistanceToUseAttractor(distance),
+	m_fAcceptableHeading(headingdiff),
+	m_fMaxPositionDisplacement(posdisp),
+	m_fMaxHeadingDisplacement(headdisp)
+{
+	CPedAttractorManager::ComputeEffectPos(pEffect, matrix, vecEffectPos);
+	CPedAttractorManager::ComputeEffectQueueDir(pEffect, matrix, vecQueueDir);
+	CPedAttractorManager::ComputeEffectUseDir(pEffect, matrix, vecUseDir);
+}
+
+void CPedPizzaAttractor::UpdatePedStateOnDeparture(CPed* pPed) const
+{
+	if (pPed->m_nPedMoney > 10)
+		pPed->m_nPedMoney -= 10;
+	else
+		pPed->m_nPedMoney = 0;
+}
+
+void CPedAtmAttractor::UpdatePedStateOnDeparture(CPed* pPed) const
+{
+	pPed->m_nPedMoney += 20 * CGeneral::GetRandomNumberInRange(1, 51);
+};
+
+float CPedAttractor::ComputeDeltaHeading() const
+{
+	return CGeneral::GetRandomNumberInRange(-m_fMaxHeadingDisplacement, m_fMaxHeadingDisplacement);
+}
+
+float CPedAttractor::ComputeDeltaPos() const
+{
+	return CGeneral::GetRandomNumberInRange(-m_fMaxPositionDisplacement, m_fMaxPositionDisplacement);
+}
+
+void CPedAttractor::ComputeAttractTime(int32 id, bool approacher, float& time) const
+{
+	if (approacher)
+		time = m_fTimeInApproachingQueue;
+	else
+		time = m_fTimeInWaitQueue;
+}
+
+void CPedAttractor::ComputeAttractPos(int32 qid, CVector& pos) const
+{
+	if (!p2dEffect)
+		return;
+	pos = vecEffectPos - qid * vecQueueDir * m_fQueueDistance;
+	if (qid != 0) {
+		pos.x += ComputeDeltaPos();
+		pos.y += ComputeDeltaPos();
+	}
+}
+
+CVector CPedShelterAttractor::GetDisplacement(int32 qid) const
+{
+	if (ms_displacements.empty()) {
+		int i = 0;
+		while (i < gcMaxSizeOfShelterQueue) {
+			float fRandomAngle = CGeneral::GetRandomNumberInRange(0.0f, TWOPI);
+			float fRandomOffset = CGeneral::GetRandomNumberInRange(0.0f, 2.0f);
+			CVector vecDisplacement(fRandomOffset * Sin(fRandomAngle), fRandomOffset * Cos(fRandomAngle), 0.0f);
+			bool close = false;
+			for (std::vector<CVector>::const_iterator v = ms_displacements.cbegin(); v != ms_displacements.cend(); ++v) {
+				if ((*v - vecDisplacement).Magnitude() < 1.0f) {
+					close = true;
+					break;
+				}
+			}
+			if (!close) {
+				ms_displacements.push_back(vecDisplacement);
+				i++;
+			}
+		}
+	}
+	return ms_displacements[qid];
+}
+
+void CPedShelterAttractor::ComputeAttractPos(int32 qid, CVector& pos) const
+{
+	if (!p2dEffect)
+		return;
+	pos = vecEffectPos + GetDisplacement(qid);
+}
+
+void CPedAttractor::ComputeAttractHeading(int32 qid, float& heading) const
+{
+	heading = CGeneral::GetRadianAngleBetweenPoints(qid != 0 ? vecQueueDir.x : vecUseDir.x, qid != 0 ? vecQueueDir.y : vecUseDir.y, 0.0f, 0.0f);
+	if (qid != 0)
+		heading += ComputeDeltaHeading();
+}
+
+void CPedShelterAttractor::ComputeAttractHeading(int32 qid, float& heading) const
+{
+	heading = CGeneral::GetRandomNumberInRange(0.0f, TWOPI);
+}
+
+bool CPedAttractor::RegisterPed(CPed* pPed)
+{
+	for (std::vector<CPed*>::const_iterator pPedIt = vApproachingQueue.cbegin(); pPedIt != vApproachingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed) {
+			vApproachingQueue.erase(pPedIt);
+			return false;
+		}
+	}
+	if (GetNoOfRegisteredPeds() >= m_nMaxPedsInAttractor)
+		return 0;
+	vApproachingQueue.push_back(pPed);
+	CVector pos;
+	float heading;
+	float time;
+	int32 slot = ComputeFreeSlot();
+	ComputeAttractPos(slot, pos);
+	ComputeAttractHeading(slot, heading);
+	ComputeAttractTime(slot, false, time);
+	pPed->SetNewAttraction(this, pos, heading, time, slot);
+	return true;
+}
+
+static bool IsPedUsingAttractorOfThisType(int8 type, CPed* pPed)
+{
+	switch (type) {
+	case ATTRACTOR_ATM:
+		if (pPed->m_objective == OBJECTIVE_USE_ATM_ATTRACTOR)
+			return true;
+		break;
+	case ATTRACTOR_SEAT:
+		if (pPed->m_objective == OBJECTIVE_USE_SEAT_ATTRACTOR)
+			return true;
+		break;
+	case ATTRACTOR_STOP:
+		if (pPed->m_objective == OBJECTIVE_USE_STOP_ATTRACTOR || pPed->m_objective == OBJECTIVE_WAIT_FOR_BUS || pPed->m_objective == OBJECTIVE_IDLE)
+			return true;
+		break;
+	case ATTRACTOR_PIZZA:
+		if (pPed->m_objective == OBJECTIVE_USE_PIZZA_ATTRACTOR || pPed->m_objective == OBJECTIVE_IDLE)
+			return true;
+		break;
+	case ATTRACTOR_SHELTER:
+		if (pPed->m_objective == OBJECTIVE_USE_SHELTER_ATTRACTOR || pPed->m_objective == OBJECTIVE_WAIT_FOR_RAIN_TO_END)
+			return true;
+		break;
+	case ATTRACTOR_ICECREAM:
+		if (pPed->m_objective == OBJECTIVE_USE_ICECREAM_ATTRACTOR || pPed->m_objective == OBJECTIVE_PURCHASE_ICECREAM)
+			return true;
+		break;
+	}
+	return false;
+}
+
+bool CPedAttractor::DeRegisterPed(CPed* pPed)
+{
+	for (std::vector<CPed*>::const_iterator pPedIt = vApproachingQueue.cbegin(); pPedIt != vApproachingQueue.cend(); ++pPedIt) {
+		if (*pPedIt != pPed)
+			continue;
+		pPed->m_attractor = nil;
+		pPed->m_positionInQueue = -1;
+		pPed->bHasAlreadyUsedAttractor = true;
+		
+		if (IsPedUsingAttractorOfThisType(p2dEffect->pedattr.type, pPed))
+			pPed->SetObjective(OBJECTIVE_NONE);
+		else if (pPed->GetPedState() != PED_IDLE && pPed->GetPedState() != PED_NONE) {
+			vApproachingQueue.erase(pPedIt);
+			return true;
+		}
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+		vApproachingQueue.erase(pPedIt);
+		return true;
+	}
+	return BroadcastDeparture(pPed);
+}
+
+bool CPedAttractor::BroadcastArrival(CPed* pPed)
+{
+	for (std::vector<CPed*>::const_iterator pPedIt = vWaitingQueue.cbegin(); pPedIt != vWaitingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed)
+			return false;
+	}
+	vWaitingQueue.push_back(pPed);
+	for (std::vector<CPed*>::const_iterator pPedIt = vApproachingQueue.cbegin(); pPedIt != vApproachingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed) {
+			vApproachingQueue.erase(pPedIt);
+			break;
+		}
+	}
+	for (std::vector<CPed*>::iterator pPedIt = vApproachingQueue.begin(); pPedIt != vApproachingQueue.end(); ++pPedIt) {
+		CPed* pPed = *pPedIt;
+		CVector pos;
+		float heading;
+		float time;
+		int32 slot = ComputeFreeSlot();
+		ComputeAttractPos(slot, pos);
+		ComputeAttractHeading(slot, heading);
+		ComputeAttractTime(slot, false, time);
+		pPed->SetNewAttraction(this, pos, heading, time, slot);
+	}
+	return true;
+}
+
+bool CPedAttractor::BroadcastDeparture(CPed* pPed)
+{
+	int qid = -1;
+	for (size_t i = 0; i < vWaitingQueue.size(); i++){
+		if (vWaitingQueue[i] == pPed)
+			qid = i;
+	}
+	if (qid < 0)
+		return false;
+	for (size_t i = qid + 1; i < vWaitingQueue.size(); i++) {
+		CVector pos;
+		float heading;
+		float time;
+		ComputeAttractPos(i - 1, pos);
+		ComputeAttractHeading(i - 1, heading);
+		ComputeAttractTime(i - 1, true, time);
+		pPed->SetNewAttraction(this, pos, heading, time, i - 1);
+	}
+	pPed->m_attractor = nil;
+	pPed->m_positionInQueue = -1;
+	pPed->bHasAlreadyUsedAttractor = true;
+	if (!IsPedUsingAttractorOfThisType(p2dEffect->pedattr.type, pPed)) {
+		if (pPed->GetPedState() == PED_IDLE || pPed->GetPedState() == PED_NONE)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+	}
+	else if (qid == 0)
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
+	else if (qid == vWaitingQueue.size() - 1)
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+	else
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.z));
+	vWaitingQueue.erase(vWaitingQueue.cbegin() + qid);
+	for (std::vector<CPed*>::iterator pPedIt = vApproachingQueue.begin(); pPedIt != vApproachingQueue.end(); ++pPedIt) {
+		CPed* pPed = *pPedIt;
+		CVector pos;
+		float heading;
+		float time;
+		int32 slot = ComputeFreeSlot();
+		ComputeAttractPos(slot, pos);
+		ComputeAttractHeading(slot, heading);
+		ComputeAttractTime(slot, false, time);
+		pPed->SetNewAttraction(this, pos, heading, time, slot);
+	}
+	return true;
+}
+
+bool CPedShelterAttractor::BroadcastDeparture(CPed* pPed)
+{
+	int qid = -1;
+	for (size_t i = 0; i < vWaitingQueue.size(); i++) {
+		if (vWaitingQueue[i] == pPed)
+			qid = i;
+	}
+	if (qid < 0)
+		return false;
+	pPed->m_attractor = nil;
+	pPed->m_positionInQueue = -1;
+	pPed->bHasAlreadyUsedAttractor = true;
+	if (!IsPedUsingAttractorOfThisType(p2dEffect->pedattr.type, pPed)) {
+		if (pPed->GetPedState() == PED_IDLE || pPed->GetPedState() == PED_NONE)
+			pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+	}
+	else if (qid == 0)
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(vecQueueDir.x, vecQueueDir.y));
+	else if (qid == vWaitingQueue.size() - 1)
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.x, -vecQueueDir.y));
+	else
+		pPed->SetWanderPath(CGeneral::GetNodeHeadingFromVector(-vecQueueDir.y, -vecQueueDir.z));
+	vWaitingQueue.erase(vWaitingQueue.cbegin() + qid);
+	for (std::vector<CPed*>::iterator pPedIt = vApproachingQueue.begin(); pPedIt != vApproachingQueue.end(); ++pPedIt) {
+		CPed* pPed = *pPedIt;
+		CVector pos;
+		float heading;
+		float time;
+		int32 slot = ComputeFreeSlot();
+		ComputeAttractPos(slot, pos);
+		ComputeAttractHeading(slot, heading);
+		ComputeAttractTime(slot, false, time);
+		pPed->SetNewAttraction(this, pos, heading, time, slot);
+	}
+	return true;
+}
+
+bool CPedAttractor::IsRegisteredWithPed(CPed* pPed) const
+{
+	for (std::vector<CPed*>::const_iterator pPedIt = vWaitingQueue.cbegin(); pPedIt != vWaitingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed)
+			return true;
+	}
+	for (std::vector<CPed*>::const_iterator pPedIt = vApproachingQueue.cbegin(); pPedIt != vApproachingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool CPedAttractor::IsInQueue(CPed* pPed) const
+{
+	for (std::vector<CPed*>::const_iterator pPedIt = vWaitingQueue.cbegin(); pPedIt != vWaitingQueue.cend(); ++pPedIt) {
+		if (*pPedIt == pPed)
+			return true;
+	}
+	return false;
+}
+
+CPedAttractor* CPedAttractorManager::RegisterPedWithAttractor(CPed* pPed, C2dEffect* pEffect, const CMatrix& matrix)
+{
+	if (pEffect->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pEffect->pedattr.type) {
+	case ATTRACTOR_ATM: return RegisterPed(pPed, pEffect, matrix, vAtmAttractors);
+	case ATTRACTOR_SEAT: return RegisterPed(pPed, pEffect, matrix, vSeatAttractors);
+	case ATTRACTOR_STOP: return RegisterPed(pPed, pEffect, matrix, vStopAttractors);
+	case ATTRACTOR_PIZZA: return RegisterPed(pPed, pEffect, matrix, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return RegisterPed(pPed, pEffect, matrix, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return RegisterPed(pPed, pEffect, matrix, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::DeRegisterPed(CPed* pPed, CPedAttractor* pAttractor)
+{
+	if (!pAttractor)
+		return false;
+	if (pAttractor->GetEffect()->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (!IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: return DeRegisterPed(pPed, pAttractor, vAtmAttractors);
+	case ATTRACTOR_SEAT: return DeRegisterPed(pPed, pAttractor, vSeatAttractors);
+	case ATTRACTOR_STOP: return DeRegisterPed(pPed, pAttractor, vStopAttractors);
+	case ATTRACTOR_PIZZA: return DeRegisterPed(pPed, pAttractor, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return DeRegisterPed(pPed, pAttractor, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return DeRegisterPed(pPed, pAttractor, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::BroadcastArrival(CPed* pPed, CPedAttractor* pAttractor)
+{
+	if (!pAttractor)
+		return false;
+	if (pAttractor->GetEffect()->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (!IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: return BroadcastArrival(pPed, pAttractor, vAtmAttractors);
+	case ATTRACTOR_SEAT: return BroadcastArrival(pPed, pAttractor, vSeatAttractors);
+	case ATTRACTOR_STOP: return BroadcastArrival(pPed, pAttractor, vStopAttractors);
+	case ATTRACTOR_PIZZA: return BroadcastArrival(pPed, pAttractor, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return BroadcastArrival(pPed, pAttractor, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return BroadcastArrival(pPed, pAttractor, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::BroadcastDeparture(CPed* pPed, CPedAttractor* pAttractor)
+{
+	if (!pAttractor)
+		return false;
+	if (pAttractor->GetEffect()->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (!IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: return BroadcastDeparture(pPed, pAttractor, vAtmAttractors);
+	case ATTRACTOR_SEAT: return BroadcastDeparture(pPed, pAttractor, vSeatAttractors);
+	case ATTRACTOR_STOP: return BroadcastDeparture(pPed, pAttractor, vStopAttractors);
+	case ATTRACTOR_PIZZA: return BroadcastDeparture(pPed, pAttractor, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return BroadcastDeparture(pPed, pAttractor, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return BroadcastDeparture(pPed, pAttractor, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::IsAtHeadOfQueue(CPed* pPed, CPedAttractor* pAttractor)
+{
+	if (!pAttractor)
+		return false;
+	if (pAttractor->GetEffect()->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (!IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: return IsAtHeadOfQueue(pPed, pAttractor, vAtmAttractors);
+	case ATTRACTOR_SEAT: return IsAtHeadOfQueue(pPed, pAttractor, vSeatAttractors);
+	case ATTRACTOR_STOP: return IsAtHeadOfQueue(pPed, pAttractor, vStopAttractors);
+	case ATTRACTOR_PIZZA: return IsAtHeadOfQueue(pPed, pAttractor, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return IsAtHeadOfQueue(pPed, pAttractor, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return IsAtHeadOfQueue(pPed, pAttractor, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::IsInQueue(CPed* pPed, CPedAttractor* pAttractor)
+{
+	if (!pAttractor)
+		return false;
+	if (pAttractor->GetEffect()->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	if (!IsPedRegisteredWithEffect(pPed))
+		return nil;
+	switch (pAttractor->GetEffect()->pedattr.type) {
+	case ATTRACTOR_ATM: return IsInQueue(pPed, pAttractor, vAtmAttractors);
+	case ATTRACTOR_SEAT: return IsInQueue(pPed, pAttractor, vSeatAttractors);
+	case ATTRACTOR_STOP: return IsInQueue(pPed, pAttractor, vStopAttractors);
+	case ATTRACTOR_PIZZA: return IsInQueue(pPed, pAttractor, vPizzaAttractors);
+	case ATTRACTOR_SHELTER: return IsInQueue(pPed, pAttractor, vShelterAttractors);
+	case ATTRACTOR_ICECREAM: return IsInQueue(pPed, pAttractor, vIceCreamAttractors);
+	}
+	return nil;
+}
+
+bool CPedAttractorManager::HasEmptySlot(const C2dEffect* pEffect)
+{
+	if (!pEffect)
+		return false;
+	if (pEffect->type != EFFECT_PED_ATTRACTOR)
+		return nil;
+	const CPedAttractor* pAttractor;
+	switch (pEffect->pedattr.type) {
+	case ATTRACTOR_ATM: pAttractor = FindAssociatedAttractor(pEffect, vAtmAttractors); break;
+	case ATTRACTOR_SEAT: pAttractor = FindAssociatedAttractor(pEffect, vSeatAttractors); break;
+	case ATTRACTOR_STOP: pAttractor = FindAssociatedAttractor(pEffect, vStopAttractors); break;
+	case ATTRACTOR_PIZZA: pAttractor = FindAssociatedAttractor(pEffect, vPizzaAttractors); break;
+	case ATTRACTOR_SHELTER: pAttractor = FindAssociatedAttractor(pEffect, vShelterAttractors); break;
+	case ATTRACTOR_ICECREAM: pAttractor = FindAssociatedAttractor(pEffect, vIceCreamAttractors); break;
+	default: return true;
+	}
+	if (!pAttractor)
+		return true;
+	return pAttractor->GetNoOfRegisteredPeds() < pAttractor->GetMaxPedsInAttractor();
+}
+
+bool CPedAttractorManager::IsPedRegisteredWithEffect(CPed* pPed)
+{
+	return IsPedRegistered(pPed, vAtmAttractors) ||
+		IsPedRegistered(pPed, vSeatAttractors) ||
+		IsPedRegistered(pPed, vStopAttractors) ||
+		IsPedRegistered(pPed, vPizzaAttractors) ||
+		IsPedRegistered(pPed, vShelterAttractors) ||
+		IsPedRegistered(pPed, vIceCreamAttractors);
+}
+
+void CPedAttractorManager::ComputeEffectPos(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos)
+{
+	pos = matrix.GetPosition() + Multiply3x3(matrix, pEffect->pos);
+}
+
+void CPedAttractorManager::ComputeEffectQueueDir(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos)
+{
+	pos = Multiply3x3(matrix, pEffect->pedattr.queueDir);
+}
+
+void CPedAttractorManager::ComputeEffectUseDir(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos)
+{
+	pos = Multiply3x3(matrix, pEffect->pedattr.useDir);
+}
+
+CPedAttractor* CPedAttractorManager::RegisterPed(CPed* pPed, C2dEffect* pEffect, const CMatrix& matrix, std::vector<CPedAttractor*>& vecAttractors)
+{
+	CPedAttractor* pRegisteredAttractor = nil;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		CPedAttractor* pAttractor = *pAttractorIt;
+		CVector vEffectPos;
+		ComputeEffectPos(pAttractor->GetEffect(), matrix, vEffectPos);
+		if (pAttractor->GetEffect() == pEffect && vEffectPos == pAttractor->GetEffectPos()) {
+			if (!IsApproachable(pEffect, matrix, pAttractor->ComputeFreeSlot(), pPed))
+				return nil;
+			pRegisteredAttractor = pAttractor;
+			break;
+		}
+	}
+	if (pRegisteredAttractor || !IsApproachable(pEffect, matrix, 0, pPed)) {
+		if (pRegisteredAttractor)
+			pRegisteredAttractor->RegisterPed(pPed);
+		return pRegisteredAttractor;
+	}
+	switch (pEffect->pedattr.type) {
+	case ATTRACTOR_ATM: vecAttractors.push_back(new CPedAtmAttractor(pEffect, matrix, gcMaxSizeOfAtmQueue, 1.0f, 30000.0f, 3000.0f, 0.2f, 0.15f, 0.1f, 0.1f)); break;
+	case ATTRACTOR_SEAT: vecAttractors.push_back(new CPedSeatAttractor(pEffect, matrix, gcMaxSizeOfSeatQueue, 1.0f, 30000.0f, 3000.0f, 0.125f, 0.1f, 0.1f, 0.1f)); break;
+	case ATTRACTOR_STOP: vecAttractors.push_back(new CPedStopAttractor(pEffect, matrix, gcMaxSizeOfStopQueue, 1.0f, 30000.0f, 3000.0f, 0.2f, 0.1f, 0.1f, 0.1f)); break;
+	case ATTRACTOR_PIZZA: vecAttractors.push_back(new CPedPizzaAttractor(pEffect, matrix, gcMaxSizeOfPizzaQueue, 1.0f, 30000.0f, 3000.0f, 0.2f, 0.1f, 0.1f, 0.1f)); break;
+	case ATTRACTOR_SHELTER: vecAttractors.push_back(new CPedShelterAttractor(pEffect, matrix, gcMaxSizeOfShelterQueue, 1.0f, 30000.0f, 3000.0f, 0.5f, 6.28f, 0.1f, 0.1f)); break;
+	case ATTRACTOR_ICECREAM: vecAttractors.push_back(new CPedIceCreamAttractor(pEffect, matrix, gcMaxSizeOfIceCreamQueue, 1.0f, 30000.0f, 3000.0f, 0.2f, 0.3f, 0.1f, 0.1f)); break;
+	}
+	if (pRegisteredAttractor)
+		pRegisteredAttractor->RegisterPed(pPed);
+	return pRegisteredAttractor;
+}
+
+bool CPedAttractorManager::DeRegisterPed(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (!pAttractor)
+		return false;
+	CPedAttractor* pFound = nil;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			pFound = *pAttractorIt;
+			break;
+		}
+	}
+	if (!pFound)
+		return false;
+	pFound->DeRegisterPed(pPed);
+	if (pFound->GetNoOfRegisteredPeds() != 0)
+		return true;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			vecAttractors.erase(pAttractorIt);
+			break;
+		}
+	}
+	delete pAttractor;
+	return true;
+}
+
+bool CPedAttractorManager::BroadcastArrival(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (!pAttractor)
+		return false;
+	CPedAttractor* pFound = nil;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			pFound = *pAttractorIt;
+			break;
+		}
+	}
+	if (!pFound)
+		return false;
+	pFound->BroadcastArrival(pPed);
+	return true;
+}
+
+bool CPedAttractorManager::BroadcastDeparture(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (!pAttractor)
+		return false;
+	CPedAttractor* pFound = nil;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			pFound = *pAttractorIt;
+			break;
+		}
+	}
+	if (!pFound)
+		return false;
+	pFound->DeRegisterPed(pPed);
+	if (pFound->GetNoOfRegisteredPeds() != 0)
+		return true;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			vecAttractors.erase(pAttractorIt);
+			break;
+		}
+	}
+	delete pAttractor;
+	return true;
+}
+
+bool CPedAttractorManager::IsInQueue(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (!pAttractor)
+		return false;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			return (*pAttractorIt)->IsInQueue(pPed);
+		}
+	}
+	return false;
+}
+
+bool CPedAttractorManager::IsAtHeadOfQueue(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors)
+{
+	if (!pAttractor)
+		return false;
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if (*pAttractorIt == pAttractor) {
+			return (*pAttractorIt)->IsAtHeadOfQueue(pPed);
+		}
+	}
+	return false;
+}
+
+bool CPedAttractorManager::IsPedRegistered(CPed* pPed, std::vector<CPedAttractor*>& vecAttractors)
+{
+	for (std::vector<CPedAttractor*>::const_iterator pAttractorIt = vecAttractors.cbegin(); pAttractorIt != vecAttractors.cend(); ++pAttractorIt) {
+		if ((*pAttractorIt)->IsRegisteredWithPed(pPed))
+			return true;
+	}
+	return false;
+}
+
+bool CPedAttractorManager::IsApproachable(C2dEffect* pEffect, const CMatrix& matrix, int32, CPed* pPed)
+{
+	if (pEffect->pedattr.type == ATTRACTOR_SHELTER) {
+		CVector pos;
+		ComputeEffectPos(pEffect, matrix, pos);
+		return CWorld::GetIsLineOfSightClear(pPed->GetPosition(), pos, true, false, false, false, false, false);
+	}
+	CVector vecUseDir, vecEffectPos;
+	ComputeEffectUseDir(pEffect, matrix, vecUseDir);
+	ComputeEffectPos(pEffect, matrix, vecEffectPos);
+	float dp = -DotProduct(vecUseDir, vecEffectPos);
+	if (pEffect->pedattr.type == ATTRACTOR_ATM || pEffect->pedattr.type == ATTRACTOR_PIZZA || pEffect->pedattr.type == ATTRACTOR_ICECREAM) {
+		vecUseDir = -vecUseDir;
+		dp = -dp;
+	}
+	if (dp + DotProduct(vecEffectPos, pPed->GetPosition()) > 0.0f) {
+		CVector vecPedToAttractor = pPed->GetPosition() - vecEffectPos;
+		vecPedToAttractor.Normalise();
+		if (DotProduct(vecPedToAttractor, vecUseDir) > 0.25f && CWorld::IsWanderPathClear(pPed->GetPosition(), vecEffectPos, 2.0f, 0))
+			return true;
+	}
+	return false;
+}
diff --git a/src/peds/PedAttractor.h b/src/peds/PedAttractor.h
new file mode 100644
index 00000000..563efd3a
--- /dev/null
+++ b/src/peds/PedAttractor.h
@@ -0,0 +1,196 @@
+#pragma once
+#include "common.h"
+#include <vector>
+
+#include "2dEffect.h"
+#include "Ped.h"
+
+#define NUM_ATTRACTORS_FOR_ICECREAM_VAN 4
+
+class CPedAttractor;
+
+class CVehicleToEffect
+{
+	CVehicle* m_pVehicle;
+	C2dEffect m_effects[NUM_ATTRACTORS_FOR_ICECREAM_VAN];
+
+public:
+	CVehicleToEffect(CVehicle* pVehicle);
+	const C2dEffect* ChooseEffect(const CVector& pos) const;
+	CVehicleToEffect& From(const CVehicleToEffect& other);
+	CVehicleToEffect& operator=(const CVehicleToEffect& other) { return From(other); }
+	~CVehicleToEffect() { m_pVehicle = nil; }
+	CVehicle* GetVehicle() const { return m_pVehicle; }
+	bool HasThisEffect(C2dEffect* pEffect) const;
+	const C2dEffect* GetEffect(int32 i) const { return &m_effects[i]; }
+};
+
+class CPedAttractorManager
+{
+	std::vector<CPedAttractor*> vAtmAttractors;
+	std::vector<CPedAttractor*> vSeatAttractors;
+	std::vector<CPedAttractor*> vStopAttractors;
+	std::vector<CPedAttractor*> vPizzaAttractors;
+	std::vector<CPedAttractor*> vShelterAttractors;
+	std::vector<CPedAttractor*> vIceCreamAttractors;
+	std::vector<CVehicleToEffect> vVehicleToEffect;
+
+public:
+	CPedAttractor* RegisterPedWithAttractor(CPed* pPed, C2dEffect* pEffect, const CMatrix& matrix);
+	CPedAttractor* RegisterPed(CPed* pPed, C2dEffect* pEffect, const CMatrix& matrix, std::vector<CPedAttractor*>& vecAttractors);
+	bool BroadcastArrival(CPed* pPed, CPedAttractor* pAttractor);
+	bool BroadcastArrival(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors);
+	const C2dEffect* GetEffectForIceCreamVan(CVehicle* pVehicle, const CVector& pos);
+	bool IsApproachable(C2dEffect* pEffect, const CMatrix& matrix, int32, CPed* pPed);
+	void RemoveIceCreamVanEffects(C2dEffect* pEffect);
+	bool HasEmptySlot(const C2dEffect* pEffect);
+	const CPedAttractor* FindAssociatedAttractor(const C2dEffect* pEffect, std::vector<CPedAttractor*>& vecAttractors);
+	bool IsInQueue(CPed* pPed, CPedAttractor* pAttractor);
+	bool IsInQueue(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors);
+	bool IsAtHeadOfQueue(CPed* pPed, CPedAttractor* pAttractor);
+	bool IsAtHeadOfQueue(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors);
+	bool BroadcastDeparture(CPed* pPed, CPedAttractor* pAttractor);
+	bool BroadcastDeparture(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors);
+	bool DeRegisterPed(CPed* pPed, CPedAttractor* pAttractor);
+	bool DeRegisterPed(CPed* pPed, CPedAttractor* pAttractor, std::vector<CPedAttractor*>& vecAttractors);
+	bool IsPedRegisteredWithEffect(CPed* pPed);
+	bool IsPedRegistered(CPed* pPed, std::vector<CPedAttractor*>& vecAttractors);
+	CVehicle* GetIceCreamVanForEffect(C2dEffect* pEffect);
+
+	static void ComputeEffectPos(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos);
+	static void ComputeEffectQueueDir(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos);
+	static void ComputeEffectUseDir(const C2dEffect* pEffect, const CMatrix& matrix, CVector& pos);
+
+};
+
+CPedAttractorManager* GetPedAttractorManager();
+
+enum ePedAttractorType
+{
+	ATTRACTOR_ATM = 0,
+	ATTRACTOR_SEAT,
+	ATTRACTOR_STOP,
+	ATTRACTOR_PIZZA,
+	ATTRACTOR_SHELTER,
+	ATTRACTOR_ICECREAM
+};
+
+class CPedAttractor
+{
+protected:
+	C2dEffect* p2dEffect;
+	std::vector<CPed*> vApproachingQueue;
+	std::vector<CPed*> vWaitingQueue;
+	int32 m_nMaxPedsInAttractor;
+	float m_fQueueDistance;
+	float m_fTimeInWaitQueue;
+	float m_fTimeInApproachingQueue;
+	float m_fDistanceToUseAttractor;
+	float m_fAcceptableHeading;
+	float m_fMaxPositionDisplacement;
+	float m_fMaxHeadingDisplacement;
+	CVector vecEffectPos;
+	CVector vecQueueDir;
+	CVector vecUseDir;
+
+public:
+	virtual float GetHeadOfQueueWaitTime() { return 0.0f; }
+	virtual ~CPedAttractor() {};
+	virtual ePedAttractorType GetType() const = 0;
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const = 0;
+	virtual bool IsAtHeadOfQueue(CPed* pPed) const { return vWaitingQueue.front() == pPed; }
+	virtual void ComputeAttractPos(int32 id, CVector& pos) const;
+	virtual void ComputeAttractHeading(int32 id, float& pHeading) const;
+	virtual bool BroadcastDeparture(CPed* pPed);
+
+	bool IsRegisteredWithPed(CPed* pPed) const;
+	bool DeRegisterPed(CPed* pPed);
+	float ComputeDeltaHeading() const;
+	float ComputeDeltaPos() const;
+	void ComputeAttractTime(int32 id, bool, float& time) const;
+	int32 GetNoOfRegisteredPeds() const { return vWaitingQueue.size() + vApproachingQueue.size(); }
+	int32 ComputeFreeSlot() const { return vWaitingQueue.size(); }
+	bool IsInQueue(CPed*) const;
+	bool RegisterPed(CPed*);
+	bool BroadcastArrival(CPed*);
+
+	CPedAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp);
+
+	C2dEffect* GetEffect() const { return p2dEffect; }
+	const CVector& GetEffectPos() const { return vecEffectPos; }
+	int32 GetMaxPedsInAttractor() const { return m_nMaxPedsInAttractor; }
+	float GetDistanceToCountSeekDone() const { return m_fDistanceToUseAttractor; }
+	float GetAcceptableHeading() const { return m_fAcceptableHeading; }
+};
+
+class CPedAtmAttractor : public CPedAttractor
+{
+public:
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_ATM; };
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override;
+	CPedAtmAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+};
+
+class CPedIceCreamAttractor : public CPedAttractor
+{
+public:
+	virtual ~CPedIceCreamAttractor() override { GetPedAttractorManager()->RemoveIceCreamVanEffects(p2dEffect); }
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_ICECREAM; }
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override {};
+	CPedIceCreamAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+};
+
+class CPedPizzaAttractor : public CPedAttractor
+{
+public:
+	virtual float GetHeadOfQueueWaitTime() override { return 2000.0f; }
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_PIZZA; }
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override;
+	CPedPizzaAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+};
+
+class CPedSeatAttractor : public CPedAttractor
+{
+public:
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_SEAT; }
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override {};
+	CPedSeatAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+};
+
+class CPedShelterAttractor : public CPedAttractor
+{
+	static std::vector<CVector> ms_displacements;
+public:
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_SHELTER; }
+	virtual bool BroadcastDeparture(CPed*) override;
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override {};
+	virtual bool IsAtHeadOfQueue(CPed* pPed) const override { return true; }
+	virtual void ComputeAttractPos(int qid, CVector& pos) const override;
+	virtual void ComputeAttractHeading(int qid, float& heading) const override;
+
+	CPedShelterAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+
+
+	CVector GetDisplacement(int32 qid) const;
+};
+
+class CPedStopAttractor : public CPedAttractor
+{
+public:
+	virtual ePedAttractorType GetType() const override { return ATTRACTOR_STOP; }
+	virtual void UpdatePedStateOnDeparture(CPed* pPed) const override {};
+
+	CPedStopAttractor(C2dEffect* pEffect, const CMatrix& matrix, int32 maxpeds, float qdist, float waitTime, float approachTime, float distance, float headingdiff, float posdisp, float headdisp) :
+		CPedAttractor(pEffect, matrix, maxpeds, qdist, waitTime, approachTime, distance, headingdiff, posdisp, headdisp)
+	{};
+};
\ No newline at end of file
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp
index 9045a2e0..78302844 100644
--- a/src/peds/PedChat.cpp
+++ b/src/peds/PedChat.cpp
@@ -47,19 +47,19 @@ PedAudioData CommentWaitTime[39] = {
 	{1000, 1000, 5000, 5000},
 };
 
+// --MIAMI: Done
 bool
 CPed::ServiceTalkingWhenDead(void)
 {
 	return m_queuedSound == SOUND_PED_DEATH;
 }
 
+// --MIAMI: Done except ifdef
 void
 CPed::ServiceTalking(void)
 {
 	if (!bBodyPartJustCameOff || m_bodyPartBleeding != PED_HEAD) {
-		if (!CGeneral::faststricmp(CModelInfo::GetModelInfo(GetModelIndex())->GetName(), "bomber"))
-			m_queuedSound = SOUND_PED_BOMBER;
-		else if (m_nPedState == PED_ON_FIRE)
+		if (!CGame::germanGame && m_pFire)
 			m_queuedSound = SOUND_PED_BURNING;
 
 		if (m_queuedSound != SOUND_NO_SOUND) {
@@ -73,6 +73,10 @@ CPed::ServiceTalking(void)
 					CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nFixedDelayTime
 					+ CTimer::GetTimeInMilliseconds()
 					+ CGeneral::GetRandomNumberInRange(0, CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nOverrideFixedDelayTime);
+
+				if (m_queuedSound == SOUND_PED_PLAYER_BEFORESEX && IsPlayer())
+					m_soundStart += 2000;
+
 				m_lastQueuedSound = m_queuedSound;
 				m_queuedSound = SOUND_NO_SOUND;
 			}
@@ -80,73 +84,56 @@ CPed::ServiceTalking(void)
 	}
 }
 
+// --MIAMI: Done except ifdef
 void
 CPed::Say(uint16 audio)
 {
 	uint16 audioToPlay = audio;
 
-	if (IsPlayer()) {
+	if (3.0f + TheCamera.GetPosition().z < GetPosition().z)
+		return;
+
+	if (TheCamera.m_CameraAverageSpeed > 1.65f) {
+		if (audio != SOUND_PED_DAMAGE && audio != SOUND_PED_HIT && audio != SOUND_PED_LAND)
+			return;
+
+	} else if (TheCamera.m_CameraAverageSpeed > 1.25f) {
+		if (audio != SOUND_PED_DEATH &&
+			audio != SOUND_PED_DAMAGE && audio != SOUND_PED_HIT && audio != SOUND_PED_LAND &&
+			audio != SOUND_PED_TAXI_WAIT && audio != SOUND_PED_EVADE)
+			return;
 
-		// Ofc this part isn't in VC.
+	} else if (TheCamera.m_CameraAverageSpeed > 0.9f) {
 		switch (audio) {
 			case SOUND_PED_DEATH:
-				audioToPlay = SOUND_PED_DAMAGE;
-				break;
 			case SOUND_PED_DAMAGE:
 			case SOUND_PED_HIT:
 			case SOUND_PED_LAND:
-				break;
-			case SOUND_PED_BULLET_HIT:
-			case SOUND_PED_CAR_JACKED:
-			case SOUND_PED_DEFEND:
-				audioToPlay = SOUND_PED_HIT;
+			case SOUND_PED_BURNING:
+			case SOUND_PED_FLEE_SPRINT:
+			case SOUND_PED_TAXI_WAIT:
+			case SOUND_PED_EVADE:
+			case SOUND_PED_CAR_COLLISION:
+			case SOUND_PED_BOAT_COLLISION:
+			case SOUND_PED_HORN_ACTIVE:
 				break;
 			default:
 				return;
 		}
-	} else {
-		if (TheCamera.GetPosition().z + 3.0f < GetPosition().z)
-			return;
-
-		if (TheCamera.m_CameraAverageSpeed > 1.65f) {
-#ifdef VC_PED_PORTS
-			if (audio != SOUND_PED_DAMAGE && audio != SOUND_PED_HIT && audio != SOUND_PED_LAND)
-#endif
-				return;
-
-		} else if (TheCamera.m_CameraAverageSpeed > 1.25f) {
-			if (audio != SOUND_PED_DEATH &&
-#ifdef VC_PED_PORTS
-				audio != SOUND_PED_DAMAGE && audio != SOUND_PED_HIT && audio != SOUND_PED_LAND &&
-#endif
-				audio != SOUND_PED_TAXI_WAIT && audio != SOUND_PED_EVADE)
-				return;
-
-		} else if (TheCamera.m_CameraAverageSpeed > 0.9f) {
-			switch (audio) {
-				case SOUND_PED_DEATH:
-#ifdef VC_PED_PORTS
-				case SOUND_PED_DAMAGE:
-				case SOUND_PED_HIT:
-				case SOUND_PED_LAND:
-#endif
-				case SOUND_PED_BURNING:
-				case SOUND_PED_FLEE_SPRINT:
-				case SOUND_PED_TAXI_WAIT:
-				case SOUND_PED_EVADE:
-				case SOUND_PED_CAR_COLLISION:
-					break;
-				default:
-					return;
-			}
-		}
 	}
 
 	if (audioToPlay < m_queuedSound) {
 		if (audioToPlay != m_lastQueuedSound || audioToPlay == SOUND_PED_DEATH
+
+		// See VC Ped Speech patch
+#ifdef FIX_BUGS
 			|| CommentWaitTime[audioToPlay - SOUND_PED_DEATH].m_nOverrideMaxRandomDelayTime
-				+ m_lastSoundStart
-				+ (uint32) CGeneral::GetRandomNumberInRange(0, CommentWaitTime[audioToPlay - SOUND_PED_DEATH].m_nMaxRandomDelayTime) <= CTimer::GetTimeInMilliseconds()) {
+				+ (uint32)CGeneral::GetRandomNumberInRange(0, CommentWaitTime[audioToPlay - SOUND_PED_DEATH].m_nMaxRandomDelayTime)
+#else
+			|| CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nOverrideMaxRandomDelayTime
+			+ (uint32)CGeneral::GetRandomNumberInRange(0, CommentWaitTime[m_queuedSound - SOUND_PED_DEATH].m_nMaxRandomDelayTime)
+#endif
+				+ m_lastSoundStart <= CTimer::GetTimeInMilliseconds()) {
 			m_queuedSound = audioToPlay;
 		}
 	}
diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index ebd41296..2925667a 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -7,11 +7,13 @@
 #include "General.h"
 #include "RwHelper.h"
 
-LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(7.0f) };
-LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
+//--MIAMI: file done
+
+LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(8.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
+LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(8.0f) };
 LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
-LimbMovementInfo CPedIK::ms_upperArmInfo = { DEGTORAD(20.0f), DEGTORAD(-100.0f), DEGTORAD(20.0f), DEGTORAD(70.0f), DEGTORAD(-70.0f), DEGTORAD(10.0f) };
-LimbMovementInfo CPedIK::ms_lowerArmInfo = { DEGTORAD(80.0f), DEGTORAD(0.0f), DEGTORAD(20.0f), DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(5.0f) };
+LimbMovementInfo CPedIK::ms_upperArmInfo = { DEGTORAD(5.0f), DEGTORAD(-120.0f), DEGTORAD(20.0f), DEGTORAD(70.0f), DEGTORAD(-70.0f), DEGTORAD(20.0f) };
+LimbMovementInfo CPedIK::ms_lowerArmInfo = { DEGTORAD(60.0f), DEGTORAD(0.0f), DEGTORAD(15.0f), DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f) };
 
 const RwV3d XaxisIK = { 1.0f, 0.0f, 0.0f};
 const RwV3d YaxisIK = { 0.0f, 1.0f, 0.0f};
@@ -31,7 +33,6 @@ CPedIK::CPedIK(CPed *ped)
 	m_lowerArmOrient.pitch = 0.0f;
 }
 
-#ifdef PED_SKIN
 inline RwMatrix*
 GetBoneMatrix(CPed *ped, int32 bone)
 {
@@ -45,134 +46,20 @@ GetComponentMatrix(CPed *ped, int32 node)
 {
 	return GetBoneMatrix(ped, ped->m_pFrames[node]->nodeID);
 }
-#endif
 
 void
 CPedIK::RotateTorso(AnimBlendFrameData *node, LimbOrientation *limb, bool changeRoll)
 {
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		RtQuat *q = &node->hanimFrame->q;
-#ifndef FIX_BUGS
-		// this is what the game does (also VC), but it does not look great
-		RtQuatRotate(q, &XaxisIK, RADTODEG(limb->yaw), rwCOMBINEPRECONCAT);
-		RtQuatRotate(q, &ZaxisIK, RADTODEG(limb->pitch), rwCOMBINEPRECONCAT);	// pitch
-#else
-		// copied the code from the non-skinned case
-		// this seems to work ok
-
-		// We can't get the parent matrix of an hanim frame but
-		// this function is always called with PED_MID, so we know the parent frame.
-		// Trouble is that PED_MID is "Smid" on PS2/PC but BONE_torso on mobile/xbox...
-		// Assuming BONE_torso, the parent is BONE_mid, so let's use that:
-		RwMatrix *mat = GetBoneMatrix(m_ped, BONE_mid);
-
-		RwV3d vec1, vec2;
-		vec1.x = mat->right.z;
-		vec1.y = mat->up.z;
-		vec1.z = mat->at.z;
-		float c = Cos(m_ped->m_fRotationCur);
-		float s = Sin(m_ped->m_fRotationCur);
-		vec2.x = -(c*mat->right.x + s*mat->right.y);
-		vec2.y = -(c*mat->up.x + s*mat->up.y);
-		vec2.z = -(c*mat->at.x + s*mat->at.y);
-
-		// Not sure what exactly to do here
-		RtQuatRotate(q, &vec1, RADTODEG(limb->yaw), rwCOMBINEPRECONCAT);
-		RtQuatRotate(q, &vec2, RADTODEG(limb->pitch), rwCOMBINEPRECONCAT);
-#endif
-		m_ped->bDontAcceptIKLookAts = true;
-	}else
-#endif
-	{
-		RwFrame *f = node->frame;
-		RwMatrix *mat = GetWorldMatrix(RwFrameGetParent(f), RwMatrixCreate());
-
-		RwV3d upVector = { mat->right.z, mat->up.z, mat->at.z };
-		RwV3d rightVector;
-		RwV3d pos = RwFrameGetMatrix(f)->pos;
-
-		// rotation == 0 -> looking in y direction
-		// left? vector
-		float c = Cos(m_ped->m_fRotationCur);
-		float s = Sin(m_ped->m_fRotationCur);
-		rightVector.x = -(c*mat->right.x + s*mat->right.y);
-		rightVector.y = -(c*mat->up.x + s*mat->up.y);
-		rightVector.z = -(c*mat->at.x + s*mat->at.y);
-
-		if(changeRoll){
-			// Used when aiming only involves over the legs.(canAimWithArm)
-			// Automatically changes roll(forward rotation) axis of the parts above upper legs while moving, based on position of upper legs.
-			// Not noticeable in normal conditions...
-
-			RwV3d forwardVector;
-			CVector inversedForward = CrossProduct(CVector(0.0f, 0.0f, 1.0f), mat->up);
-			inversedForward.Normalise();
-			float dotProduct = DotProduct(mat->at, inversedForward);
-			if(dotProduct > 1.0f) dotProduct = 1.0f;
-			if(dotProduct < -1.0f) dotProduct = -1.0f;
-			float alpha = Acos(dotProduct);
-
-			if(mat->at.z < 0.0f)
-				alpha = -alpha;
-
-			forwardVector.x = s * mat->right.x - c * mat->right.y;
-			forwardVector.y = s * mat->up.x - c * mat->up.y;
-			forwardVector.z = s * mat->at.x - c * mat->at.y;
-
-			float curYaw, curPitch;
-			ExtractYawAndPitchWorld(mat, &curYaw, &curPitch);
-			RwMatrixRotate(RwFrameGetMatrix(f), &rightVector, RADTODEG(limb->pitch), rwCOMBINEPOSTCONCAT);
-			RwMatrixRotate(RwFrameGetMatrix(f), &upVector, RADTODEG(limb->yaw - (curYaw - m_ped->m_fRotationCur)), rwCOMBINEPOSTCONCAT);
-			RwMatrixRotate(RwFrameGetMatrix(f), &forwardVector, RADTODEG(alpha), rwCOMBINEPOSTCONCAT);
-		}else{
-			// pitch
-			RwMatrixRotate(RwFrameGetMatrix(f), &rightVector, RADTODEG(limb->pitch), rwCOMBINEPOSTCONCAT);
-			// yaw
-			RwMatrixRotate(RwFrameGetMatrix(f), &upVector, RADTODEG(limb->yaw), rwCOMBINEPOSTCONCAT);
-		}
-		RwFrameGetMatrix(f)->pos = pos;
-		RwMatrixDestroy(mat);
-	}
+	RtQuat *q = &node->hanimFrame->q;
+	RtQuatRotate(q, &XaxisIK, RADTODEG(limb->yaw), rwCOMBINEREPLACE);
+	RtQuatRotate(q, &ZaxisIK, RADTODEG(limb->pitch), rwCOMBINEPRECONCAT);
+	m_ped->bDontAcceptIKLookAts = true;
 }
 
 void
-CPedIK::GetComponentPosition(RwV3d *pos, uint32 node)
+CPedIK::GetComponentPosition(RwV3d &pos, uint32 node)
 {
-	RwFrame *f;
-	RwMatrix *mat;
-
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		pos->x = 0.0f;
-		pos->y = 0.0f;
-		pos->z = 0.0f;
-		mat = GetComponentMatrix(m_ped, node);
-		// could just copy the position out of the matrix...
-		RwV3dTransformPoints(pos, pos, 1, mat);
-	}else
-#endif
-	{
-		f = m_ped->m_pFrames[node]->frame;
-		mat = RwFrameGetMatrix(f);
-		*pos = mat->pos;
-
-		for (f = RwFrameGetParent(f); f; f = RwFrameGetParent(f))
-			RwV3dTransformPoints(pos, pos, 1, RwFrameGetMatrix(f));
-	}
-}
-
-RwMatrix*
-CPedIK::GetWorldMatrix(RwFrame *source, RwMatrix *destination)
-{
-	RwFrame *i;
-
-	*destination = *RwFrameGetMatrix(source);
-
-	for (i = RwFrameGetParent(source); i; i = RwFrameGetParent(i))
-		RwMatrixTransform(destination, RwFrameGetMatrix(i), rwCOMBINEPOSTCONCAT);
-
-	return destination;
+	pos = GetComponentMatrix(m_ped, node)->pos;
 }
 
 LimbMoveStatus
@@ -182,15 +69,15 @@ CPedIK::MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, Limb
 
 	// yaw
 
-	if (limb.yaw > targetYaw) {
-		limb.yaw -= moveInfo.yawD;
-	} else if (limb.yaw < targetYaw) {
-		limb.yaw += moveInfo.yawD;
-	}
-
-	if (Abs(limb.yaw - targetYaw) < moveInfo.yawD) {
+	if(Abs(limb.yaw-targetYaw) < moveInfo.yawD){
 		limb.yaw = targetYaw;
 		result = ANGLES_SET_EXACTLY;
+	}else{
+		if (limb.yaw > targetYaw) {
+			limb.yaw -= moveInfo.yawD;
+		} else if (limb.yaw < targetYaw) {
+			limb.yaw += moveInfo.yawD;
+		}
 	}
 
 	if (limb.yaw > moveInfo.maxYaw || limb.yaw < moveInfo.minYaw) {
@@ -200,16 +87,16 @@ CPedIK::MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, Limb
 
 	// pitch
 
-	if (limb.pitch > targetPitch) {
-		limb.pitch -= moveInfo.pitchD;
-	} else if (limb.pitch < targetPitch) {
-		limb.pitch += moveInfo.pitchD;
-	}
-
-	if (Abs(limb.pitch - targetPitch) < moveInfo.pitchD)
+	if (Abs(limb.pitch - targetPitch) < moveInfo.pitchD){
 		limb.pitch = targetPitch;
-	else
+	}else{
+		if (limb.pitch > targetPitch) {
+			limb.pitch -= moveInfo.pitchD;
+		} else if (limb.pitch < targetPitch) {
+			limb.pitch += moveInfo.pitchD;
+		}
 		result = ONE_ANGLE_COULDNT_BE_SET_EXACTLY;
+	}
 
 	if (limb.pitch > moveInfo.maxPitch || limb.pitch < moveInfo.minPitch) {
 		limb.pitch = clamp(limb.pitch, moveInfo.minPitch, moveInfo.maxPitch);
@@ -226,107 +113,60 @@ CPedIK::RestoreGunPosn(void)
 	return limbStatus == ANGLES_SET_EXACTLY;
 }
 
-#ifdef PED_SKIN
-void
-CPedIK::RotateHead(void)
-{
-	RtQuat *q = &m_ped->m_pFrames[PED_HEAD]->hanimFrame->q;
-	RtQuatRotate(q, &XaxisIK, RADTODEG(m_headOrient.yaw), rwCOMBINEREPLACE);
-	RtQuatRotate(q, &ZaxisIK, RADTODEG(m_headOrient.pitch), rwCOMBINEPOSTCONCAT);
-	m_ped->bDontAcceptIKLookAts = true;
-}
-#endif
-
 bool
 CPedIK::LookInDirection(float targetYaw, float targetPitch)
 {
 	bool success = true;
 	float yaw, pitch;
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		if (!(m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION)) {
-			m_ped->m_pFrames[PED_HEAD]->flag |= AnimBlendFrameData::IGNORE_ROTATION;
-			ExtractYawAndPitchLocalSkinned(m_ped->m_pFrames[PED_HEAD], &m_headOrient.yaw, &m_headOrient.pitch);
-		}
-
-		// parent of head is torso
-		RwMatrix worldMat = *GetBoneMatrix(m_ped, BONE_torso);
-		ExtractYawAndPitchWorld(&worldMat, &yaw, &pitch);
-
-		LimbMoveStatus headStatus = MoveLimb(m_headOrient, CGeneral::LimitRadianAngle(targetYaw - yaw),
-			CGeneral::LimitRadianAngle(DEGTORAD(10.0f)), ms_headInfo);
-		if (headStatus == ANGLES_SET_TO_MAX)
-			success = false;
-
-		if (headStatus != ANGLES_SET_EXACTLY){
-			if (!(m_flags & LOOKAROUND_HEAD_ONLY)){
-				if (MoveLimb(m_torsoOrient, CGeneral::LimitRadianAngle(targetYaw), targetPitch, ms_torsoInfo))
-					success = true;
-			}else{
-				RotateHead();
-				return success;
-			}
-		}
-
-		if (!(m_flags & LOOKAROUND_HEAD_ONLY))
-			RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
-		RotateHead();
-	}else
-#endif
-	{
-		RwFrame *frame = m_ped->m_pFrames[PED_HEAD]->frame;
-		RwMatrix *frameMat = RwFrameGetMatrix(frame);
-
-		if (!(m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION)) {
-			m_ped->m_pFrames[PED_HEAD]->flag |= AnimBlendFrameData::IGNORE_ROTATION;
-			ExtractYawAndPitchLocal(frameMat, &m_headOrient.yaw, &m_headOrient.pitch);
-		}
-
-		RwMatrix *worldMat = RwMatrixCreate();
-		worldMat = GetWorldMatrix(RwFrameGetParent(frame), worldMat);
-
-		ExtractYawAndPitchWorld(worldMat, &yaw, &pitch);
-		RwMatrixDestroy(worldMat);
-
-		yaw += m_torsoOrient.yaw;
-		float neededYawTurn = CGeneral::LimitRadianAngle(targetYaw - yaw);
-		pitch *= Cos(neededYawTurn);
+	if (!(m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION)) {
+		m_ped->m_pFrames[PED_HEAD]->flag |= AnimBlendFrameData::IGNORE_ROTATION;
+		RwMatrix *m = GetComponentMatrix(m_ped, PED_NECK);
+		m_headOrient.yaw = Atan2(-m->at.y, -m->at.x);
+		m_headOrient.yaw -= m_ped->m_fRotationCur;
+		m_headOrient.yaw = CGeneral::LimitRadianAngle(m_headOrient.yaw);
+		float up = clamp(m->up.z, -1.0f, 1.0f);
+		m_headOrient.pitch = Atan2(-up, Sqrt(1.0f - SQR(-up)));
+	}
 
-		float neededPitchTurn = CGeneral::LimitRadianAngle(targetPitch - pitch);
-		LimbMoveStatus headStatus = MoveLimb(m_headOrient, neededYawTurn, neededPitchTurn, ms_headInfo);
-		if (headStatus == ANGLES_SET_TO_MAX)
-			success = false;
+	// parent of head is neck
+	RwMatrix *m = GetComponentMatrix(m_ped, PED_NECK);
+	yaw = CGeneral::LimitRadianAngle(Atan2(-m->at.y, -m->at.x));
+	float up = clamp(m->up.z, -1.0f, 1.0f);
+	pitch = Atan2(-up, Sqrt(1.0f - SQR(-up)));
+	float headYaw = CGeneral::LimitRadianAngle(targetYaw - (yaw + m_torsoOrient.yaw));
+	float headPitch = CGeneral::LimitRadianAngle(targetPitch - pitch) * Cos(Min(Abs(headYaw), HALFPI));
 
-		if (headStatus != ANGLES_SET_EXACTLY && !(m_flags & LOOKAROUND_HEAD_ONLY)) {
-			float remainingTurn = CGeneral::LimitRadianAngle(targetYaw - m_ped->m_fRotationCur);
-			if (MoveLimb(m_torsoOrient, remainingTurn, targetPitch, ms_torsoInfo))
-				success = true;
-		}
-		CMatrix nextFrame = CMatrix(frameMat);
-		CVector framePos = nextFrame.GetPosition();
+	LimbMoveStatus headStatus = MoveLimb(m_headOrient, headYaw, headPitch, ms_headInfo);
+	if (headStatus == ANGLES_SET_TO_MAX)
+		success = false;
 
-		nextFrame.SetRotateZ(m_headOrient.pitch);
-		nextFrame.RotateX(m_headOrient.yaw);
-		nextFrame.GetPosition() += framePos;
-		nextFrame.UpdateRW();
+	if (headStatus != ANGLES_SET_EXACTLY && !(m_flags & LOOKAROUND_HEAD_ONLY))
+		if (MoveLimb(m_torsoOrient, CGeneral::LimitRadianAngle(targetYaw-m_ped->m_fRotationCur), targetPitch, ms_torsoInfo))
+			success = true;
 
-		if (!(m_flags & LOOKAROUND_HEAD_ONLY))
-			RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
+	// This was RotateHead
+	RtQuat *q = &m_ped->m_pFrames[PED_HEAD]->hanimFrame->q;
+	RtQuatRotate(q, &ZaxisIK, RADTODEG(m_headOrient.pitch), rwCOMBINEREPLACE);
+	RtQuatRotate(q, &XaxisIK, RADTODEG(m_headOrient.yaw), rwCOMBINEPRECONCAT);
+	m_ped->bDontAcceptIKLookAts = true;
 
-	}
+	if (!(m_flags & LOOKAROUND_HEAD_ONLY))
+		RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
 	return success;
 }
 
 bool
 CPedIK::LookAtPosition(CVector const &pos)
 {
+	RwV3d *pedpos = &GetComponentMatrix(m_ped, PED_MID)->pos;
 	float yawToFace = CGeneral::GetRadianAngleBetweenPoints(
 		pos.x, pos.y,
-		m_ped->GetPosition().x, m_ped->GetPosition().y);
+		pedpos->x, pedpos->y);
 
 	float pitchToFace = CGeneral::GetRadianAngleBetweenPoints(
+		// BUG? not using pedpos here
 		pos.z, (m_ped->GetPosition() - pos).Magnitude2D(),
-		m_ped->GetPosition().z, 0.0f);
+		pedpos->z, 0.0f);
 
 	return LookInDirection(yawToFace, pitchToFace);
 }
@@ -336,12 +176,12 @@ CPedIK::PointGunInDirection(float targetYaw, float targetPitch)
 {
 	bool result = true;
 	bool armPointedToGun = false;
-	float angle = CGeneral::LimitRadianAngle(targetYaw - m_ped->m_fRotationCur);
-	m_flags &= (~GUN_POINTED_SUCCESSFULLY);
+	targetYaw = CGeneral::LimitRadianAngle(targetYaw - m_ped->GetForward().Heading());
+	m_flags &= ~GUN_POINTED_SUCCESSFULLY;
 	m_flags |= LOOKAROUND_HEAD_ONLY;
 	if (m_flags & AIMS_WITH_ARM) {
-		armPointedToGun = PointGunInDirectionUsingArm(angle, targetPitch);
-		angle = CGeneral::LimitRadianAngle(angle - m_upperArmOrient.yaw);
+		armPointedToGun = PointGunInDirectionUsingArm(targetYaw, targetPitch);
+		targetYaw = CGeneral::LimitRadianAngle(targetYaw - (m_upperArmOrient.yaw + m_lowerArmOrient.yaw));
 	}
 	if (armPointedToGun) {
 		if (m_flags & AIMS_WITH_ARM && m_torsoOrient.yaw * m_upperArmOrient.yaw < 0.0f)
@@ -350,31 +190,35 @@ CPedIK::PointGunInDirection(float targetYaw, float targetPitch)
 		// Unused code
 		RwMatrix *matrix;
 		float yaw, pitch;
-#ifdef PED_SKIN
-		if(IsClumpSkinned(m_ped->GetClump())){
-			matrix = RwMatrixCreate();
-			*matrix = *GetComponentMatrix(m_ped, PED_UPPERARMR);
-			ExtractYawAndPitchWorld(matrix, &yaw, &pitch);
-			RwMatrixDestroy(matrix);
-		}else
-#endif
-		{
-			matrix = GetWorldMatrix(RwFrameGetParent(m_ped->m_pFrames[PED_UPPERARMR]->frame), RwMatrixCreate());
-			ExtractYawAndPitchWorld(matrix, &yaw, &pitch);
-			RwMatrixDestroy(matrix);
-		}
-		//
+		matrix = RwMatrixCreate();
+		*matrix = *GetComponentMatrix(m_ped, PED_CLAVICLER);
+		ExtractYawAndPitchWorld(matrix, &yaw, &pitch);
+		RwMatrixDestroy(matrix);
 
-		LimbMoveStatus status = MoveLimb(m_torsoOrient, angle, targetPitch, ms_torsoInfo);
+		if(m_flags & AIMS_WITH_ARM){
+			if(targetPitch > 0.0f)
+				targetPitch = Max(targetPitch - Abs(targetYaw), 0.0f);
+			else
+				targetPitch = Min(targetPitch + Abs(targetYaw), 0.0f);
+		}
+		LimbMoveStatus status = MoveLimb(m_torsoOrient, targetYaw, targetPitch, ms_torsoInfo);
 		if (status == ANGLES_SET_TO_MAX)
 			result = false;
 		else if (status == ANGLES_SET_EXACTLY)
 			m_flags |= GUN_POINTED_SUCCESSFULLY;
 	}
-	if (TheCamera.Cams[TheCamera.ActiveCam].Using3rdPersonMouseCam() && m_flags & AIMS_WITH_ARM)
-		RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, true);
-	else
-		RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
+	RwMatrix *m = GetBoneMatrix(m_ped, BONE_spine);	// BUG: game uses index 2 directly, which happens to be identical to BONE_spine
+	RwV3d axis = { 0.0f, 0.0f, 0.0f };
+	float axisangle = -CGeneral::LimitRadianAngle(Atan2(-m->at.y, -m->at.x) - m_ped->m_fRotationCur);
+	axis.y = -Sin(axisangle);
+	axis.z = Cos(axisangle);
+
+	// this was RotateTorso
+	RtQuat *q = &m_ped->m_pFrames[PED_MID]->hanimFrame->q;
+	RtQuatRotate(q, &axis, RADTODEG(m_torsoOrient.pitch), rwCOMBINEPOSTCONCAT);
+	RtQuatRotate(q, &XaxisIK, RADTODEG(m_torsoOrient.yaw), rwCOMBINEPOSTCONCAT);
+	m_ped->bDontAcceptIKLookAts = true;
+
 	return result;
 }
 
@@ -382,103 +226,86 @@ bool
 CPedIK::PointGunInDirectionUsingArm(float targetYaw, float targetPitch)
 {
 	bool result = false;
-
-	RwV3d upVector;	// only for non-skinned
 	RwMatrix *matrix;
 	float yaw, pitch;
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		matrix = RwMatrixCreate();
-		*matrix = *GetComponentMatrix(m_ped, PED_UPPERARMR);
-		ExtractYawAndPitchWorld(matrix, &yaw, &pitch);
-		RwMatrixDestroy(matrix);
-	}else
-#endif
-	{
-		RwFrame *frame = m_ped->m_pFrames[PED_UPPERARMR]->frame;
-		matrix = GetWorldMatrix(RwFrameGetParent(frame), RwMatrixCreate());
-
-		// with PED_SKIN this is actually done below (with a memory leak)
-		upVector.x = matrix->right.z;
-		upVector.y = matrix->up.z;
-		upVector.z = matrix->at.z;
 
-		ExtractYawAndPitchWorld(matrix, &yaw, &pitch);
-		RwMatrixDestroy(matrix);
-	}
+	float uaRoll = 45.0f;
+	float handRoll = 30.0f;
 
-	RwV3d rightVector = { 0.0f, 0.0f, 1.0f };
-	RwV3d forwardVector = { 1.0f, 0.0f, 0.0f };
+	matrix = GetComponentMatrix(m_ped, PED_CLAVICLER);
+	yaw = CGeneral::LimitRadianAngle(Atan2(matrix->right.y, matrix->right.x) - m_ped->m_fRotationCur);
+	pitch = Atan2(matrix->up.z, Sqrt(1.0f - SQR(matrix->up.z)));
 
 	float uaYaw, uaPitch;
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		uaYaw = targetYaw;
-		uaPitch = targetPitch + DEGTORAD(10.0f);
-	}else
-#endif
-	{
-		uaYaw = targetYaw - m_torsoOrient.yaw - DEGTORAD(15.0f);
-		uaPitch = CGeneral::LimitRadianAngle(targetPitch - pitch);
-	}
+	uaYaw = CGeneral::LimitRadianAngle(targetYaw - yaw - DEGTORAD(15.0f));
+	uaPitch = CGeneral::LimitRadianAngle(targetPitch - pitch + DEGTORAD(10.0f));
 	LimbMoveStatus uaStatus = MoveLimb(m_upperArmOrient, uaYaw, uaPitch, ms_upperArmInfo);
 	if (uaStatus == ANGLES_SET_EXACTLY) {
 		m_flags |= GUN_POINTED_SUCCESSFULLY;
 		result = true;
 	}
 
-#ifdef PED_SKIN
-	// this code is completely missing on xbox & android, but we can keep it with the check
-	// TODO? implement it for skinned geometry?
-	if(!IsClumpSkinned(m_ped->GetClump()))
-#endif
 	if (uaStatus == ANGLES_SET_TO_MAX) {
 		float laYaw = uaYaw - m_upperArmOrient.yaw;
 
 		LimbMoveStatus laStatus;
-		if (laYaw > 0.0f)
-			laStatus = MoveLimb(m_lowerArmOrient, laYaw, -DEGTORAD(45.0f), ms_lowerArmInfo);
-		else
+		if (laYaw > 0.0f){
+			float rollReduce = laYaw/DEGTORAD(30.0f);
+			uaRoll *= 1.0f - Min(rollReduce, 1.0f);
+			handRoll *= 1.0f - Min(rollReduce, 1.0f);
+
+			laYaw *= 1.9f;
+			laStatus = MoveLimb(m_lowerArmOrient, laYaw, 0.0f, ms_lowerArmInfo);
+
+			// some unused statics here
+			float uaPitchAmount = 1.0f - (m_lowerArmOrient.yaw + m_upperArmOrient.yaw) * 0.34f;
+			float f1 = ms_upperArmInfo.maxPitch * Max(uaPitchAmount, 0.0f);
+			float f2 = 0.2f*m_lowerArmOrient.yaw + m_upperArmOrient.pitch;
+			m_upperArmOrient.pitch = Min(f1, f2);
+		}else
 			laStatus = MoveLimb(m_lowerArmOrient, laYaw, 0.0f, ms_lowerArmInfo);
 
 		if (laStatus == ANGLES_SET_EXACTLY) {
 			m_flags |= GUN_POINTED_SUCCESSFULLY;
 			result = true;
 		}
-		RwFrame *child = GetFirstChild(m_ped->m_pFrames[PED_UPPERARMR]->frame);
-		RwV3d pos = RwFrameGetMatrix(child)->pos;
-		RwMatrixRotate(RwFrameGetMatrix(child), &forwardVector, RADTODEG(m_lowerArmOrient.pitch), rwCOMBINEPOSTCONCAT);
-		RwMatrixRotate(RwFrameGetMatrix(child), &rightVector, RADTODEG(-m_lowerArmOrient.yaw), rwCOMBINEPOSTCONCAT);
-		RwFrameGetMatrix(child)->pos = pos;
-	}
 
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		RtQuat *q = &m_ped->m_pFrames[PED_UPPERARMR]->hanimFrame->q;
-		RtQuatRotate(q, &XaxisIK, RADTODEG(m_upperArmOrient.yaw), rwCOMBINEPOSTCONCAT);
-		RtQuatRotate(q, &ZaxisIK, RADTODEG(m_upperArmOrient.pitch), rwCOMBINEPOSTCONCAT);
+		// game does this stupidly by going through the clump extension...
+		RtQuat *q = &m_ped->m_pFrames[PED_FOREARMR]->hanimFrame->q;
+		RtQuatRotate(q, &ZaxisIK, -RADTODEG(m_lowerArmOrient.yaw), rwCOMBINEREPLACE);
+		RtQuatRotate(q, &XaxisIK, -RADTODEG(m_lowerArmOrient.pitch), rwCOMBINEPOSTCONCAT);
 		m_ped->bDontAcceptIKLookAts = true;
-	}else
-#endif
-	{
-		RwFrame *frame = m_ped->m_pFrames[PED_UPPERARMR]->frame;
-		// with PED_SKIN we're also getting upVector here
-		RwV3d pos = RwFrameGetMatrix(frame)->pos;
-		RwMatrixRotate(RwFrameGetMatrix(frame), &rightVector, RADTODEG(m_upperArmOrient.pitch), rwCOMBINEPOSTCONCAT);
-		RwMatrixRotate(RwFrameGetMatrix(frame), &upVector, RADTODEG(m_upperArmOrient.yaw), rwCOMBINEPOSTCONCAT);
-		RwFrameGetMatrix(frame)->pos = pos;
 	}
+
+	RtQuat *q = &m_ped->m_pFrames[PED_UPPERARMR]->hanimFrame->q;
+	RtQuatRotate(q, &XaxisIK, uaRoll, rwCOMBINEREPLACE);
+	RtQuatRotate(q, &YaxisIK, -RADTODEG(m_upperArmOrient.pitch), rwCOMBINEPOSTCONCAT);
+	RtQuatRotate(q, &ZaxisIK, -RADTODEG(m_upperArmOrient.yaw+HALFPI), rwCOMBINEPOSTCONCAT);
+	m_ped->bDontAcceptIKLookAts = true;
+
+	q = &m_ped->m_pFrames[PED_HANDR]->hanimFrame->q;
+	RtQuatRotate(q, &XaxisIK, handRoll, rwCOMBINEPRECONCAT);
+
 	return result;
 }
 
 bool
 CPedIK::PointGunAtPosition(CVector const& position)
 {
+	CVector startPoint;
+	if (m_ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_SPAS12_SHOTGUN || m_ped->GetWeapon()->m_eWeaponType == WEAPONTYPE_STUBBY_SHOTGUN)
+		startPoint = m_ped->GetPosition();
+	else {
+		RwV3d armPos;
+		GetComponentPosition(armPos, PED_UPPERARMR);
+		startPoint.x = m_ped->GetPosition().x;
+		startPoint.y = m_ped->GetPosition().y;
+		startPoint.z = armPos.z;
+	}
+
 	return PointGunInDirection(
-		CGeneral::GetRadianAngleBetweenPoints(position.x, position.y, m_ped->GetPosition().x, m_ped->GetPosition().y),
-		CGeneral::GetRadianAngleBetweenPoints(position.z, Distance2D(m_ped->GetPosition(), position.x, position.y),
-		m_ped->GetPosition().z,
-		0.0f));
+		CGeneral::GetRadianAngleBetweenPoints(position.x, position.y, startPoint.x, startPoint.y),
+		CGeneral::GetRadianAngleBetweenPoints(position.z, Distance2D(m_ped->GetPosition(), position.x, position.y), startPoint.z, 0.0f));
 }
 
 bool
@@ -487,40 +314,24 @@ CPedIK::RestoreLookAt(void)
 	bool result = false;
 	float yaw, pitch;
 
-#ifdef PED_SKIN
-	if(IsClumpSkinned(m_ped->GetClump())){
-		if (m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION) {
-			m_ped->m_pFrames[PED_HEAD]->flag &= (~AnimBlendFrameData::IGNORE_ROTATION);
-		} else {
-			ExtractYawAndPitchLocalSkinned(m_ped->m_pFrames[PED_HEAD], &yaw, &pitch);
-			if (MoveLimb(m_headOrient, yaw, pitch, ms_headRestoreInfo) == ANGLES_SET_EXACTLY)
-				result = true;
-		}
-		RotateHead();
-	}else
-#endif
-	{
-		RwMatrix *mat = RwFrameGetMatrix(m_ped->m_pFrames[PED_HEAD]->frame);
-		if (m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION) {
-			m_ped->m_pFrames[PED_HEAD]->flag &= (~AnimBlendFrameData::IGNORE_ROTATION);
-		} else {
-			ExtractYawAndPitchLocal(mat, &yaw, &pitch);
-			if (MoveLimb(m_headOrient, yaw, pitch, ms_headRestoreInfo) == ANGLES_SET_EXACTLY)
-				result = true;
-		}
-
-		CMatrix matrix(mat);
-		CVector pos = matrix.GetPosition();
-		matrix.SetRotateZ(m_headOrient.pitch);
-		matrix.RotateX(m_headOrient.yaw);
-		matrix.Translate(pos);
-		matrix.UpdateRW();
+	if (m_ped->m_pFrames[PED_HEAD]->flag & AnimBlendFrameData::IGNORE_ROTATION) {
+		m_ped->m_pFrames[PED_HEAD]->flag &= (~AnimBlendFrameData::IGNORE_ROTATION);
+	} else {
+		ExtractYawAndPitchLocalSkinned(m_ped->m_pFrames[PED_HEAD], &yaw, &pitch);
+		if (MoveLimb(m_headOrient, yaw, pitch, ms_headRestoreInfo) == ANGLES_SET_EXACTLY)
+			result = true;
 	}
-	if (!(m_flags & LOOKAROUND_HEAD_ONLY)){
+
+	// This was RotateHead
+	RtQuat *q = &m_ped->m_pFrames[PED_HEAD]->hanimFrame->q;
+	RtQuatRotate(q, &XaxisIK, RADTODEG(m_headOrient.yaw), rwCOMBINEREPLACE);
+	RtQuatRotate(q, &ZaxisIK, RADTODEG(m_headOrient.pitch), rwCOMBINEPRECONCAT);
+	m_ped->bDontAcceptIKLookAts = true;
+
+	if (!(m_flags & LOOKAROUND_HEAD_ONLY))
 		MoveLimb(m_torsoOrient, 0.0f, 0.0f, ms_torsoInfo);
-		if (!(m_flags & LOOKAROUND_HEAD_ONLY))
-			RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
-	}
+	if (!(m_flags & LOOKAROUND_HEAD_ONLY))
+		RotateTorso(m_ped->m_pFrames[PED_MID], &m_torsoOrient, false);
 	return result;
 }
 
@@ -548,7 +359,6 @@ CPedIK::ExtractYawAndPitchLocal(RwMatrix *mat, float *yaw, float *pitch)
 	if (mat->up.x > 0.0f) *pitch = -*pitch;
 }
 
-#ifdef PED_SKIN
 void
 CPedIK::ExtractYawAndPitchLocalSkinned(AnimBlendFrameData *node, float *yaw, float *pitch)
 {
@@ -557,4 +367,3 @@ CPedIK::ExtractYawAndPitchLocalSkinned(AnimBlendFrameData *node, float *yaw, flo
 	ExtractYawAndPitchLocal(mat, yaw, pitch);
 	RwMatrixDestroy(mat);
 }
-#endif
diff --git a/src/peds/PedIK.h b/src/peds/PedIK.h
index e91d7c06..ee719fea 100644
--- a/src/peds/PedIK.h
+++ b/src/peds/PedIK.h
@@ -51,15 +51,13 @@ public:
 	bool PointGunInDirection(float targetYaw, float targetPitch);
 	bool PointGunInDirectionUsingArm(float targetYaw, float targetPitch);
 	bool PointGunAtPosition(CVector const& position);
-	void GetComponentPosition(RwV3d *pos, uint32 node);
-	static RwMatrix *GetWorldMatrix(RwFrame *source, RwMatrix *destination);
+	void GetComponentPosition(RwV3d &pos, uint32 node);
 	void RotateTorso(AnimBlendFrameData* animBlend, LimbOrientation* limb, bool changeRoll);
 	void ExtractYawAndPitchLocal(RwMatrix *mat, float *yaw, float *pitch);
 	void ExtractYawAndPitchLocalSkinned(AnimBlendFrameData *node, float *yaw, float *pitch);
 	void ExtractYawAndPitchWorld(RwMatrix *mat, float *yaw, float *pitch);
 	LimbMoveStatus MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, LimbMovementInfo &moveInfo);
 	bool RestoreGunPosn(void);
-	void RotateHead(void);
 	bool LookInDirection(float targetYaw, float targetPitch);
 	bool LookAtPosition(CVector const& pos);
 	bool RestoreLookAt(void);
diff --git a/src/peds/PedPlacement.cpp b/src/peds/PedPlacement.cpp
index 2d4a92fa..6011ce44 100644
--- a/src/peds/PedPlacement.cpp
+++ b/src/peds/PedPlacement.cpp
@@ -43,9 +43,13 @@ CPedPlacement::IsPositionClearOfCars(Const CVector *pos)
 }
 
 bool
-CPedPlacement::IsPositionClearForPed(CVector* pos)
+CPedPlacement::IsPositionClearForPed(const CVector& pos, float radius, int total, CEntity** entities)
 {
 	int16 count;
-	CWorld::FindObjectsKindaColliding(*pos, 0.75f, true, &count, 2, nil, false, true, true, false, false);
+	if (radius == -1.0f)
+		radius = 0.75f;
+	if (total == -1)
+		total = 2;
+	CWorld::FindObjectsKindaColliding(pos, radius, true, &count, total, entities, false, true, true, false, false);
 	return count == 0;
 }
diff --git a/src/peds/PedPlacement.h b/src/peds/PedPlacement.h
index b51e2aad..5b8354d4 100644
--- a/src/peds/PedPlacement.h
+++ b/src/peds/PedPlacement.h
@@ -4,5 +4,5 @@ class CPedPlacement {
 public:
 	static void FindZCoorForPed(CVector* pos);
 	static CEntity* IsPositionClearOfCars(Const CVector*);
-	static bool IsPositionClearForPed(CVector*);
+	static bool IsPositionClearForPed(const CVector& pos, float radius = -1.0f, int total = -1, CEntity** entities = nil);
 };
\ No newline at end of file
diff --git a/src/peds/PedStats.h b/src/peds/PedStats.h
index df97bdb8..7fc8cdbf 100644
--- a/src/peds/PedStats.h
+++ b/src/peds/PedStats.h
@@ -37,6 +37,11 @@ enum ePedStats
 	PEDSTAT_SPORTSFAN,
 	PEDSTAT_SHOPPER,
 	PEDSTAT_OLDSHOPPER,
+	PEDSTAT_BEACH_GUY,
+	PEDSTAT_BEACH_GIRL,
+	PEDSTAT_SKATER,
+	PEDSTAT_STD_MISSION,
+	PEDSTAT_COWARD,
 
 	NUM_PEDSTATS
 };
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 6613ea1b..08f79c7e 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -16,6 +16,8 @@
 #include "Pools.h"
 #include "Darkel.h"
 #include "CarCtrl.h"
+#include "MBlur.h"
+#include "Streaming.h"
 
 #define PAD_MOVE_TO_GAME_WORLD_MOVE 60.0f
 
@@ -26,11 +28,14 @@ const uint32 CPlayerPed::nSaveStructSize =
 	sizeof(CPlayerPed);
 #endif
 
+int32 idleAnimBlockIndex;
+
 CPlayerPed::~CPlayerPed()
 {
 	delete m_pWanted;
 }
 
+// --MIAMI: Done except commented out things
 CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 {
 	m_fMoveSpeed = 0.0f;
@@ -44,35 +49,54 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	m_pWanted->Initialise();
 	m_pArrestingCop = nil;
 	m_currentWeapon = WEAPONTYPE_UNARMED;
-	m_nSelectedWepSlot = WEAPONTYPE_UNARMED;
+	m_nSelectedWepSlot = 0;
 	m_nSpeedTimer = 0;
 	m_bSpeedTimerFlag = false;
+
+	// TODO(Miami)
+	// if (pPointGunAt)
+	//	m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
+
 	m_pPointGunAt = nil;
-	m_nPedState = PED_IDLE;
+	SetPedState(PED_IDLE);
 #ifndef FIX_BUGS
 	m_fCurrentStamina = m_fMaxStamina = 150.0f;
 #endif
 	m_fStaminaProgress = 0.0f;
 	m_nEvadeAmount = 0;
-	field_1367 = 0;
+	m_pEvadingFrom = nil;
 	m_nHitAnimDelayTimer = 0;
 	m_fAttackButtonCounter = 0.0f;
 	m_bHaveTargetSelected = false;
 	m_bHasLockOnTarget = false;
+	m_bDrunkVisualsWearOff = true;
 	m_bCanBeDamaged = true;
 	m_fWalkAngle = 0.0f;
 	m_fFPSMoveHeading = 0.0f;
+	m_pMinigunTopAtomic = nil;
+	m_fGunSpinSpeed = 0.0;
+	m_fGunSpinAngle = 0.0;
 	m_nTargettableObjects[0] = m_nTargettableObjects[1] = m_nTargettableObjects[2] = m_nTargettableObjects[3] = -1;
-	field_1413 = 0;
+	unused1 = false;
 	for (int i = 0; i < 6; i++) {
 		m_vecSafePos[i] = CVector(0.0f, 0.0f, 0.0f);
 		m_pPedAtSafePos[i] = nil;
+		m_pCheckPlayers[i] = nil;
 	}
+	m_nCheckPlayersIndex = 0;
+	m_nPadUpPressedInMilliseconds = 0;
+	m_nPadDownPressedInMilliseconds = 0;
+	idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles");
 }
 
 void CPlayerPed::ClearWeaponTarget()
 {
 	if (m_nPedType == PEDTYPE_PLAYER1) {
+
+		// TODO(Miami)
+		// if (m_pPointGunAt)
+		//	m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt);
+
 		m_pPointGunAt = nil;
 		TheCamera.ClearPlayerWeaponMode();
 		CWeaponEffects::ClearCrossHair();
@@ -96,11 +120,7 @@ void
 CPlayerPed::MakeObjectTargettable(int32 handle)
 {
 	for (int i = 0; i < ARRAY_SIZE(m_nTargettableObjects); i++) {
-		if (
-#ifdef FIX_BUGS
-			m_nTargettableObjects[i] == -1 ||
-#endif
-			CPools::GetObjectPool()->GetAt(m_nTargettableObjects[i]) == nil) {
+		if (CPools::GetObjectPool()->GetAt(m_nTargettableObjects[i]) == nil) {
 			m_nTargettableObjects[i] = handle;
 			return;
 		}
@@ -185,21 +205,24 @@ CPlayerPed::UseSprintEnergy(void)
 	}
 }
 
+// --MIAMI: Use that on everywhere except ProcessPlayerWeapon
 void
-CPlayerPed::MakeChangesForNewWeapon(int8 weapon)
+CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
 {
 	if (m_nPedState == PED_SNIPER_MODE) {
 		RestorePreviousState();
 		TheCamera.ClearPlayerWeaponMode();
 	}
 	SetCurrentWeapon(weapon);
+	m_nSelectedWepSlot = m_currentWeapon;
 
 	GetWeapon()->m_nAmmoInClip = Min(GetWeapon()->m_nAmmoTotal, CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nAmountofAmmunition);
 
 	if (!(CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_bCanAim))
 		ClearWeaponTarget();
 
-	CAnimBlendAssociation *weaponAnim = RpAnimBlendClumpGetAssociation(GetClump(), CWeaponInfo::GetWeaponInfo(WEAPONTYPE_SNIPERRIFLE)->m_AnimToPlay);
+	// WEAPONTYPE_SNIPERRIFLE? Wut?
+	CAnimBlendAssociation* weaponAnim = RpAnimBlendClumpGetAssociation(GetClump(), GetPrimaryFireAnim(CWeaponInfo::GetWeaponInfo(WEAPONTYPE_SNIPERRIFLE)));
 	if (weaponAnim) {
 		weaponAnim->SetRun();
 		weaponAnim->flags |= ASSOC_FADEOUTWHENDONE;
@@ -207,6 +230,14 @@ CPlayerPed::MakeChangesForNewWeapon(int8 weapon)
 	TheCamera.ClearPlayerWeaponMode();
 }
 
+// --MIAMI: Done, but this should be only called from ProcessPlayerWeapon
+void
+CPlayerPed::MakeChangesForNewWeapon(int32 slot)
+{
+	if(slot != -1)
+		MakeChangesForNewWeapon(m_weapons[slot].m_eWeaponType);
+}
+
 void
 CPlayerPed::ReApplyMoveAnims(void)
 {
@@ -226,14 +257,19 @@ CPlayerPed::ReApplyMoveAnims(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPlayerPed::SetInitialState(void)
 {
+	m_nDrunkenness = 0;
+	m_nFadeDrunkenness = 0;
+	CMBlur::ClearDrunkBlur();
+	m_nDrunkCountdown = 0;
 	m_bAdrenalineActive = false;
 	m_nAdrenalineTime = 0;
 	CTimer::SetTimeScale(1.0f);
 	m_pSeekTarget = nil;
-	m_vecSeekPos = { 0.0f, 0.0f, 0.0f };
+	m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
 	m_fleeFromPosX = 0.0f;
 	m_fleeFromPosY = 0.0f;
 	m_fleeFrom = nil;
@@ -245,10 +281,12 @@ CPlayerPed::SetInitialState(void)
 	ClearLookFlag();
 	bIsPointingGunAt = false;
 	bRenderPedInCar = true;
+
 	if (m_pFire)
 		m_pFire->Extinguish();
+
 	RpAnimBlendClumpRemoveAllAssociations(GetClump());
-	m_nPedState = PED_IDLE;
+	SetPedState(PED_IDLE);
 	SetMoveState(PEDMOVE_STILL);
 	m_nLastPedState = PED_NONE;
 	m_animGroup = ASSOCGRP_PLAYER;
@@ -261,6 +299,11 @@ CPlayerPed::SetInitialState(void)
 	m_bCanBeDamaged = true;
 	m_pedStats->m_temper = 50;
 	m_fWalkAngle = 0.0f;
+	if (m_attachedTo && !bUsesCollision)
+		bUsesCollision = true;
+
+	m_attachedTo = nil;
+	m_attachWepAmmo = 0;
 }
 
 void
@@ -401,7 +444,7 @@ CPlayerPed::SetRealMoveAnim(void)
 				} else if (curSprintAssoc->blendDelta >= 0.0f || curSprintAssoc->blendAmount >= 0.8f) {
 					if (m_fMoveSpeed < 0.4f) {
 						AnimationId runStopAnim;
-						if (curSprintAssoc->currentTime / curSprintAssoc->hierarchy->totalLength < 0.5) // double
+						if (curSprintAssoc->GetProgress() < 0.5) // double
 							runStopAnim = ANIM_RUN_STOP;
 						else
 							runStopAnim = ANIM_RUN_STOP_R;
@@ -496,13 +539,16 @@ CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
 		m_fCurrentStamina += restoreSpeed * CTimer::GetTimeStep() * 0.5f;
 }
 
+
+// TODO(Miami)
 bool
 CPlayerPed::DoWeaponSmoothSpray(void)
 {
 	if (m_nPedState == PED_ATTACK && !m_pPointGunAt) {
 		eWeaponType weapon = GetWeapon()->m_eWeaponType;
-		if (weapon == WEAPONTYPE_FLAMETHROWER || weapon == WEAPONTYPE_COLT45 || weapon == WEAPONTYPE_UZI || weapon == WEAPONTYPE_SHOTGUN || 
-			weapon == WEAPONTYPE_AK47 || weapon == WEAPONTYPE_M16 || weapon == WEAPONTYPE_HELICANNON)
+		if (weapon == WEAPONTYPE_FLAMETHROWER || weapon == WEAPONTYPE_COLT45 || weapon == WEAPONTYPE_UZI ||
+			weapon == WEAPONTYPE_TEC9 || weapon == WEAPONTYPE_SILENCED_INGRAM || weapon == WEAPONTYPE_MP5 ||
+			weapon == WEAPONTYPE_SHOTGUN || weapon == WEAPONTYPE_RUGER || weapon == WEAPONTYPE_M4 || weapon == WEAPONTYPE_HELICANNON)
 			return true;
 	}
 	return false;
@@ -523,7 +569,7 @@ CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
 	if (distVec.Magnitude() > CWeaponInfo::GetWeaponInfo(weaponUsed->m_eWeaponType)->m_fRange)
 		return true;
 
-	if (weaponUsed->m_eWeaponType != WEAPONTYPE_SHOTGUN && weaponUsed->m_eWeaponType != WEAPONTYPE_AK47)
+	if (weaponUsed->m_eWeaponType != WEAPONTYPE_SHOTGUN && weaponUsed->m_eWeaponType != WEAPONTYPE_RUGER)
 		return false;
 
 	distVec.Normalise();
@@ -587,66 +633,93 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed)
 		firePos = GetMatrix() * firePos;
 		GetWeapon()->Fire(this, &firePos);
 	}
-	GetWeapon()->Update(m_audioEntityId);
+	GetWeapon()->Update(m_audioEntityId, nil);
 }
 
+// --MIAMI: Done except commented thing
 // I think R* also used goto in here.
 void
 CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
 {
-	if (CDarkel::FrenzyOnGoing())
+	if (CDarkel::FrenzyOnGoing() || m_attachedTo)
 		goto switchDetectDone;
 
-	if (padUsed->CycleWeaponRightJustDown() && !m_pPointGunAt) {
+	// TODO(Miami): byte_A10B57
+	if (!m_pPointGunAt && /* !byte_A10B57 && */ GetWeapon()->m_eWeaponType != WEAPONTYPE_DETONATOR) {
+		if (padUsed->CycleWeaponRightJustDown()) {
 
-		if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER_RUNABOUT
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER_RUNABOUT) {
-
-			for (m_nSelectedWepSlot = m_currentWeapon + 1; m_nSelectedWepSlot < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; ++m_nSelectedWepSlot) {
-				if (HasWeapon(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
-					goto switchDetectDone;
+			if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER_RUNABOUT
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER_RUNABOUT
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_CAMERA) {
+
+				for (m_nSelectedWepSlot = m_currentWeapon + 1; m_nSelectedWepSlot < TOTAL_WEAPON_SLOTS; ++m_nSelectedWepSlot) {
+					if (HasWeaponSlot(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
+						goto spentAmmoCheck;
+					}
 				}
+				m_nSelectedWepSlot = 0;
 			}
-			m_nSelectedWepSlot = WEAPONTYPE_UNARMED;
-		}
-	} else if (padUsed->CycleWeaponLeftJustDown() && !m_pPointGunAt) {
-		if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
-			&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER) {
+		} else if (padUsed->CycleWeaponLeftJustDown()) {
+			if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER
+				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_CAMERA) {
 
-			for (m_nSelectedWepSlot = m_currentWeapon - 1; ; --m_nSelectedWepSlot) {
-				if (m_nSelectedWepSlot < WEAPONTYPE_UNARMED)
-					m_nSelectedWepSlot = WEAPONTYPE_DETONATOR;
+				for (m_nSelectedWepSlot = m_currentWeapon - 1; ; --m_nSelectedWepSlot) {
+					if (m_nSelectedWepSlot < 0)
+						m_nSelectedWepSlot = TOTAL_WEAPON_SLOTS - 1;
 
-				if (HasWeapon(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
-					goto switchDetectDone;
+					if (m_nSelectedWepSlot == 0)
+						break;
+
+					if (HasWeaponSlot(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
+						break;
+					}
 				}
 			}
 		}
-	} else if (CWeaponInfo::GetWeaponInfo((eWeaponType)m_currentWeapon)->m_eWeaponFire != WEAPON_FIRE_MELEE) {
-		if (GetWeapon(m_currentWeapon).m_nAmmoTotal <= 0) {
-			if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
-				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_SNIPER
-				&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_ROCKETLAUNCHER) {
+	}
+	
+spentAmmoCheck:
+	if (CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_eWeaponFire != WEAPON_FIRE_MELEE
+		&& (!padUsed->GetWeapon() || GetWeapon()->m_eWeaponType != WEAPONTYPE_MINIGUN)) {
+		if (GetWeapon()->m_nAmmoTotal <= 0) {
+			if (TheCamera.PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON
+				|| TheCamera.PlayerWeaponMode.Mode == CCam::MODE_SNIPER
+				|| TheCamera.PlayerWeaponMode.Mode == CCam::MODE_ROCKETLAUNCHER)
+				return;
 
-				for (m_nSelectedWepSlot = m_currentWeapon - 1; m_nSelectedWepSlot >= 0; --m_nSelectedWepSlot) {
-					if (m_nSelectedWepSlot == WEAPONTYPE_BASEBALLBAT && HasWeapon(WEAPONTYPE_BASEBALLBAT)
-						|| GetWeapon(m_nSelectedWepSlot).m_nAmmoTotal > 0 && m_nSelectedWepSlot != WEAPONTYPE_MOLOTOV && m_nSelectedWepSlot != WEAPONTYPE_GRENADE) {
-						goto switchDetectDone;
-					}
+			if (GetWeapon()->m_eWeaponType != WEAPONTYPE_DETONATOR
+				|| GetWeapon(2).m_eWeaponType != WEAPONTYPE_DETONATOR_GRENADE)
+				m_nSelectedWepSlot = m_currentWeapon - 1;
+			else
+				m_nSelectedWepSlot = 2;
+
+			for (; m_nSelectedWepSlot >= 0; --m_nSelectedWepSlot) {
+
+				// BUG: m_nSelectedWepSlot and GetWeapon(..) takes slot in VC but they compared them against weapon types in whole condition! jeez
+#ifdef FIX_BUGS
+				if (m_nSelectedWepSlot == 1 || GetWeapon(m_nSelectedWepSlot).m_nAmmoTotal > 0 && m_nSelectedWepSlot != 2) {
+#else
+				if (m_nSelectedWepSlot == WEAPONTYPE_BASEBALLBAT && GetWeapon(WEAPONTYPE_BASEBALLBAT).m_eWeaponType == WEAPONTYPE_BASEBALLBAT
+					|| GetWeapon(m_nSelectedWepSlot).m_nAmmoTotal > 0
+					&& m_nSelectedWepSlot != WEAPONTYPE_MOLOTOV && m_nSelectedWepSlot != WEAPONTYPE_GRENADE && m_nSelectedWepSlot != WEAPONTYPE_TEARGAS) {
+#endif
+					goto switchDetectDone;
 				}
-				m_nSelectedWepSlot = WEAPONTYPE_UNARMED;
 			}
+			m_nSelectedWepSlot = 0;
 		}
 	}
 
 switchDetectDone:
 	if (m_nSelectedWepSlot != m_currentWeapon) {
 		if (m_nPedState != PED_ATTACK && m_nPedState != PED_AIM_GUN && m_nPedState != PED_FIGHT)
+			RemoveWeaponAnims(m_currentWeapon, -1000.0f);
 			MakeChangesForNewWeapon(m_nSelectedWepSlot);
 	}
 }
@@ -667,7 +740,7 @@ CPlayerPed::PlayerControlM16(CPad *padUsed)
 		firePos = GetMatrix() * firePos;
 		GetWeapon()->Fire(this, &firePos);
 	}
-	GetWeapon()->Update(m_audioEntityId);
+	GetWeapon()->Update(m_audioEntityId, nil);
 }
 
 void
@@ -938,6 +1011,7 @@ CPlayerPed::FindWeaponLockOnTarget(void)
 	return true;
 }
 
+// --MIAMI: Done
 void
 CPlayerPed::ProcessAnimGroups(void)
 {
@@ -950,17 +1024,29 @@ CPlayerPed::ProcessAnimGroups(void)
 			if (m_fWalkAngle > 0.0f) {
 				if (GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER)
 					groupToSet = ASSOCGRP_ROCKETLEFT;
+				else if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW ||
+					GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER ||
+					GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+					groupToSet = ASSOCGRP_CHAINSAWLEFT;
 				else
 					groupToSet = ASSOCGRP_PLAYERLEFT;
 			} else {
 				if (GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER)
 					groupToSet = ASSOCGRP_ROCKETRIGHT;
+				else if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW ||
+					GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER ||
+					GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+					groupToSet = ASSOCGRP_CHAINSAWRIGHT;
 				else
 					groupToSet = ASSOCGRP_PLAYERRIGHT;
 			}
 		} else {
 			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER)
 				groupToSet = ASSOCGRP_ROCKETBACK;
+			else if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW ||
+				GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER ||
+				GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+				groupToSet = ASSOCGRP_CHAINSAWBACK;
 			else
 				groupToSet = ASSOCGRP_PLAYERBACK;
 		}
@@ -968,9 +1054,19 @@ CPlayerPed::ProcessAnimGroups(void)
 		if (GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER) {
 			groupToSet = ASSOCGRP_PLAYERROCKET;
 		} else {
-			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT) {
+			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_BASEBALLBAT
+				 || GetWeapon()->m_eWeaponType == WEAPONTYPE_MACHETE)
 				groupToSet = ASSOCGRP_PLAYERBBBAT;
-			} else if (GetWeapon()->m_eWeaponType != WEAPONTYPE_COLT45 && GetWeapon()->m_eWeaponType != WEAPONTYPE_UZI) {
+			else if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW ||
+				GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER ||
+				GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN)
+				groupToSet = ASSOCGRP_PLAYERCHAINSAW;
+			else if (GetWeapon()->m_eWeaponType != WEAPONTYPE_COLT45 && GetWeapon()->m_eWeaponType != WEAPONTYPE_UZI
+				// I hope this is a inlined function...
+				&& GetWeapon()->m_eWeaponType != WEAPONTYPE_PYTHON && GetWeapon()->m_eWeaponType != WEAPONTYPE_TEC9
+				&& GetWeapon()->m_eWeaponType != WEAPONTYPE_SILENCED_INGRAM && GetWeapon()->m_eWeaponType != WEAPONTYPE_MP5
+				&& GetWeapon()->m_eWeaponType != WEAPONTYPE_GOLFCLUB && GetWeapon()->m_eWeaponType != WEAPONTYPE_KATANA
+				&& GetWeapon()->m_eWeaponType != WEAPONTYPE_CAMERA) {
 				if (!GetWeapon()->IsType2Handed()) {
 					groupToSet = ASSOCGRP_PLAYER;
 				} else {
@@ -988,6 +1084,7 @@ CPlayerPed::ProcessAnimGroups(void)
 	}
 }
 
+// TODO(Miami): Hella TODO
 void
 CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 {
@@ -999,8 +1096,9 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 	}
 	if (!m_pFire) {
 		if (GetWeapon()->m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER ||
-			GetWeapon()->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE || GetWeapon()->m_eWeaponType == WEAPONTYPE_M16) {
-			if (padUsed->TargetJustDown()) {
+			GetWeapon()->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE || GetWeapon()->m_eWeaponType == WEAPONTYPE_M4 ||
+			GetWeapon()->m_eWeaponType == WEAPONTYPE_RUGER) {
+			if (padUsed->TargetJustDown()/* || TheCamera.m_bAllow1rstPersonWeaponsCamera */) { // TODO(Miami): Cam
 				SetStoredState();
 				m_nPedState = PED_SNIPER_MODE;
 #ifdef FREE_CAM
@@ -1034,7 +1132,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 				else
 #endif
 					SetAttack(m_pPointGunAt);
-			} else if (m_currentWeapon != WEAPONTYPE_UNARMED) {
+			} else {
 				if (m_nPedState == PED_ATTACK) {
 					if (padUsed->WeaponJustDown()) {
 						m_bHaveTargetSelected = true;
@@ -1045,12 +1143,19 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 					m_fAttackButtonCounter = 0.0f;
 					m_bHaveTargetSelected = false;
 				}
-				SetAttack(nil);
-			} else if (padUsed->WeaponJustDown()) {
-				if (m_fMoveSpeed < 1.0f)
-					StartFightAttack(padUsed->GetWeapon());
-				else
-					SetAttack(nil);
+				if (GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED && GetWeapon()->m_eWeaponType != WEAPONTYPE_BRASSKNUCKLE &&
+					!weaponInfo->m_bFightMode) {
+
+					if (GetWeapon()->m_eWeaponType != WEAPONTYPE_DETONATOR && GetWeapon()->m_eWeaponType != WEAPONTYPE_DETONATOR_GRENADE ||
+						padUsed->WeaponJustDown())
+
+						SetAttack(nil);
+				} else if (padUsed->WeaponJustDown()) {
+					if (m_fMoveSpeed < 1.0f || m_nPedState == PED_FIGHT)
+						StartFightAttack(padUsed->GetWeapon());
+					else
+						SetAttack(nil);
+				}
 			}
 		}
 	} else {
@@ -1070,7 +1175,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 		m_nSelectedWepSlot == m_currentWeapon && m_nMoveState != PEDMOVE_SPRINT) {
 
 		// Weapons except throwable and melee ones
-		if (weaponInfo->m_bCanAim || weaponInfo->m_b1stPerson || weaponInfo->m_bExpands) {
+		if (weaponInfo->m_nWeaponSlot > 2) {
 			if ((padUsed->GetTarget() && weaponInfo->m_bCanAimWithArm) || padUsed->GetWeapon()) {
 				float limitedCam = CGeneral::LimitRadianAngle(-TheCamera.Orientation);
 
@@ -1089,7 +1194,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 				} else {
 					m_fRotationDest = limitedCam;
 					changedHeadingRate = 2;
-					m_headingRate = 50.0f;
+					m_headingRate = 12.5f;
 
 					// Anim. fix for shotgun, ak47 and m16 (we must finish rot. it quickly)
 					if (weaponInfo->m_bCanAim && padUsed->WeaponJustDown()) {
@@ -1146,7 +1251,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 #else
 		else if (weaponInfo->m_bCanAim && !CCamera::m_bUseMouse3rdPerson) {
 #endif
-			if (padUsed->TargetJustDown())
+			if (padUsed->TargetJustDown()/* || TheCamera.m_bAllow1rstPersonWeaponsCamera */) // TODO(Miami): Cam
 				FindWeaponLockOnTarget();
 		}
 	} else if (m_pPointGunAt) {
@@ -1159,7 +1264,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 #else
 		CVector markPos;
 		if (m_pPointGunAt->IsPed()) {
-			((CPed*)m_pPointGunAt)->m_pedIK.GetComponentPosition((RwV3d*)markPos, PED_MID);
+			((CPed*)m_pPointGunAt)->m_pedIK.GetComponentPosition(*(RwV3d *)&markPos, PED_MID);
 		} else {
 			markPos = m_pPointGunAt->GetPosition();
 		}
@@ -1195,7 +1300,7 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed)
 		float neededTurn = CGeneral::LimitRadianAngle(padHeading - camOrientation);
 		if (doSmoothSpray) {
 			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER || GetWeapon()->m_eWeaponType == WEAPONTYPE_COLT45
-				|| GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI)
+				|| CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nWeaponSlot == 5)
 				m_fRotationDest = m_fRotationCur - leftRight / 128.0f * (PI / 80.0f) * CTimer::GetTimeStep();
 			else
 				m_fRotationDest = m_fRotationCur - leftRight / 128.0f * (PI / 128.0f) * CTimer::GetTimeStep();
@@ -1244,6 +1349,7 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed)
 			SetJump();
 		}
 	}
+	PlayIdleAnimations(padUsed);
 }
 
 void
@@ -1412,7 +1518,7 @@ CPlayerPed::ProcessControl(void)
 			}
 			break;
 		case PED_SNIPER_MODE:
-			if (FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_M16) {
+			if (FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_M4) {
 				if (padUsed)
 					PlayerControlM16(padUsed);
 			} else if (padUsed) {
@@ -1467,7 +1573,7 @@ CPlayerPed::ProcessControl(void)
 	}
 	if (padUsed && IsPedShootable()) {
 		ProcessWeaponSwitch(padUsed);
-		GetWeapon()->Update(m_audioEntityId);
+		GetWeapon()->Update(m_audioEntityId, this);
 	}
 	ProcessAnimGroups();
 	if (padUsed) {
@@ -1522,6 +1628,89 @@ CPlayerPed::ProcessControl(void)
 #endif
 }
 
+bool
+CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty)
+{
+	uint32 slot = CWeaponInfo::GetWeaponInfo(weapon)->m_nWeaponSlot;
+
+	if (!HasWeaponSlot(slot) || GetWeapon(slot).m_eWeaponType == weapon)
+		return true;
+
+	if (onlyIfSlotIsEmpty)
+		return false;
+
+	// Check if he's using that slot right now.
+	return m_nPedState != PED_ATTACK && m_nPedState != PED_AIM_GUN || slot != m_currentWeapon;
+}
+
+// TODO(Miami): This only works on gamepad cam! This isn't fair
+void
+CPlayerPed::PlayIdleAnimations(CPad *padUsed)
+{
+	CAnimBlendAssociation* assoc;
+
+	if (TheCamera.m_WideScreenOn || bIsDucking)
+		return;
+
+	struct animAndGroup {
+		AnimationId animId;
+		AssocGroupId groupId;
+	};
+
+	const animAndGroup idleAnims[] = {
+		{ANIM_IDLE_STRETCH, ASSOCGRP_PLAYER_IDLE},
+		{ANIM_IDLE_TIME, ASSOCGRP_PLAYER_IDLE},
+		{ANIM_IDLE_SHOULDER, ASSOCGRP_PLAYER_IDLE},
+		{ANIM_IDLE_STRETCH_LEG, ASSOCGRP_PLAYER_IDLE},
+		{ANIM_XPRESS_SCRATCH, ASSOCGRP_STD},
+	};
+
+	static int32 lastTime = 0;
+	static int32 lastAnim = -1;
+
+	bool hasIdleAnim = false;
+	CAnimBlock *idleAnimBlock = CAnimManager::GetAnimationBlock(idleAnimBlockIndex);
+	uint32 sinceLastInput = padUsed->InputHowLongAgo();
+	if (sinceLastInput <= 30000) {
+		if (idleAnimBlock->isLoaded) {
+			for (assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				if (assoc->flags & ASSOC_IDLE) {
+					hasIdleAnim = true;
+					assoc->blendDelta = -8.0f;
+				}
+			}
+			if (!hasIdleAnim)
+				CStreaming::RemoveAnim(idleAnimBlockIndex);
+		} else {
+			lastTime = 0;
+		}
+	} else {
+		CStreaming::RequestAnim(idleAnimBlockIndex, STREAMFLAGS_DONT_REMOVE);
+		if (idleAnimBlock->isLoaded) {
+			for(CAnimBlendAssociation *assoc = RpAnimBlendClumpGetFirstAssociation(GetClump()); assoc; assoc = RpAnimBlendGetNextAssociation(assoc)) {
+				int firstIdle = idleAnimBlock->firstIndex;
+				int index = assoc->hierarchy - CAnimManager::GetAnimation(0);
+				if (index >= firstIdle && index < firstIdle + idleAnimBlock->numAnims) {
+					hasIdleAnim = true;
+					break;
+				}
+			}
+
+			if (!hasIdleAnim && !bIsLooking && !bIsRestoringLook && sinceLastInput - lastTime > 25000) {
+				int anim;
+				do
+					anim = CGeneral::GetRandomNumberInRange(0, ARRAY_SIZE(idleAnims));
+				while (lastAnim == anim);
+
+				assoc = CAnimManager::BlendAnimation(GetClump(), idleAnims[anim].groupId, idleAnims[anim].animId, 8.0f);
+				assoc->flags |= ASSOC_IDLE;
+				lastAnim = anim;
+				lastTime = sinceLastInput;
+			}
+		}
+	}
+}
+
 #ifdef COMPATIBLE_SAVES
 #define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
 #define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h
index e8173c8c..cc56af9f 100644
--- a/src/peds/PlayerPed.h
+++ b/src/peds/PlayerPed.h
@@ -18,22 +18,32 @@ public:
 	int8 m_nSelectedWepSlot;	// eWeaponType
 	bool m_bSpeedTimerFlag;
 	uint8 m_nEvadeAmount;
-	int8 field_1367;
-	uint32 m_nSpeedTimer;
-	uint32 m_nHitAnimDelayTimer;
+	uint32 m_nSpeedTimer; // m_nStandStillTimer?
+	uint32 m_nHitAnimDelayTimer; // m_nShotDelay?
 	float m_fAttackButtonCounter;
 	bool m_bHaveTargetSelected;	// may have better name
 	CEntity *m_pEvadingFrom;	// is this CPhysical?
 	int32 m_nTargettableObjects[4];
+	uint32 m_nAdrenalineTime;
+	uint8 m_nDrunkenness;             // Needed to work out whether we lost target this frame
+	uint8 m_nFadeDrunkenness;
+	uint8 m_nDrunkCountdown; //countdown in frames when the drunk effect ends
 	bool m_bAdrenalineActive;
 	bool m_bHasLockOnTarget;
-	uint32 m_nAdrenalineTime;
 	bool m_bCanBeDamaged;
-	int8 field_1413;
+	bool m_bDrunkVisualsWearOff; // TODO(Miami): That may be something else
 	CVector m_vecSafePos[6]; // safe places from the player, for example behind a tree
 	CPed *m_pPedAtSafePos[6];
-	float m_fWalkAngle;
+	CPlayerPed* m_pCheckPlayers[6]; //checks something with players, could be a leftover from original multiplayer
+	char unused1;
+	int16 m_nCheckPlayersIndex;
+	float m_fWalkAngle; //angle between heading and walking direction
 	float m_fFPSMoveHeading;
+	RpAtomic* m_pMinigunTopAtomic; //atomic for the spinning part of the minigun model
+	float m_fGunSpinSpeed; // for minigun
+	float m_fGunSpinAngle;
+	unsigned int m_nPadDownPressedInMilliseconds;
+	unsigned int m_nPadUpPressedInMilliseconds;
 
 	CPlayerPed();
 	~CPlayerPed();
@@ -45,7 +55,8 @@ public:
 	void SetWantedLevelNoDrop(int32 level);
 	void KeepAreaAroundPlayerClear(void);
 	void AnnoyPlayerPed(bool);
-	void MakeChangesForNewWeapon(int8);
+	void MakeChangesForNewWeapon(int32);
+	void MakeChangesForNewWeapon(eWeaponType);
 	void SetInitialState(void);
 	void ProcessControl(void);
 	void ClearAdrenaline(void);
@@ -71,6 +82,8 @@ public:
 	void ProcessAnimGroups(void);
 	void ProcessPlayerWeapon(CPad*);
 	void PlayerControlZelda(CPad*);
+	bool DoesPlayerWantNewWeapon(eWeaponType, bool);
+	void PlayIdleAnimations(CPad*);
 
 	static void SetupPlayerPed(int32);
 	static void DeactivatePlayerPed(int32);
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index e2257a28..18a0c963 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -22,6 +22,7 @@
 #include "DummyObject.h"
 #include "Script.h"
 #include "Shadows.h"
+#include "SurfaceTable.h"
 
 #define MIN_CREATION_DIST		40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame)
 #define CREATION_RANGE			10.0f // added over the MIN_CREATION_DIST.
@@ -31,6 +32,10 @@
 
 // Transition areas between zones
 const RegenerationPoint aSafeZones[] = {
+// TODO(MIAMI): this is totally bogus
+	{ LEVEL_BEACH, LEVEL_MAINLAND, 400.0f, 814.0f, -954.0f, -903.0f, 30.0f, 100.0f,
+		CVector(790.0f, -917.0f, 39.0f), CVector(775.0f, -921.0f, 39.0f), CVector(424.0f, -942.0f, 38.0f), CVector(439.0f, -938.0f, 38.0f) },
+#ifndef MIAMI
 	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 400.0f, 814.0f, -954.0f, -903.0f, 30.0f, 100.0f,
 		CVector(790.0f, -917.0f, 39.0f), CVector(775.0f, -921.0f, 39.0f), CVector(424.0f, -942.0f, 38.0f), CVector(439.0f, -938.0f, 38.0f) },
 	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 555.0f, 711.0f, 118.0f, 186.0f, -30.0f, -10.0f,
@@ -47,6 +52,7 @@ const RegenerationPoint aSafeZones[] = {
 		CVector(-321.0f, -1043.0f, -13.2f), CVector(-328.0f, -1045.0f, -13.2f), CVector(-398.0f, -1044.0f, -13.5f), CVector(-390.0f, -1040.5f, -13.5f) },
 	{ LEVEL_COMMERCIAL, LEVEL_SUBURBAN, -425.0f, -280.0f, -471.0f, -447.0f, -20.0f, -5.0f,
 		CVector(-292.0f, -457.0f, -11.6f), CVector(-310.0f, -461.0f, -11.6f), CVector(-413.0f, -461.0f, -11.5f), CVector(-399.0f, -457.0f, -11.3f) }
+#endif
 };
 
 PedGroup CPopulation::ms_pPedGroups[NUMPEDGROUPS];
@@ -78,6 +84,9 @@ CVector CPopulation::RegenerationPoint_a;
 CVector CPopulation::RegenerationPoint_b;
 CVector CPopulation::RegenerationForward;
 
+uint32 CPopulation::ms_nTotalCarPassengerPeds;
+uint32 CPopulation::NumMiamiViceCops;
+
 void
 CPopulation::Initialise()
 {
@@ -98,6 +107,8 @@ CPopulation::Initialise()
 	ms_nNumGang9 = 0;
 	ms_nNumDummy = 0;
 
+	ms_nTotalCarPassengerPeds = 0;
+
 	m_AllRandomPedsThisType = -1;
 	PedDensityMultiplier = 1.0f;
 	bZoneChangeHasHappened = false;
@@ -109,7 +120,6 @@ CPopulation::Initialise()
 	ms_nTotalCivPeds = 0;
 
 	LoadPedGroups();
-	DealWithZoneChange(LEVEL_COMMERCIAL, LEVEL_INDUSTRIAL, true);
 
 	debug("CPopulation ready\n");
 }
@@ -320,64 +330,13 @@ CPopulation::UpdatePedCount(ePedType pedType, bool decrease)
 int
 CPopulation::ChooseGangOccupation(int gangId)
 {
-	int8 modelOverride = CGangs::GetGangPedModelOverride(gangId);
-
-	// All gangs have 2 models
-	int firstGangModel = 2 * gangId + MI_GANG01;
-
-	// GetRandomNumberInRange never returns max. value
-	if (modelOverride == -1)
-		return CGeneral::GetRandomNumberInRange(firstGangModel, firstGangModel + 2);
-
-	if (modelOverride != 0)
-		return firstGangModel + 1;
-	else
-		return firstGangModel;
+	return CGangs::ChooseGangPedModel(gangId);
 }
 
+//--MIAMI: done
 void
 CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool forceIndustrialZone)
 {
-	bZoneChangeHasHappened = true;
-
-	CVector findSafeZoneAround;
-	int safeZone;
-
-	if (forceIndustrialZone) {
-		// Commercial to industrial transition area on Callahan Bridge
-		findSafeZoneAround.x = 690.0f;
-		findSafeZoneAround.y = -920.0f;
-		findSafeZoneAround.z = 42.0f;
-	} else {
-		findSafeZoneAround = FindPlayerCoors();
-	}
-	eLevelName level;
-	FindCollisionZoneForCoors(&findSafeZoneAround, &safeZone, &level);
-
-	// We aren't in a "safe zone", find closest one
-	if (safeZone < 0)
-		FindClosestZoneForCoors(&findSafeZoneAround, &safeZone, oldLevel, newLevel);
-
-	// No, there should be one!
-	if (safeZone < 0) {
-		if (newLevel == LEVEL_INDUSTRIAL) {
-			safeZone = 0;
-		} else if (newLevel == LEVEL_SUBURBAN) {
-			safeZone = 4;
-		}
-	}
-
-	if (aSafeZones[safeZone].srcLevel == newLevel) {
-		CPopulation::RegenerationPoint_a = aSafeZones[safeZone].srcPosA;
-		CPopulation::RegenerationPoint_b = aSafeZones[safeZone].srcPosB;
-		CPopulation::RegenerationForward = aSafeZones[safeZone].destPosA - aSafeZones[safeZone].srcPosA;
-		RegenerationForward.Normalise();
-	} else if (aSafeZones[safeZone].destLevel == newLevel) {
-		CPopulation::RegenerationPoint_a = aSafeZones[safeZone].destPosA;
-		CPopulation::RegenerationPoint_b = aSafeZones[safeZone].destPosB;
-		CPopulation::RegenerationForward = aSafeZones[safeZone].srcPosA - aSafeZones[safeZone].destPosA;
-		RegenerationForward.Normalise();
-	}
 }
 
 void
@@ -433,6 +392,7 @@ CPopulation::Update()
 				+ ms_nNumGang2 + ms_nNumGang1;
 			ms_nTotalPeds = ms_nNumDummy + ms_nNumEmergency + ms_nNumCop
 				+ ms_nTotalGangPeds + ms_nNumCivFemale + ms_nNumCivMale;
+			ms_nTotalPeds -= ms_nTotalCarPassengerPeds;
 			if (!CCutsceneMgr::IsRunning()) {
 				float pcdm = PedCreationDistMultiplier();
 				AddToPopulation(pcdm * (MIN_CREATION_DIST * TheCamera.GenerationDistMultiplier),
@@ -454,6 +414,7 @@ CPopulation::GeneratePedsAtStartOfGame()
 			+ ms_nNumGang3 + ms_nNumGang2 + ms_nNumGang1;
 		ms_nTotalPeds = ms_nNumDummy + ms_nNumEmergency + ms_nNumCop
 			+ ms_nTotalGangPeds + ms_nNumCivFemale + ms_nNumCivMale;
+		ms_nTotalPeds -= ms_nTotalCarPassengerPeds;
 
 		// Min dist is 10.0f only for start of the game (naturally)
 		AddToPopulation(10.0f, PedCreationDistMultiplier() * (MIN_CREATION_DIST + CREATION_RANGE),
@@ -488,7 +449,7 @@ CPopulation::PedCreationDistMultiplier()
 }
 
 CPed*
-CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors)
+CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors, int32 modifier)
 {
 	switch (pedType) {
 		case PEDTYPE_CIVMALE:
@@ -499,16 +460,34 @@ CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors)
 			ped->SetOrientation(0.0f, 0.0f, 0.0f);
 			CWorld::Add(ped);
 			if (ms_bGivePedsWeapons) {
-				eWeaponType weapon = (eWeaponType)CGeneral::GetRandomNumberInRange(WEAPONTYPE_UNARMED, WEAPONTYPE_DETONATOR);
+				eWeaponType weapon;
+
+				switch (CGeneral::GetRandomNumber() & 3) {
+					case 0:
+						weapon = WEAPONTYPE_COLT45;
+						break;
+					case 1:
+						weapon = WEAPONTYPE_NIGHTSTICK;
+						break;
+					case 2:
+						weapon = WEAPONTYPE_GOLFCLUB;
+						break;
+					case 3:
+						weapon = WEAPONTYPE_TEC9;
+						break;
+					default:
+						break;
+				}
 				if (weapon != WEAPONTYPE_UNARMED) {
-					ped->SetCurrentWeapon(ped->GiveWeapon(weapon, 25001));
+					ped->GiveDelayedWeapon(weapon, 25001);
+					ped->SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weapon)->m_nWeaponSlot);
 				}
 			}
 			return ped;
 		}
 		case PEDTYPE_COP:
 		{
-			CCopPed *ped = new CCopPed((eCopType)miOrCopType);
+			CCopPed *ped = new CCopPed((eCopType)miOrCopType, modifier);
 			ped->SetPosition(coors);
 			ped->SetOrientation(0.0f, 0.0f, 0.0f);
 			CWorld::Add(ped);
@@ -529,12 +508,14 @@ CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors)
 			ped->SetOrientation(0.0f, 0.0f, 0.0f);
 			CWorld::Add(ped);
 
-			uint32 weapon;
+			eWeaponType weapon;
 			if (CGeneral::GetRandomNumberInRange(0, 100) >= 50)
-				weapon = ped->GiveWeapon((eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon2, 25001);
+				weapon = (eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon2;
 			else
-				weapon = ped->GiveWeapon((eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon1, 25001);
-			ped->SetCurrentWeapon(weapon);
+				weapon = (eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon1;
+
+			ped->GiveDelayedWeapon(weapon, 25001);
+			ped->SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weapon)->m_nWeaponSlot);
 			return ped;
 		}
 		case PEDTYPE_EMERGENCY:
@@ -599,14 +580,12 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 
 	if (ms_nTotalPeds < maxPossiblePedsForArea || addCop) {
 		int decisionThreshold = CGeneral::GetRandomNumberInRange(0, 1000);
-		if (decisionThreshold < zoneInfo.copDensity || addCop) {
+		if (decisionThreshold < zoneInfo.copPedThreshold || addCop) {
 			pedTypeToAdd = PEDTYPE_COP;
 			modelToAdd = ChoosePolicePedOccupation();
 		} else {
-			int16 density = zoneInfo.copDensity;
 			for (int i = 0; i < NUM_GANGS; i++) {
-				density += zoneInfo.gangDensity[i];
-				if (decisionThreshold < density) {
+				if (decisionThreshold < zoneInfo.gangPedThreshold[i]) {
 					pedTypeToAdd = PEDTYPE_GANG1 + i;
 					break;
 				}
@@ -693,7 +672,7 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 					generatedCoors.y = yOffset + gangLeader->GetPosition().y;
 				}
 			}
-			if (!CPedPlacement::IsPositionClearForPed(&generatedCoors))
+			if (!CPedPlacement::IsPositionClearForPed(generatedCoors))
 				break;
 
 			// Why no love for last gang member?!
@@ -743,9 +722,10 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 }
 
 CPed*
-CPopulation::AddPedInCar(CVehicle* car)
+CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
 {
 	int defaultModel = MI_MALE01;
+	int miamiViceIndex = 0;
 	bool imSureThatModelIsLoaded = true;
 	CVector coors = FindPlayerCoors();
 	CZoneInfo zoneInfo;
@@ -769,6 +749,7 @@ CPopulation::AddPedInCar(CVehicle* car)
 			pedType = PEDTYPE_COP;
 			break;
 		case MI_POLICE:
+		case MI_PREDATOR:
 			preferredModel = COP_STREET;
 			pedType = PEDTYPE_COP;
 			break;
@@ -781,9 +762,15 @@ CPopulation::AddPedInCar(CVehicle* car)
 			preferredModel = COP_ARMY;
 			pedType = PEDTYPE_COP;
 			break;
+		case MI_VICECHEE: // TODO(MIAMI): figure out new structure of the function
+			preferredModel = COP_MIAMIVICE;
+			pedType = PEDTYPE_COP;
+			miamiViceIndex = (isDriver ? 2 * CCarCtrl::MiamiViceCycle : 2 * CCarCtrl::MiamiViceCycle + 1);
+			break;
 		case MI_TAXI:
 		case MI_CABBIE:
-		case MI_BORGNINE:
+		case MI_ZEBRA:
+		case MI_KAUFMAN:
 			if (CGeneral::GetRandomTrueFalse()) {
 				pedType = PEDTYPE_CIVMALE;
 				preferredModel = MI_TAXI_D;
@@ -826,120 +813,20 @@ CPopulation::AddPedInCar(CVehicle* car)
 		pedType = ((CPedModelInfo*)CModelInfo::GetModelInfo(defaultModel))->m_pedType;
 	}
 
-	CPed *newPed = CPopulation::AddPed((ePedType)pedType, preferredModel, car->GetPosition());
+	CPed *newPed = CPopulation::AddPed((ePedType)pedType, preferredModel, car->GetPosition(), miamiViceIndex);
 	newPed->bUsesCollision = false;
 
-	// what??
-	if (pedType != PEDTYPE_COP) {
-		newPed->SetCurrentWeapon(WEAPONTYPE_COLT45);
+	if (newPed->GetWeapon()->m_eWeaponType != WEAPONTYPE_UNARMED) {
 		newPed->RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(newPed->GetWeapon()->m_eWeaponType)->m_nModelId);
 	}
-	/*
-	// Miami leftover
-	if (car->m_vehType == VEHICLE_TYPE_BIKE) {
-		newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, *((CBike*)car + 308h), 100.0f);
-	} else */
 
-	// FIX: Make peds comfortable while driving car/boat
-#ifdef FIX_BUGS
-	{
-		newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f);
-	}
-#else
-	{
-		newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, ANIM_CAR_SIT, 100.0f);
-	}
-#endif
-	
-	newPed->StopNonPartialAnims();
+	newPed->AddInCarAnims(car, isDriver);
 	return newPed;
 }
 
 void
 CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 {
-	eLevelName level;
-	int zone;
-	int frame = CTimer::GetFrameCounter() & 7;
-	if (frame == 1) {
-		int movedVehicleCount = 0;
-		int poolSize = CPools::GetVehiclePool()->GetSize();
-		for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
-
-			CVehicle* veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
-			if (veh && veh->m_nZoneLevel == LEVEL_NONE && veh->IsCar()) {
-
-				if(veh->GetStatus() != STATUS_ABANDONED && veh->GetStatus() != STATUS_WRECKED && veh->GetStatus() != STATUS_PLAYER &&
-					veh->GetStatus() != STATUS_PLAYER_REMOTE) {
-
-					CVector vehPos(veh->GetPosition());
-					CPopulation::FindCollisionZoneForCoors(&vehPos, &zone, &level);
-
-					// Level 0 is transition zones, and we don't wanna touch cars on transition zones.
-					if (level != LEVEL_NONE && level != CCollision::ms_collisionInMemory && vehPos.z > -4.0f) {
-						if (veh->bIsLocked || !veh->CanBeDeleted()) {
-							switch (movedVehicleCount & 3) {
-								case 0:
-									veh->SetPosition(RegenerationPoint_a);
-									break;
-								case 1:
-									veh->SetPosition(RegenerationPoint_b);
-									break;
-								case 2:
-									veh->SetPosition(RegenerationPoint_a.x, RegenerationPoint_b.y, RegenerationPoint_a.z);
-									break;
-								case 3:
-									veh->SetPosition(RegenerationPoint_b.x, RegenerationPoint_a.y, RegenerationPoint_a.z);
-									break;
-								default:
-									break;
-							}
-							veh->GetMatrix().GetPosition().z += (movedVehicleCount / 4) * 7.0f;
-							veh->GetMatrix().GetForward() = RegenerationForward;
-							((CAutomobile*)veh)->PlaceOnRoadProperly();
-							CCarCtrl::JoinCarWithRoadSystem(veh);
-							CTheScripts::ClearSpaceForMissionEntity(veh->GetPosition(), veh);
-							++movedVehicleCount;
-						} else {
-							CWorld::Remove(veh);
-							delete veh;
-						}
-					}
-				}
-			}
-		}
-	} else if (frame == 5) {
-		int poolSize = CPools::GetPedPool()->GetSize();
-		for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
-
-			CPed *ped = CPools::GetPedPool()->GetSlot(poolIndex);
-			if (ped && ped->m_nZoneLevel == LEVEL_NONE && !ped->bInVehicle) {
-
-				CVector pedPos(ped->GetPosition());
-				CPopulation::FindCollisionZoneForCoors(&pedPos, &zone, &level);
-
-				// Level 0 is transition zones, and we don't wanna touch peds on transition zones.
-				if (level != LEVEL_NONE && level != CCollision::ms_collisionInMemory && pedPos.z > -4.0f) {
-					if (ped->CanBeDeleted()) {
-						CWorld::Remove(ped);
-						delete ped;
-					} else if (ped->m_nPedType != PEDTYPE_PLAYER1 && ped->m_nPedType != PEDTYPE_PLAYER2) {
-						ped->SetPosition(RegenerationPoint_a);
-
-						bool foundGround;
-						float groundZ = CWorld::FindGroundZFor3DCoord(ped->GetPosition().x, ped->GetPosition().y,
-							ped->GetPosition().z + 2.0f, &foundGround);
-
-						if (foundGround) {
-							ped->GetMatrix().GetPosition().z = 1.0f + groundZ;
-							//ped->GetPosition().z += 0.0f;
-							CTheScripts::ClearSpaceForMissionEntity(ped->GetPosition(), ped);
-						}
-					}
-				}
-			}
-		}
-	}
 }
 
 void
@@ -970,7 +857,8 @@ CPopulation::ConvertToRealObject(CDummyObject *dummy)
 	delete dummy;
 	CWorld::Add(obj);
 
-	if (IsGlass(obj->GetModelIndex())) {
+	CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(obj->GetModelIndex());
+	if (IsGlass(obj->GetModelIndex()) && !mi->m_isArtistGlass) {
 		obj->bIsVisible = false;
 	} else if (obj->GetModelIndex() == MI_BUOY) {
 		obj->bIsStatic = false;
@@ -989,7 +877,8 @@ CPopulation::ConvertToDummyObject(CObject *obj)
 	dummy->GetMatrix().UpdateRW();
 	dummy->UpdateRwFrame();
 
-	if (IsGlass(obj->GetModelIndex()))
+	CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(obj->GetModelIndex());
+	if (IsGlass(obj->GetModelIndex()) && !mi->m_isArtistGlass)
 		dummy->bIsVisible = false;
 
 	CWorld::Remove(obj);
@@ -1117,6 +1006,10 @@ CPopulation::ManagePopulation(void)
 			}
 
 			float dist = (ped->GetPosition() - playerPos).Magnitude2D();
+
+			if (ped->IsGangMember() || (ped->bDeadPedInFrontOfCar && ped->m_vehicleInAccident))
+				dist -= 30.0f;
+
 			bool pedIsFarAway = false;
 			if (PedCreationDistMultiplier() * (PED_REMOVE_DIST_SPECIAL * TheCamera.GenerationDistMultiplier) < dist
 				|| (!ped->bCullExtraFarAway && PedCreationDistMultiplier() * PED_REMOVE_DIST * TheCamera.GenerationDistMultiplier < dist)
@@ -1163,3 +1056,67 @@ CPopulation::ManagePopulation(void)
 		}
 	}
 }
+
+CPed* 
+CPopulation::AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit)
+{
+	if (TheCamera.IsSphereVisible(pos, 2.0f)) {
+		float fDistanceToPlayer = (pos - FindPlayerPed()->GetPosition()).Magnitude2D();
+		float fDistanceMultiplier;
+		if (FindPlayerVehicle())
+			fDistanceMultiplier = clamp(FindPlayerVehicle()->GetMoveSpeed().Magnitude2D() - 0.1f + 1.0f, 1.0f, 1.5f);
+		else
+			fDistanceMultiplier = 1.0f;
+		if (40.0f * fDistanceMultiplier > fDistanceToPlayer)
+			return nil;
+	}
+	bool found;
+	float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, &found) + 1.0f;
+	if (!found)
+		return nil;
+	z = Max(z, pos.z);
+	if (!CModelInfo::GetModelInfo(MI_MALE01)->GetRwObject()) // strange way to check it
+		return nil;
+	CPed* pPed = CPopulation::AddPed(PEDTYPE_CIVMALE, MI_MALE01, pos); // TODO(MIAMI): 4th parameter
+	pPed->SetDie();
+	pPed->m_nPedMoney = 0;
+	pPed->bDeadPedInFrontOfCar = true;
+	pPed->m_vehicleInAccident = pCulprit;
+	pCulprit->RegisterReference((CEntity**)&pPed->m_vehicleInAccident);
+	CEntity* pEntities[3] = { 0 };
+	if (!CPedPlacement::IsPositionClearForPed(pos, 2.0f, 3, pEntities)) {
+		for (int i = 0; i < 3; i++) {
+			if (pEntities[i] && pEntities[i] != pCulprit && pEntities[i] != pPed) {
+				CWorld::Remove(pPed);
+				delete pPed;
+				return nil;
+			}
+		}
+	}
+	CColPoint colpts[MAX_COLLISION_POINTS];
+	if (CCollision::ProcessColModels(pCulprit->GetMatrix(), *pCulprit->GetColModel(), pPed->GetMatrix(), *pPed->GetColModel(), colpts, nil, nil)) {
+		CWorld::Remove(pPed);
+		delete pPed;
+		return nil;
+	}
+	CVisibilityPlugins::SetClumpAlpha(pPed->GetClump(), 0);
+	return pPed;
+}
+
+bool
+CPopulation::IsSkateable(CVector const& pos)
+{
+	CColPoint foundCol;
+	CEntity* foundEnt = nil;
+	CWorld::ProcessVerticalLine(pos + CVector(0.f, 0.f, 2.f), pos.z - 2.0f, foundCol, foundEnt, true, false, false, false, false, false, nil);
+	if (!foundEnt)
+		return false;
+
+	return foundCol.surfaceB == SURFACE_TARMAC || foundCol.surfaceB == SURFACE_PAVEMENT;
+}
+
+bool
+CPopulation::CanJeerAtStripper(int32 model)
+{
+	return model == MI_WMOBE || model == MI_WMYBE || model == MI_WMOST || model == MI_BMYBB;
+}
\ No newline at end of file
diff --git a/src/peds/Population.h b/src/peds/Population.h
index aa8129c0..eaf3eade 100644
--- a/src/peds/Population.h
+++ b/src/peds/Population.h
@@ -62,12 +62,15 @@ public:
 	static CVector RegenerationPoint_b;
 	static CVector RegenerationForward;
 
+	static uint32 ms_nTotalCarPassengerPeds;
+	static uint32 NumMiamiViceCops;
+
 	static void Initialise();
 	static void Update(void);
 	static void LoadPedGroups();
 	static void UpdatePedCount(ePedType, bool);
 	static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
-	static CPed *AddPedInCar(CVehicle *car);
+	static CPed *AddPedInCar(CVehicle *car, bool isDriver);
 	static bool IsPointInSafeZone(CVector *coors);
 	static void RemovePed(CPed *ent);
 	static int32 ChooseCivilianOccupation(int32);
@@ -77,7 +80,7 @@ public:
 	static void FindClosestZoneForCoors(CVector*, int*, eLevelName, eLevelName);
 	static void GeneratePedsAtStartOfGame();
 	static float PedCreationDistMultiplier();
-	static CPed *AddPed(ePedType pedType, uint32 mi, CVector const &coors);
+	static CPed *AddPed(ePedType pedType, uint32 mi, CVector const &coors, int32 modifier = 0);
 	static void AddToPopulation(float, float, float, float);
 	static void ManagePopulation(void);
 	static void MoveCarsAndPedsOutOfAbandonedZones(void);
@@ -86,4 +89,8 @@ public:
 	static void ConvertAllObjectsToDummyObjects(void);
 	static bool TestRoomForDummyObject(CObject*);
 	static bool TestSafeForRealObject(CDummyObject*);
+	static bool IsSkateable(CVector const&);
+	static bool CanJeerAtStripper(int32 model);
+
+	static CPed* AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit);
 };
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index 2a71a8d5..504824c5 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -3,7 +3,9 @@
 enum {
 	EFFECT_LIGHT,
 	EFFECT_PARTICLE,
-	EFFECT_ATTRACTOR
+	EFFECT_ATTRACTOR,
+	EFFECT_PED_ATTRACTOR,
+	EFFECT_SUNGLARE
 };
 
 enum {
@@ -34,6 +36,8 @@ enum {
 	// same order as CPointLights flags, must start at 2
 	LIGHTFLAG_FOG_NORMAL = 2,	// can have light and fog
 	LIGHTFLAG_FOG_ALWAYS = 4,	// fog only
+	LIGHTFLAG_HIDE_OBJECT = 8,	// hide the object instead of rendering light (???)
+	LIGHTFLAG_LONG_DIST = 16,
 	LIGHTFLAG_FOG = (LIGHTFLAG_FOG_NORMAL|LIGHTFLAG_FOG_ALWAYS)
 };
 
@@ -63,6 +67,11 @@ public:
 		uint8 flags;
 		uint8 probability;
 	};
+	struct PedAttractor {
+		CVector queueDir;
+		CVector useDir;
+		int8 type;
+	};
 
 	CVector pos;
 	CRGBA col;
@@ -71,6 +80,7 @@ public:
 		Light light;
 		Particle particle;
 		Attractor attractor;
+		PedAttractor pedattr;
 	};
 
 	C2dEffect(void) {}
diff --git a/src/render/Clouds.cpp b/src/render/Clouds.cpp
index 60450213..c6ba0f10 100644
--- a/src/render/Clouds.cpp
+++ b/src/render/Clouds.cpp
@@ -3,6 +3,7 @@
 #include "Sprite.h"
 #include "Sprite2d.h"
 #include "General.h"
+#include "Game.h"
 #include "Coronas.h"
 #include "Camera.h"
 #include "TxdStore.h"
@@ -23,8 +24,10 @@ uint32 CClouds::IndividualRotation;
 
 float CClouds::ms_cameraRoll;
 float CClouds::ms_horizonZ;
+float CClouds::ms_HorizonTilt;
 CRGBA CClouds::ms_colourTop;
 CRGBA CClouds::ms_colourBottom;
+CRGBA CClouds::ms_colourBkGrd;
 
 void
 CClouds::Init(void)
@@ -44,25 +47,15 @@ void
 CClouds::Shutdown(void)
 {
 	RwTextureDestroy(gpCloudTex[0]);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex[0] = nil;
-#endif
 	RwTextureDestroy(gpCloudTex[1]);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex[1] = nil;
-#endif
 	RwTextureDestroy(gpCloudTex[2]);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex[2] = nil;
-#endif
 	RwTextureDestroy(gpCloudTex[3]);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex[3] = nil;
-#endif
 	RwTextureDestroy(gpCloudTex[4]);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex[4] = nil;
-#endif
 }
 
 void
@@ -70,11 +63,11 @@ CClouds::Update(void)
 {
 	float s = Sin(TheCamera.Orientation - 0.85f);
 #ifdef FIX_BUGS
-	CloudRotation += CWeather::Wind*s*0.0025f*CTimer::GetTimeStepFix();
-	IndividualRotation += (CWeather::Wind*CTimer::GetTimeStep() + 0.3f*CTimer::GetTimeStepFix()) * 60.0f;
+	CloudRotation += CWeather::Wind*s*0.001f*CTimer::GetTimeStepFix();
+	IndividualRotation += (CWeather::Wind*CTimer::GetTimeStep()*0.5f + 0.3f*CTimer::GetTimeStepFix()) * 60.0f;
 #else
-	CloudRotation += CWeather::Wind*s*0.0025f;
-	IndividualRotation += (CWeather::Wind*CTimer::GetTimeStep() + 0.3f) * 60.0f;
+	CloudRotation += CWeather::Wind*s*0.001f;
+	IndividualRotation += (CWeather::Wind*CTimer::GetTimeStep()*0.5f + 0.3f) * 60.0f;
 #endif
 }
 
@@ -86,6 +79,9 @@ CClouds::Render(void)
 	RwV3d screenpos;
 	RwV3d worldpos;
 
+	if(!CGame::CanSeeOutSideFromCurrArea())
+		return;
+
 	CCoronas::SunBlockedByClouds = false;
 
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
@@ -95,26 +91,21 @@ CClouds::Render(void)
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
 	CSprite::InitSpriteBuffer();
 
-	int minute = CClock::GetHours()*60 + CClock::GetMinutes();
+	float minute = CClock::GetHours()*60 + CClock::GetMinutes() + CClock::GetSeconds()/60.0f;
 	RwV3d campos = *(RwV3d*)&TheCamera.GetPosition();
 
 	float coverage = Max(CWeather::Foggyness, CWeather::Foggyness);
 
 	// Moon
-	int moonfadeout = Abs(minute - 180);	// fully visible at 3AM
-	if(moonfadeout < 180){			// fade in/out 3 hours
-		int brightness = (1.0f - coverage) * (180 - moonfadeout);
+	float moonfadeout = Abs(minute - 180.0f);	// fully visible at 3AM
+	if((int)moonfadeout < 180){			// fade in/out 3 hours
+		int brightness = (1.0f - coverage) * (180 - (int)moonfadeout);
 		RwV3d pos = { 0.0f, -100.0f, 15.0f };
 		RwV3dAdd(&worldpos, &campos, &pos);
 		if(CSprite::CalcScreenCoors(worldpos, &screenpos, &szx, &szy, false)){
 			RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpCoronaTexture[2]));
-			if(CCoronas::bSmallMoon){
-				szx *= 4.0f;
-				szy *= 4.0f;
-			}else{
-				szx *= 10.0f;
-				szy *= 10.0f;
-			}
+			szx *= CCoronas::MoonSize*2.0f + 4.0f;
+			szy *= CCoronas::MoonSize*2.0f + 4.0f;
 			CSprite::RenderOneXLUSprite(screenpos.x, screenpos.y, screenpos.z,
 				szx, szy, brightness, brightness, brightness, 255, 1.0f/screenpos.z, 255);
 		}
@@ -132,7 +123,7 @@ CClouds::Render(void)
 		starintens = 255 * (60 - CClock::GetMinutes())/60.0f;
 	if(starintens != 0){
 		// R
-		static float StarCoorsX[9] = { 0.0f, 0.05f, 0.12f, 0.5f, 0.8f, 0.6f, 0.27f, 0.55f, 0.75f };
+		static float StarCoorsX[9] = { 0.0f, 0.05f, 0.13f, 0.4f, 0.7f, 0.6f, 0.27f, 0.55f, 0.75f };
 		static float StarCoorsY[9] = { 0.0f, 0.45f, 0.9f, 1.0f, 0.85f, 0.52f, 0.48f, 0.35f, 0.2f };
 		static float StarSizes[9] = { 1.0f, 1.4f, 0.9f, 1.0f, 0.6f, 1.5f, 1.3f, 1.0f, 0.8f };
 		int brightness = (1.0f - coverage) * starintens;
@@ -170,7 +161,7 @@ CClouds::Render(void)
 		1.0f, 0.7f, 0.4f, 0.4f, -0.8f, -0.8f };
 	static float LowCloudsZ[12] = { 0.0f, 1.0f, 0.5f, 0.0f, 1.0f, 0.3f,
 		0.9f, 0.4f, 1.3f, 1.4f, 1.2f, 1.7f };
-	float lowcloudintensity = 1.0f - coverage;
+	float lowcloudintensity = 1.0f - Max(coverage, CWeather::ExtraSunnyness);
 	int r = CTimeCycle::GetLowCloudsRed() * lowcloudintensity;
 	int g = CTimeCycle::GetLowCloudsGreen() * lowcloudintensity;
 	int b = CTimeCycle::GetLowCloudsBlue() * lowcloudintensity;
@@ -191,7 +182,7 @@ CClouds::Render(void)
 	// Fluffy clouds
 	float rot_sin = Sin(CloudRotation);
 	float rot_cos = Cos(CloudRotation);
-	int fluffyalpha = 160 * (1.0f - CWeather::Foggyness);
+	int fluffyalpha = 160 * (1.0f - Max(CWeather::Foggyness, CWeather::ExtraSunnyness));
 	if(fluffyalpha != 0){
 		static float CoorsOffsetX[37] = {
 			0.0f, 60.0f, 72.0f, 48.0f, 21.0f, 12.0f,
@@ -218,7 +209,7 @@ CClouds::Render(void)
 			2.0f, 2.0f, 1.5f, 1.2f, 1.7f, 1.5f, 2.1f
 		};
 		static bool bCloudOnScreen[37];
-		float hilight;
+		float sundist, hilight;
 
 		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
 		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
@@ -230,15 +221,16 @@ CClouds::Render(void)
 			worldpos.z = pos.z;
 
 			if(CSprite::CalcScreenCoors(worldpos, &screenpos, &szx, &szy, false)){
-				float sundist = Sqrt(sq(screenpos.x-CCoronas::SunScreenX) + sq(screenpos.y-CCoronas::SunScreenY));
+				sundist = Sqrt(sq(screenpos.x-CCoronas::SunScreenX) + sq(screenpos.y-CCoronas::SunScreenY));
 				int tr = CTimeCycle::GetFluffyCloudsTopRed();
 				int tg = CTimeCycle::GetFluffyCloudsTopGreen();
 				int tb = CTimeCycle::GetFluffyCloudsTopBlue();
 				int br = CTimeCycle::GetFluffyCloudsBottomRed();
 				int bg = CTimeCycle::GetFluffyCloudsBottomGreen();
 				int bb = CTimeCycle::GetFluffyCloudsBottomBlue();
-				if(sundist < SCREEN_WIDTH/2){
-					hilight = (1.0f - coverage) * (1.0f - sundist/(SCREEN_WIDTH/2));
+				int distLimit = (3*SCREEN_WIDTH)/4;
+				if(sundist < distLimit){
+					hilight = (1.0f - coverage) * (1.0f - sundist/(float)distLimit);
 					tr = tr*(1.0f-hilight) + 255*hilight;
 					tg = tg*(1.0f-hilight) + 190*hilight;
 					tb = tb*(1.0f-hilight) + 190*hilight;
@@ -272,8 +264,7 @@ CClouds::Render(void)
 			worldpos.y = campos.x*rot_sin + campos.y*rot_cos + pos.y;
 			worldpos.z = pos.z;
 			if(bCloudOnScreen[i] && CSprite::CalcScreenCoors(worldpos, &screenpos, &szx, &szy, false)){
-				// BUG: this is stupid....would have to do this for each cloud individually
-				if(hilight > 0.0f){
+				if(sundist < SCREEN_WIDTH/3){
 					CSprite::RenderBufferedOneXLUSprite_Rotate_Aspect(screenpos.x, screenpos.y, screenpos.z,
 						szx*30.0f, szy*30.0f,
 						200*hilight, 0, 0, 255, 1.0f/screenpos.z,
@@ -320,14 +311,17 @@ void
 CClouds::RenderBackground(int16 topred, int16 topgreen, int16 topblue,
 	int16 botred, int16 botgreen, int16 botblue, int16 alpha)
 {
-	CVector left = TheCamera.GetRight();
-	float c = left.Magnitude2D();
+	CVector right = CrossProduct(TheCamera.GetUp(), TheCamera.GetForward());
+	right.Normalise();
+	float c = right.Magnitude2D();
 	if(c > 1.0f)
 		c = 1.0f;
 	ms_cameraRoll = Acos(c);
-	if(left.z < 0.0f)
+	if(right.z < 0.0f)
 		ms_cameraRoll = -ms_cameraRoll;
 
+	ms_HorizonTilt = SCREEN_WIDTH/2.0f * Tan(ms_cameraRoll);
+
 	if(UseDarkBackground()){
 		ms_colourTop.r = 50;
 		ms_colourTop.g = 50;
@@ -350,75 +344,74 @@ CClouds::RenderBackground(int16 topred, int16 topgreen, int16 topblue,
 	}else{
 		ms_horizonZ = CSprite::CalcHorizonCoors();
 
+		int fogr = (topred + 2 * botred) / 3;
+		int fogg = (topgreen + 2 * botgreen) / 3;
+		int fogb = (topblue + 2 * botblue) / 3;
+
 		// Draw top/bottom gradient
 		float gradheight = SCREEN_HEIGHT/2.0f;
-		float topedge = ms_horizonZ - gradheight;
-		float botpos, toppos;
-		if(ms_horizonZ > 0.0f && topedge < SCREEN_HEIGHT){
-			ms_colourTop.r = topred;
-			ms_colourTop.g = topgreen;
-			ms_colourTop.b = topblue;
-			ms_colourTop.a = alpha;
-			ms_colourBottom.r = botred;
-			ms_colourBottom.g = botgreen;
-			ms_colourBottom.b = botblue;
-			ms_colourBottom.a = alpha;
-
-			if(ms_horizonZ < SCREEN_HEIGHT)
-				botpos = ms_horizonZ;
-			else{
-				float f = (ms_horizonZ - SCREEN_HEIGHT)/gradheight;
-				ms_colourBottom.r = topred*f + (1.0f-f)*botred;
-				ms_colourBottom.g = topgreen*f + (1.0f-f)*botgreen;
-				ms_colourBottom.b = topblue*f + (1.0f-f)*botblue;
-				botpos = SCREEN_HEIGHT;
-			}
-			if(topedge >= 0.0f)
-				toppos = topedge;
-			else{
-				float f = (0.0f - topedge)/gradheight;
-				ms_colourTop.r = botred*f + (1.0f-f)*topred;
-				ms_colourTop.g = botgreen*f + (1.0f-f)*topgreen;
-				ms_colourTop.b = botblue*f + (1.0f-f)*topblue;
-				toppos = 0.0f;
-			}
-			CSprite2d::DrawRect(CRect(0, toppos, SCREEN_WIDTH, botpos),
-				ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop);
-		}
+
+		ms_colourTop.r = topred;
+		ms_colourTop.g = topgreen;
+		ms_colourTop.b = topblue;
+		ms_colourTop.a = alpha;
+		ms_colourBottom.r = botred;
+		ms_colourBottom.g = botgreen;
+		ms_colourBottom.b = botblue;
+		ms_colourBottom.a = alpha;
+
+		float botright = ms_horizonZ - ms_HorizonTilt;
+		float botleft = ms_horizonZ + ms_HorizonTilt;
+		float topright = botright - gradheight;
+		float topleft = botleft - gradheight;
+
+		CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+			 ms_colourTop, ms_colourTop, ms_colourBottom, ms_colourBottom);
 
 		// draw the small stripe (whatever it's supposed to be)
-		if(ms_horizonZ > -SMALLSTRIPHEIGHT && ms_horizonZ < SCREEN_HEIGHT){
-			// Same colour as fog
-			ms_colourTop.r = (topred + 2 * botred) / 3;
-			ms_colourTop.g = (topgreen + 2 * botgreen) / 3;
-			ms_colourTop.b = (topblue + 2 * botblue) / 3;
-			CSprite2d::DrawRect(CRect(0, ms_horizonZ, SCREEN_WIDTH, ms_horizonZ+SMALLSTRIPHEIGHT),
-				ms_colourTop, ms_colourTop, ms_colourTop, ms_colourTop);
-		}
+		ms_colourTop.r = fogr;
+		ms_colourTop.g = fogg;
+		ms_colourTop.b = fogb;
+		ms_colourTop.a = alpha;
+		topright = ms_horizonZ - ms_HorizonTilt;
+		topleft = ms_horizonZ + ms_HorizonTilt;
+		botright = topright + SMALLSTRIPHEIGHT;
+		botleft = topleft + SMALLSTRIPHEIGHT;
+		CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+			ms_colourTop, ms_colourTop, ms_colourTop, ms_colourTop);
 
 		// Only top
-		if(topedge > 0.0f){
+		if(ms_horizonZ + ms_HorizonTilt - gradheight > 0.0f ||
+		   ms_horizonZ - ms_HorizonTilt - gradheight > 0.0f){
 			ms_colourTop.r = topred;
 			ms_colourTop.g = topgreen;
 			ms_colourTop.b = topblue;
 			ms_colourTop.a = alpha;
-			ms_colourBottom.r = topred;
-			ms_colourBottom.g = topgreen;
-			ms_colourBottom.b = topblue;
-			ms_colourBottom.a = alpha;
-
-			botpos = Min(SCREEN_HEIGHT, topedge);
-			CSprite2d::DrawRect(CRect(0, 0, SCREEN_WIDTH, botpos),
-				ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop);
+
+			if(ms_horizonZ - Abs(ms_HorizonTilt) - gradheight > SCREEN_HEIGHT){
+				// only top is visible
+				topleft = 0.0f;
+				topright = 0.0f;
+				botleft = SCREEN_HEIGHT;
+				botright = SCREEN_HEIGHT;
+			}else{
+				botright = ms_horizonZ - ms_HorizonTilt - gradheight;
+				botleft = ms_horizonZ + ms_HorizonTilt - gradheight;
+				topright = Min(ms_horizonZ - ms_HorizonTilt - 2*SCREEN_HEIGHT, 0.0f);
+				topleft = Min(ms_horizonZ + ms_HorizonTilt - 2*SCREEN_HEIGHT, 0.0f);
+			}
+
+			CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+				ms_colourTop, ms_colourTop, ms_colourTop, ms_colourTop);
 		}
 
 		// Set both to fog colour for RenderHorizon
-		ms_colourTop.r = (topred + 2 * botred) / 3;
-		ms_colourTop.g = (topgreen + 2 * botgreen) / 3;
-		ms_colourTop.b = (topblue + 2 * botblue) / 3;
-		ms_colourBottom.r = (topred + 2 * botred) / 3;
-		ms_colourBottom.g = (topgreen + 2 * botgreen) / 3;
-		ms_colourBottom.b = (topblue + 2 * botblue) / 3;
+		ms_colourTop.r = fogr;
+		ms_colourTop.g = fogg;
+		ms_colourTop.b = fogb;
+		ms_colourBottom.r = fogr;
+		ms_colourBottom.g = fogg;
+		ms_colourBottom.b = fogb;
 	}
 }
 
@@ -431,21 +424,35 @@ CClouds::RenderHorizon(void)
 	ms_colourBottom.a = 230;
 	ms_colourTop.a = 80;
 
-	if(ms_horizonZ > SCREEN_HEIGHT)
-		return;
+	float topright = ms_horizonZ - ms_HorizonTilt;
+	float topleft = ms_horizonZ + ms_HorizonTilt;
+	float botright = topright + SMALLSTRIPHEIGHT;
+	float botleft = topleft + SMALLSTRIPHEIGHT;
+
+	CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+		ms_colourTop, ms_colourTop, ms_colourBottom, ms_colourBottom);
+
+
+	ms_colourBkGrd.r = 128.0f*CTimeCycle::GetAmbientRed();
+	ms_colourBkGrd.g = 128.0f*CTimeCycle::GetAmbientGreen();
+	ms_colourBkGrd.b = 128.0f*CTimeCycle::GetAmbientBlue();
+	ms_colourBkGrd.a = 255;
+
+	float horzstrip = SCREEN_STRETCH_Y(HORIZSTRIPHEIGHT);
+	topright = botright;
+	topleft = botleft;
+	botright = topright + horzstrip;
+	botleft = topleft + horzstrip;
+
+	CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+		ms_colourBottom, ms_colourBottom, ms_colourBkGrd, ms_colourBkGrd);
+
+
+	topright = botright;
+	topleft = botleft;
+	botright = Max(topright, SCREEN_HEIGHT);
+	botleft = Max(topleft, SCREEN_HEIGHT);
 
-	float z1 = Min(ms_horizonZ + SMALLSTRIPHEIGHT, SCREEN_HEIGHT);
-	CSprite2d::DrawRectXLU(CRect(0, ms_horizonZ, SCREEN_WIDTH, z1),
-		ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop);
-
-	// This is just weird
-	float a = SCREEN_HEIGHT/400.0f * HORIZSTRIPHEIGHT +
-		SCREEN_HEIGHT/300.0f * Max(TheCamera.GetPosition().z, 0.0f);
-	float b = TheCamera.GetUp().z < 0.0f ?
-		SCREEN_HEIGHT :
-		SCREEN_HEIGHT * Abs(TheCamera.GetRight().z);
-	float z2 = z1 + (a + b)*TheCamera.LODDistMultiplier;
-	z2 = Min(z2, SCREEN_HEIGHT);
-	CSprite2d::DrawRect(CRect(0, z1, SCREEN_WIDTH, z2),
-		ms_colourBottom, ms_colourBottom, ms_colourTop, ms_colourTop);
+	CSprite2d::DrawAnyRect(0.0f, topleft,  SCREEN_WIDTH, topright,  0.0f, botleft,  SCREEN_WIDTH, botright,
+		ms_colourBkGrd, ms_colourBkGrd, ms_colourBkGrd, ms_colourBkGrd);
 }
diff --git a/src/render/Clouds.h b/src/render/Clouds.h
index 4d8cd2c8..ef33030b 100644
--- a/src/render/Clouds.h
+++ b/src/render/Clouds.h
@@ -8,8 +8,10 @@ public:
 
 	static float ms_cameraRoll;
 	static float ms_horizonZ;
+	static float ms_HorizonTilt;
 	static CRGBA ms_colourTop;
 	static CRGBA ms_colourBottom;
+	static CRGBA ms_colourBkGrd;
 
 	static void Init(void);
 	static void Shutdown(void);
diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp
index 5bf89403..efe486fe 100644
--- a/src/render/Coronas.cpp
+++ b/src/render/Coronas.cpp
@@ -53,7 +53,7 @@ RwTexture *gpCoronaTexture[9] = { nil, nil, nil, nil, nil, nil, nil, nil, nil };
 float CCoronas::LightsMult = 1.0f;
 float CCoronas::SunScreenX;
 float CCoronas::SunScreenY;
-bool CCoronas::bSmallMoon;
+int CCoronas::MoonSize;
 bool CCoronas::SunBlockedByClouds;
 int CCoronas::bChangeBrightnessImmediately;
 
@@ -129,7 +129,8 @@ CCoronas::Update(void)
 void
 CCoronas::RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
 	const CVector &coors, float size, float drawDist, RwTexture *tex,
-	int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle)
+	int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+	bool longDist, float nearDist)
 {
 	int i;
 
@@ -192,11 +193,13 @@ CCoronas::RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 al
 
 void
 CCoronas::RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
-		const CVector &coors, float size, float drawDist, uint8 type,
-		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle)
+	const CVector &coors, float size, float drawDist, uint8 type,
+	int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+	bool longDist, float nearDist)
 {
 	RegisterCorona(id, red, green, blue, alpha, coors, size, drawDist,
-		gpCoronaTexture[type], flareType, reflection, LOScheck, drawStreak, someAngle);
+		gpCoronaTexture[type], flareType, reflection, LOScheck, drawStreak, someAngle,
+		longDist, nearDist);
 }
 
 void
diff --git a/src/render/Coronas.h b/src/render/Coronas.h
index 46eb4315..cb4e8583 100644
--- a/src/render/Coronas.h
+++ b/src/render/Coronas.h
@@ -81,7 +81,7 @@ public:
 	static float LightsMult;
 	static float SunScreenY;
 	static float SunScreenX;
-	static bool bSmallMoon;
+	static int MoonSize;
 	static bool SunBlockedByClouds;
 	static int bChangeBrightnessImmediately;
 
@@ -90,10 +90,12 @@ public:
 	static void Update(void);
 	static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
 		const CVector &coors, float size, float drawDist, RwTexture *tex,
-		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle);
+		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+		bool longDist = false, float nearClip = 1.5f);
 	static void RegisterCorona(uint32 id, uint8 red, uint8 green, uint8 blue, uint8 alpha,
 		const CVector &coors, float size, float drawDist, uint8 type,
-		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle);
+		int8 flareType, uint8 reflection, uint8 LOScheck, uint8 drawStreak, float someAngle,
+		bool longDist = false, float nearClip = 1.5f);
 	static void UpdateCoronaCoors(uint32 id, const CVector &coors, float drawDist, float someAngle);
 	static void Render(void);
 	static void RenderReflections(void);
diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index dc0b0252..60e69583 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -128,12 +128,12 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED040"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED041"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED042"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED043"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED044"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -176,7 +176,7 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED061"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED062"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -191,7 +191,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED068"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED069"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED070"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -220,7 +220,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED262"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED085"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED086"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -265,76 +265,76 @@ CCredits::Render(void)
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED108"), lineoffset, scrolloffset);
 	PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED109"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED110"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED111"), lineoffset, scrolloffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED112"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED113"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED114"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED115"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED116"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED117"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED118"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED119"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED120"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED121"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED122"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED123"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED124"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED125"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED126"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED127"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED128"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED129"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED130"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED131"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED132"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED133"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED134"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp
index b31cc624..e2dfc8d9 100644
--- a/src/render/Draw.cpp
+++ b/src/render/Draw.cpp
@@ -19,24 +19,23 @@ uint8 CDraw::FadeGreen;
 uint8 CDraw::FadeBlue;
 
 float
-CDraw::FindAspectRatio(void)
+CDraw::CalculateAspectRatio(void)
 {
-#ifndef ASPECT_RATIO_SCALE
-	if(FrontEndMenuManager.m_PrefsUseWideScreen)	
-		return 16.0f/9.0f;
-	else
-		return 4.0f/3.0f;
+	if (FrontEndMenuManager.m_PrefsUseWideScreen) {
+		if (TheCamera.m_WideScreenOn)
+			CDraw::ms_fAspectRatio = 5.f / 3.f; // It's used on theatrical showings according to Wiki
+		else
+#ifdef ASPECT_RATIO_SCALE
+			CDraw::ms_fAspectRatio = FrontEndMenuManager.m_PrefsUseWideScreen == AR_AUTO ? SCREEN_WIDTH / SCREEN_HEIGHT : 16.f / 9.f;
 #else
-	switch (FrontEndMenuManager.m_PrefsUseWideScreen) {
-	case AR_AUTO:
-		return SCREEN_WIDTH / SCREEN_HEIGHT;
-	default:
-	case AR_4_3:
-		return 4.0f / 3.0f;
-	case AR_16_9:
-		return 16.0f / 9.0f;
-	};
+			CDraw::ms_fAspectRatio = 16.f / 9.f;
 #endif
+	} else if (TheCamera.m_WideScreenOn) {
+		CDraw::ms_fAspectRatio = 5.f/4.f;
+	} else {
+		CDraw::ms_fAspectRatio = 4.f/3.f;
+	}
+	return CDraw::ms_fAspectRatio;
 }
 
 #ifdef ASPECT_RATIO_SCALE
diff --git a/src/render/Draw.h b/src/render/Draw.h
index 55958a2a..46e85e49 100644
--- a/src/render/Draw.h
+++ b/src/render/Draw.h
@@ -38,12 +38,10 @@ public:
 	static void SetFOV(float fov);
 	static float GetFOV(void) { return ms_fFOV; }
 
-	static float FindAspectRatio(void);
+	static float CalculateAspectRatio(void);
 #ifdef ASPECT_RATIO_SCALE
 	static float ConvertFOV(float fov);
+#endif
 	static float GetAspectRatio(void) { return ms_fAspectRatio; }
 	static void SetAspectRatio(float ratio) { ms_fAspectRatio = ratio; }
-#else
-	static float GetAspectRatio(void) { return FindAspectRatio(); }
-#endif
 };
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index 9f3f6929..1056d6ff 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -104,7 +104,8 @@ void CMovingThings::Init()
 	EndCloseList.m_pNext = nil;
 	EndCloseList.m_pPrev = &CMovingThings::StartCloseList;
 	Num = 0;
-	
+
+#ifndef MIAMI	// something is still used here actually
 	// Initialize scroll bars
 	 aScrollBars[0].Init(CVector(  228.3f,    -669.0f,     39.0f  ), SCROLL_BUSINESS,       0.0f,     0.5f,     0.5f,   255, 128, 0,   0.3f);
 	 aScrollBars[1].Init(CVector(  772.0f,     164.0f,     -9.5f  ), SCROLL_TRAFFIC,        0.0f,     0.5f,     0.25f,  128, 255, 0,   0.3f);
@@ -137,6 +138,7 @@ void CMovingThings::Init()
 		CVector(58.145f - sz.y * 0.05f - sz.x * 0.3f, -1079.268f + sz.x * 0.05f - sz.y * 0.3f, 32.803f),
 		-sz.x, -sz.y, 0, 255, 0, 100.0f, 0.8f
 	);
+#endif
 }
 
 void CMovingThings::Shutdown()
@@ -380,7 +382,7 @@ void CScrollBar::Update()
 					m_pMessage = FindTimeMessage();
 					break;
 				case 6:
-					if (CMenuManager::m_PrefsLanguage == LANGUAGE_FRENCH || CMenuManager::m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
 						m_pMessage = FindTimeMessage();
 					else
 						m_pMessage = "WWW.GRANDTHEFTAUTO3.COM    ";
@@ -600,7 +602,7 @@ void CScrollBar::Update()
 					m_pMessage = "FREE FLUFFY DICE WITH ALL PURCHASES. . .";
 					break;
 				case 9:
-					if (CMenuManager::m_PrefsLanguage == LANGUAGE_FRENCH || CMenuManager::m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
 						m_pMessage = "QUICK, TAKE A LOOK AT OUR CURRENT STOCK )CAUSE THESE AUTOS ARE MOVIN) FAST . . .  ";
 					else
 						m_pMessage = "HTTP:((ROCKSTARGAMES.COM(GRANDTHEFTAUTO3(CAPITALAUTOS    ";
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 33b2dca1..0b410497 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -936,15 +936,27 @@ CFont::GetStringWidth(wchar *s, bool spaces)
 	} else
 #endif
 	{
-		for (; (*s != ' ' || spaces) && *s != '\0'; s++) {
-			if (*s == '~') {
-				s++;
-				while (*s != '~') s++;
+		for (wchar c = *s; (c != ' ' || spaces) && c != '\0'; c = *(++s)) {
+			if (c == '~') {
+
+				// This is original code
+#if 0
 				s++;
-				if (*s == ' ' && !spaces)
-					break;
+				while (*s != '~') {
+					s++;
+				}
+#else
+				// TODO(Miami): This is my code to prevent fuck up until InsertPlayerControlKeysInString is done 
+				if (*(s + 1) != '~') {
+					s++;
+					while (*s != '~') {
+						s++;
+					}
+				}
+#endif
+			} else {
+				w += GetCharacterSize(c - ' ');
 			}
-			w += GetCharacterSize(*s - ' ');
 		}
 	}
 	return w;
diff --git a/src/render/Font.h b/src/render/Font.h
index fba5125b..ef04ef28 100644
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -68,8 +68,8 @@ class CFont
 	static int16 Size[MAX_FONTS][193];
 #endif
 	static int16 NewLine;
-	static CSprite2d Sprite[MAX_FONTS];
 public:
+	static CSprite2d Sprite[MAX_FONTS];
 	static CFontDetails Details;
 
 	static void Initialise(void);
diff --git a/src/render/Glass.h b/src/render/Glass.h
index 51c5aae9..736e5205 100644
--- a/src/render/Glass.h
+++ b/src/render/Glass.h
@@ -1,6 +1,7 @@
 #pragma once
 
 class CEntity;
+class CVehicle;
 
 class CFallingGlassPane : public CMatrix
 {
@@ -49,4 +50,7 @@ public:
 	static void WindowRespondsToSoftCollision(CEntity *entity, float amount);
 	static void WasGlassHitByBullet(CEntity *entity, CVector point);
 	static void WindowRespondsToExplosion(CEntity *entity, CVector point);
+
+//TODO(MIAMI)
+	static void CarWindscreenShatters(CVehicle *vehicle, bool unk) {}
 };
\ No newline at end of file
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 8e8096a5..dc425a15 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -23,20 +23,22 @@
 
 // Game has colors inlined in code.
 // For easier modification we collect them here:
-CRGBA MONEY_COLOR(89, 115, 150, 255);
-CRGBA AMMO_COLOR(0, 0, 0, 255);
-CRGBA HEALTH_COLOR(186, 101, 50, 255);
-CRGBA ARMOUR_COLOR(124, 140, 95, 255);
-CRGBA WANTED_COLOR(193, 164, 120, 255);
-CRGBA ZONE_COLOR(152, 154, 82, 255);
-CRGBA VEHICLE_COLOR(194, 165, 120, 255);
-CRGBA CLOCK_COLOR(194, 165, 120, 255);
-CRGBA TIMER_COLOR(186, 101, 50, 255);
-CRGBA COUNTER_COLOR(0, 106, 164, 255);
+CRGBA MONEY_COLOR(0, 207, 133, 255);
+CRGBA AMMO_COLOR(255, 150, 225, 255);
+CRGBA HEALTH_COLOR(255, 150, 225, 255);
+CRGBA ARMOUR_COLOR(185, 185, 185, 255);
+CRGBA NOTWANTED_COLOR(27, 89, 130, 255);
+CRGBA WANTED_COLOR_FLASH(62, 141, 181, 255);
+CRGBA WANTED_COLOR(97, 194, 247, 255);
+CRGBA ZONE_COLOR(45, 155, 90, 255);
+CRGBA VEHICLE_COLOR(97, 194, 247, 255);
+CRGBA CLOCK_COLOR(97, 194, 247, 255);
+CRGBA TIMER_COLOR(97, 194, 247, 255);
+CRGBA COUNTER_COLOR(97, 194, 247, 255);
 CRGBA PAGER_COLOR(32, 162, 66, 205);
-CRGBA RADARDISC_COLOR(0, 0, 0, 255);
+CRGBA RADARDISC_COLOR(255, 255, 255, 255);
 CRGBA BIGMESSAGE_COLOR(85, 119, 133, 255);
-CRGBA WASTEDBUSTED_COLOR(170, 123, 87, 255);
+CRGBA WASTEDBUSTED_COLOR(255, 150, 225, 255);
 CRGBA ODDJOB_COLOR(89, 115, 150, 255);
 CRGBA ODDJOB2_COLOR(156, 91, 40, 255);
 CRGBA MISSIONTITLE_COLOR(220, 172, 2, 255);
@@ -86,6 +88,22 @@ float CHud::PagerXOffset;
 int16 CHud::PagerTimer;
 int16 CHud::PagerOn;
 
+uint32 CHud::m_WantedFadeTimer;
+uint32 CHud::m_WantedState;
+uint32 CHud::m_WantedTimer;
+uint32 CHud::m_EnergyLostFadeTimer;
+uint32 CHud::m_EnergyLostState;
+uint32 CHud::m_EnergyLostTimer;
+uint32 CHud::m_DisplayScoreFadeTimer;
+uint32 CHud::m_DisplayScoreState;
+uint32 CHud::m_DisplayScoreTimer;
+uint32 CHud::m_WeaponFadeTimer;
+uint32 CHud::m_WeaponState;
+uint32 CHud::m_WeaponTimer;
+
+uint32 CHud::m_LastDisplayScore;
+uint32 CHud::m_LastWanted;
+
 CSprite2d CHud::Sprites[NUM_HUD_SPRITES];
 
 struct
@@ -123,6 +141,10 @@ RwTexture *gpRocketSightTex;
 
 void CHud::Draw()
 {
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
+
 	// disable hud via second controller
 	if (CPad::GetPad(1)->GetStartJustDown())
 		m_Wants_To_Draw_Hud = !m_Wants_To_Draw_Hud;
@@ -134,22 +156,27 @@ void CHud::Draw()
 		bool DrawCrossHair = 0;
 		bool DrawCrossHairPC = 0;
 
-		int32 WeaponType = FindPlayerPed()->m_weapons[FindPlayerPed()->m_currentWeapon].m_eWeaponType;
+		CPlayerPed *playerPed = FindPlayerPed();
+		eWeaponType WeaponType = playerPed->GetWeapon()->m_eWeaponType;
 		int32 Mode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
 
-		if (Mode == CCam::MODE_SNIPER || Mode == CCam::MODE_ROCKETLAUNCHER || Mode == CCam::MODE_M16_1STPERSON || Mode == CCam::MODE_HELICANNON_1STPERSON)
-			DrawCrossHair = 1;
-		if (Mode == CCam::MODE_M16_1STPERSON_RUNABOUT || Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT || Mode == CCam::MODE_SNIPER_RUNABOUT)
-			DrawCrossHairPC = 1;
+		if ((Mode == CCam::MODE_SNIPER || Mode == CCam::MODE_ROCKETLAUNCHER || Mode == CCam::MODE_M16_1STPERSON || Mode == CCam::MODE_HELICANNON_1STPERSON || Mode == CCam::MODE_CAMERA)
+			&& playerPed && !playerPed->GetWeapon()->IsTypeMelee())
+			DrawCrossHair = true;
 
-		/*
-			Draw Crosshairs
-		*/
-		if (TheCamera.Cams[TheCamera.ActiveCam].Using3rdPersonMouseCam() &&
-		    (!CPad::GetPad(0)->GetLookBehindForPed() || TheCamera.m_bPlayerIsInGarage) || Mode == CCam::MODE_1STPERSON_RUNABOUT) {
-			if (FindPlayerPed() && !FindPlayerPed()->EnteringCar()) {
-				if ((WeaponType >= WEAPONTYPE_COLT45 && WeaponType <= WEAPONTYPE_M16) || WeaponType == WEAPONTYPE_FLAMETHROWER)
-					DrawCrossHairPC = 1;
+		if (Mode == CCam::MODE_M16_1STPERSON_RUNABOUT || Mode == CCam::MODE_ROCKETLAUNCHER_RUNABOUT || Mode == CCam::MODE_SNIPER_RUNABOUT)
+			DrawCrossHairPC = true;
+		if (TheCamera.Cams[TheCamera.ActiveCam].Using3rdPersonMouseCam() && (!CPad::GetPad(0)->GetLookBehindForPed() || TheCamera.m_bPlayerIsInGarage)
+			|| Mode == CCam::MODE_1STPERSON_RUNABOUT) {
+			if (playerPed) {
+				if (playerPed->m_nPedState != PED_ENTER_CAR && playerPed->m_nPedState != PED_CARJACK) {
+
+					if (WeaponType >= WEAPONTYPE_COLT45 && WeaponType <= WEAPONTYPE_RUGER
+						|| WeaponType == WEAPONTYPE_M60 || WeaponType == WEAPONTYPE_MINIGUN
+						|| WeaponType == WEAPONTYPE_FLAMETHROWER) {
+						DrawCrossHairPC = 1;
+					}
+				}
 			}
 		}
 
@@ -169,7 +196,7 @@ void CHud::Draw()
 #ifdef ASPECT_RATIO_SCALE
 				f3rdY -= SCREEN_SCALE_Y(2.0f);
 #endif
-				if (FindPlayerPed() && WeaponType == WEAPONTYPE_M16) {
+				if (playerPed && (WeaponType == WEAPONTYPE_M4 || WeaponType == WEAPONTYPE_RUGER || WeaponType == WEAPONTYPE_M60)) {
 					rect.left = f3rdX - SCREEN_SCALE_X(32.0f * 0.6f);
 					rect.top = f3rdY - SCREEN_SCALE_Y(32.0f  * 0.6f);
 					rect.right = f3rdX + SCREEN_SCALE_X(32.0f * 0.6f);
@@ -185,8 +212,7 @@ void CHud::Draw()
 
 					Sprites[HUD_SITEM16].Draw(CRect(rect), CRGBA(255, 255, 255, 255));
 				}
-			}
-			else {
+			} else {
 				if (Mode == CCam::MODE_M16_1STPERSON ||
 				    Mode == CCam::MODE_M16_1STPERSON_RUNABOUT ||
 				    Mode == CCam::MODE_HELICANNON_1STPERSON) {
@@ -213,8 +239,11 @@ void CHud::Draw()
 					RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpRocketSightTex));
 
 					CSprite::RenderOneXLUSprite(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, 1.0f, SCREEN_SCALE_X(40.0f), SCREEN_SCALE_Y(40.0f), (100.0f * fMultBright), (200.0f * fMultBright), (100.0f * fMultBright), 255, 1.0f, 255);
+					RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
 				}
 				else {
+
+					// TODO(Miami)
 					// Sniper
 					rect.left = (SCREEN_WIDTH / 2) - SCREEN_SCALE_X(210.0f);
 					rect.top = (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(210.0f);
@@ -241,9 +270,9 @@ void CHud::Draw()
 					Sprites[HUD_SITESNIPER].Draw(CRect(rect), CRGBA(255, 255, 255, 255));
 				}
 			}
-			RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void *)rwFILTERLINEAR);
 			RwRenderStateSet(rwRENDERSTATESRCBLEND, (void *)rwBLENDSRCALPHA);
 			RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDINVSRCALPHA);
+			RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
 		}
 		else {
 			SpriteBrightness = 0;
@@ -252,35 +281,49 @@ void CHud::Draw()
 		/*
 			DrawMoneyCounter
 		*/
+
 		wchar sPrint[16];
 		wchar sPrintIcon[16];
 		char sTemp[16];
+		float alpha;
 
-		sprintf(sTemp, "$%08d", CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);
-		AsciiToUnicode(sTemp, sPrint);
-
-		CFont::SetPropOff();
-		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
-		CFont::SetCentreOff();
-		CFont::SetRightJustifyOn();
-		CFont::SetRightJustifyWrap(0.0f);
-		CFont::SetBackGroundOnlyTextOff();
-		CFont::SetFontStyle(FONT_HEADING);
-		CFont::SetPropOff();
-		CFont::SetColor(CRGBA(0, 0, 0, 255));
+		if (m_LastDisplayScore == CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney) {
+			alpha = CHud::DrawFadeState(HUD_SCORE_FADING, 0);
+		} else {
+			alpha = CHud::DrawFadeState(HUD_SCORE_FADING, 1);
+			m_LastDisplayScore = CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney;
+		}
+		if (m_DisplayScoreState != FADED_OUT) {
+			sprintf(sTemp, "$%08d", CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);
+			AsciiToUnicode(sTemp, sPrint);
 
-		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f - 2.0f), SCREEN_SCALE_Y(43.0f + 2.0f), sPrint);
+			CFont::SetPropOff();
+			CFont::SetBackgroundOff();
+			CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
+			CFont::SetCentreOff();
+			CFont::SetRightJustifyOn();
+			CFont::SetRightJustifyWrap(0.0f);
+			CFont::SetBackGroundOnlyTextOff();
+			CFont::SetFontStyle(FONT_HEADING);
+			CFont::SetPropOff();
+			CFont::SetDropShadowPosition(2);
+			CFont::SetDropColor(CRGBA(0, 0, 0, alpha));
+			MONEY_COLOR.a = alpha;
+			CFont::SetColor(MONEY_COLOR);
 
-		CFont::SetColor(MONEY_COLOR);
-		CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f), SCREEN_SCALE_Y(43.0f), sPrint);
+			if (FrontEndMenuManager.m_PrefsShowHud) {
+				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f), SCREEN_SCALE_Y(43.0f), sPrint);
+			}
+		}
 
 		/*
 			DrawAmmo
 		*/
-		uint32 AmmoAmount = CWeaponInfo::GetWeaponInfo(FindPlayerPed()->GetWeapon()->m_eWeaponType)->m_nAmountofAmmunition;
-		uint32 AmmoInClip = FindPlayerPed()->m_weapons[FindPlayerPed()->m_currentWeapon].m_nAmmoInClip;
-		uint32 TotalAmmo = FindPlayerPed()->m_weapons[FindPlayerPed()->m_currentWeapon].m_nAmmoTotal;
+		CWeaponInfo *weaponInfo = CWeaponInfo::GetWeaponInfo((eWeaponType)WeaponType);
+		CWeapon *weapon = playerPed->GetWeapon();
+		uint32 AmmoAmount = weaponInfo->m_nAmountofAmmunition;
+		uint32 AmmoInClip = weapon->m_nAmmoInClip;
+		uint32 TotalAmmo = weapon->m_nAmmoTotal;
 		uint32 Ammo, Clip;
 
 		if (AmmoAmount <= 1 || AmmoAmount >= 1000)
@@ -311,36 +354,59 @@ void CHud::Draw()
 		/*
 			DrawWeaponIcon
 		*/
-		Sprites[WeaponType].Draw(
-			CRect(SCREEN_SCALE_FROM_RIGHT(99.0f), SCREEN_SCALE_Y(27.0f), SCREEN_SCALE_FROM_RIGHT(35.0f), SCREEN_SCALE_Y(91.0f)),
-			CRGBA(255, 255, 255, 255),
-			0.015f,
-			0.015f,
-			1.0f,
-			0.0f,
-			0.015f,
-			1.0f,
-			1.0f,
-			1.0f);
+
+		if (weaponInfo->m_nModelId <= 0) {
+			Sprites[WeaponType].Draw(
+				CRect(SCREEN_SCALE_FROM_RIGHT(99.0f), SCREEN_SCALE_Y(27.0f), SCREEN_SCALE_FROM_RIGHT(35.0f), SCREEN_SCALE_Y(91.0f)),
+				CRGBA(255, 255, 255, 255),
+				0.015f,
+				0.015f,
+				1.0f,
+				0.0f,
+				0.015f,
+				1.0f,
+				1.0f,
+				1.0f);
+		} else {
+			CBaseModelInfo *weaponModel = CModelInfo::GetModelInfo(weaponInfo->m_nModelId);
+			RwTexDictionary *weaponTxd = CTxdStore::GetSlot(weaponModel->GetTxdSlot())->texDict;
+			if (weaponTxd) {
+				RwTexture *weaponIcon = RwTexDictionaryFindNamedTexture(weaponTxd, weaponModel->GetName());
+				if (weaponIcon) {
+					RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+					RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+					RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(weaponIcon));
+					const float xSize = SCREEN_SCALE_X(64.0f / 2.0f);
+					const float ySize = SCREEN_SCALE_X(64.0f / 2.0f);
+					CSprite::RenderOneXLUSprite(SCREEN_SCALE_FROM_RIGHT(99.0f) + xSize, SCREEN_SCALE_Y(25.0f) + ySize, 1.0f, xSize, ySize,
+						255, 255, 255, 255, 1.0f, 255);
+					RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
+				}
+			}
+		}
 
 		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(0.4f), SCREEN_SCALE_Y(0.6f));
+		CFont::SetScale(SCREEN_SCALE_X(0.5f), SCREEN_SCALE_Y(0.8f));
 		CFont::SetJustifyOff();
 		CFont::SetCentreOn();
 		CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
 		CFont::SetPropOn();
+		CFont::SetDropShadowPosition(0);
 		CFont::SetFontStyle(FONT_STANDARD);
 
-		if (!CDarkel::FrenzyOnGoing() && WeaponType != WEAPONTYPE_UNARMED && WeaponType != WEAPONTYPE_BASEBALLBAT) {
+		if (Min(9999, TotalAmmo - AmmoInClip) != 9999 && !CDarkel::FrenzyOnGoing() && weaponInfo->m_nWeaponSlot > 1 && weapon->m_eWeaponType != WEAPONTYPE_DETONATOR) {
+			CFont::SetDropShadowPosition(2);
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 			CFont::SetColor(AMMO_COLOR);
-			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(66.0f), SCREEN_SCALE_Y(73.0f), sPrint);
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(66.0f), SCREEN_SCALE_Y(90.0f), sPrint);
+			CFont::SetDropShadowPosition(0);
 		}
 
 		/*
 			DrawHealth
 		*/
 		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+		CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 		CFont::SetJustifyOff();
 		CFont::SetCentreOff();
 		CFont::SetRightJustifyWrap(0.0f);
@@ -350,16 +416,16 @@ void CHud::Draw()
 
 		if (m_ItemToFlash == ITEM_HEALTH && CTimer::GetFrameCounter() & 8
 			|| m_ItemToFlash != ITEM_HEALTH
-			|| FindPlayerPed()->m_fHealth < 10
+			|| playerPed->m_fHealth < 10
 			&& CTimer::GetFrameCounter() & 8) {
-			if (FindPlayerPed()->m_fHealth >= 10
-				|| FindPlayerPed()->m_fHealth < 10 && CTimer::GetFrameCounter() & 8) {
+			if (playerPed->m_fHealth >= 10
+				|| playerPed->m_fHealth < 10 && CTimer::GetFrameCounter() & 8) {
 
 				AsciiToUnicode("{", sPrintIcon);
 #ifdef FIX_BUGS
-				sprintf(sTemp, "%03d", int32(FindPlayerPed()->m_fHealth + 0.5f));
+				sprintf(sTemp, "%03d", int32(playerPed->m_fHealth + 0.5f));
 #else
-				sprintf(sTemp, "%03d", (int32)FindPlayerPed()->m_fHealth);
+				sprintf(sTemp, "%03d", (int32)playerPed->m_fHealth);
 #endif
 				AsciiToUnicode(sTemp, sPrint);
 
@@ -383,13 +449,13 @@ void CHud::Draw()
 			DrawArmour
 		*/
 		if (m_ItemToFlash == ITEM_ARMOUR && CTimer::GetFrameCounter() & 8 || m_ItemToFlash != ITEM_ARMOUR) {
-			CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
-			if (FindPlayerPed()->m_fArmour > 1.0f) {
+			CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
+			if (playerPed->m_fArmour > 1.0f) {
 				AsciiToUnicode("[", sPrintIcon);
 #ifdef FIX_BUGS
-				sprintf(sTemp, "%03d", int32(FindPlayerPed()->m_fArmour + 0.5f));
+				sprintf(sTemp, "%03d", int32(playerPed->m_fArmour + 0.5f));
 #else
-				sprintf(sTemp, "%03d", (int32)FindPlayerPed()->m_fArmour);
+				sprintf(sTemp, "%03d", (int32)playerPed->m_fArmour);
 #endif
 				AsciiToUnicode(sTemp, sPrint);
 
@@ -413,26 +479,46 @@ void CHud::Draw()
 		/*
 			DrawWantedLevel
 		*/
-		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
-		CFont::SetJustifyOff();
-		CFont::SetCentreOff();
-		CFont::SetRightJustifyOff();
-		CFont::SetPropOn();
-		CFont::SetFontStyle(FONT_HEADING);
-
-		AsciiToUnicode("]", sPrintIcon);
-
-		for (int i = 0; i < 6; i++) {
-			CFont::SetColor(CRGBA(0, 0, 0, 255));
-			CFont::PrintString(2.0f + SCREEN_SCALE_FROM_RIGHT(60.0f - 2.0f + 24.0f * i), SCREEN_SCALE_Y(87.0f + 2.0f), sPrintIcon);
-			if (FindPlayerPed()->m_pWanted->m_nWantedLevel > i
-				&& (CTimer::GetTimeInMilliseconds() > FindPlayerPed()->m_pWanted->m_nLastWantedLevelChange
-					+ 2000 || CTimer::GetFrameCounter() & 4)) {
+		if (m_LastWanted == playerPed->m_pWanted->m_nWantedLevel)
+			alpha = CHud::DrawFadeState(HUD_WANTED_FADING, 0);
+		else {
+			alpha = CHud::DrawFadeState(HUD_WANTED_FADING, 1);
+			m_LastWanted = playerPed->m_pWanted->m_nWantedLevel;
+		}
 
-				CFont::SetColor(WANTED_COLOR);
-				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(60.0f + 24.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+		if (m_WantedState != FADED_OUT) {
+			CFont::SetBackgroundOff();
+			CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
+			CFont::SetJustifyOff();
+			CFont::SetCentreOff();
+			CFont::SetRightJustifyOn();
+			CFont::SetPropOn();
+			CFont::SetFontStyle(FONT_HEADING);
+			CFont::SetDropShadowPosition(2); // TODO(Miami): Remove that, VC keeps that open above
+			CFont::SetDropColor(CRGBA(0,0,0,alpha)); // TODO(Miami): Remove that, VC keeps that open above
+
+			AsciiToUnicode("]", sPrintIcon);
+
+			for (int i = 0; i < 6; i++) {
+				if (FrontEndMenuManager.m_PrefsShowHud) {
+					if (playerPed->m_pWanted->m_nWantedLevel > i
+						&& (CTimer::GetTimeInMilliseconds() > playerPed->m_pWanted->m_nLastWantedLevelChange
+							+ 2000 || CTimer::GetFrameCounter() & 4)) {
+
+						WANTED_COLOR.a = alpha;
+						CFont::SetColor(WANTED_COLOR);
+						CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+
+						// TODO(Miami): There is one more condition in here
+					} else if (playerPed->m_pWanted->m_nWantedLevel <= i) {
+						NOTWANTED_COLOR.a = alpha;
+						CFont::SetColor(NOTWANTED_COLOR);
+						CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+					}
+				}
 			}
+
+			CFont::SetDropShadowPosition(0); // TODO(Miami): Remove that, VC keeps that open
 		}
 
 		/*
@@ -517,15 +603,20 @@ void CHud::Draw()
 					else
 						CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.2f));
 
+					CFont::SetSlantRefPoint(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f));
+					CFont::SetSlant(0.15f);
+
 					CFont::SetRightJustifyOn();
 					CFont::SetRightJustifyWrap(0.0f);
 					CFont::SetBackGroundOnlyTextOff();
 					CFont::SetFontStyle(FONT_STANDARD);
 					CFont::SetColor(CRGBA(0, 0, 0, fZoneAlpha));
-					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(30.0f) + SCREEN_SCALE_Y(1.0f), m_ZoneToPrint);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f) + SCREEN_SCALE_Y(1.0f), m_ZoneToPrint);
 
 					CFont::SetColor(CRGBA(ZONE_COLOR.r, ZONE_COLOR.g, ZONE_COLOR.b, fZoneAlpha));
-					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(30.0f), m_ZoneToPrint);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(128.0f), m_ZoneToPrint);
+
+					CFont::SetSlant(0.f);
 				}
 			}
 		}
@@ -611,15 +702,20 @@ void CHud::Draw()
 					else
 						CFont::SetScale(SCREEN_SCALE_X(1.2f * 0.85f), SCREEN_SCALE_Y(1.2f));
 
+					CFont::SetSlantRefPoint(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(105.0f));
+					CFont::SetSlant(0.15f);
+
 					CFont::SetRightJustifyOn();
 					CFont::SetRightJustifyWrap(0.0f);
 					CFont::SetBackGroundOnlyTextOff();
 					CFont::SetFontStyle(FONT_STANDARD);
 					CFont::SetColor(CRGBA(0, 0, 0, fVehicleAlpha));
-					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(55.0f) + SCREEN_SCALE_Y(1.0f), m_pVehicleNameToPrint);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f) + SCREEN_SCALE_X(1.0f), SCREEN_SCALE_FROM_BOTTOM(105.f) + SCREEN_SCALE_Y(1.0f), m_pVehicleNameToPrint);
 
 					CFont::SetColor(CRGBA(VEHICLE_COLOR.r, VEHICLE_COLOR.g, VEHICLE_COLOR.b, fVehicleAlpha));
-					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(55.0f), m_pVehicleNameToPrint);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(32.0f), SCREEN_SCALE_FROM_BOTTOM(105.0f), m_pVehicleNameToPrint);
+
+					CFont::SetSlant(0.f);
 				}
 			}
 		}
@@ -636,7 +732,7 @@ void CHud::Draw()
 		CFont::SetJustifyOff();
 		CFont::SetCentreOff();
 		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+		CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 		CFont::SetBackGroundOnlyTextOff();
 		CFont::SetPropOff();
 		CFont::SetFontStyle(FONT_HEADING);
@@ -685,7 +781,7 @@ void CHud::Draw()
 					AsciiToUnicode(CUserDisplay::OnscnTimer.m_sEntries[0].m_bTimerBuffer, sTimer);
 					CFont::SetPropOn();
 					CFont::SetBackgroundOff();
-					CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+					CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 					CFont::SetRightJustifyOn();
 					CFont::SetRightJustifyWrap(0.0f);
 					CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
@@ -693,7 +789,7 @@ void CHud::Draw()
 					CFont::SetBackGroundOnlyTextOn();
 					CFont::SetColor(CRGBA(0, 0, 0, 255));
 					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(110.0f) + SCREEN_SCALE_Y(2.0f), sTimer);
-					CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+					CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 					CFont::SetColor(TIMER_COLOR);
 					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET), SCREEN_SCALE_Y(110.0f), sTimer);
 
@@ -725,7 +821,7 @@ void CHud::Draw()
 						CFont::SetPropOn();
 
 						CFont::SetBackgroundOff();
-						CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+						CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 						CFont::SetCentreOff();
 						CFont::SetRightJustifyOn();
 						CFont::SetRightJustifyWrap(0.0f);
@@ -751,7 +847,7 @@ void CHud::Draw()
 
 					if (CUserDisplay::OnscnTimer.m_sEntries[0].m_aCounterText[0]) {
 						CFont::SetPropOn();
-						CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+						CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
 						CFont::SetColor(CRGBA(0, 0, 0, 255));
 						CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(TIMER_RIGHT_OFFSET) - SCREEN_SCALE_X(61.0f) + SCREEN_SCALE_Y(2.0f), SCREEN_SCALE_Y(132.0f) + SCREEN_SCALE_Y(2.0f), TheText.Get(CUserDisplay::OnscnTimer.m_sEntries[0].m_aCounterText));
 
@@ -823,7 +919,11 @@ void CHud::Draw()
 #else
 			rect.Translate(RADAR_LEFT, SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT));
 #endif
-			rect.Grow(4.0f);
+
+			rect.Grow(6.0f);
+			rect.Translate(0.0f, 2.0f);
+			Sprites[HUD_RADARDISC].Draw(rect, CRGBA(0, 0, 0, 255));
+			rect.Translate(0.0f, -2.0f);
 			Sprites[HUD_RADARDISC].Draw(rect, RADARDISC_COLOR);
 			CRadar::DrawBlips();
 		}
@@ -1044,7 +1144,7 @@ void CHud::DrawAfterFade()
 				m_fHelpMessageTime = CMessages::GetWideStringLength(m_HelpMessage) * 0.05f + 3.0f;
 
 				if (TheCamera.m_ScreenReductionPercentage == 0.0f)
-					DMAudio.PlayFrontEndSound(SOUND_HUD, 0);
+					DMAudio.PlayFrontEndSound(SOUND_HUD_SOUND, 0);
 				break;
 			case 1:
 			case 2:
@@ -1380,6 +1480,30 @@ void CHud::GetRidOfAllHudMessages()
 	}
 }
 
+#ifdef RELOADABLES
+void CHud::ReloadTXD()
+{
+	for (int i = 0; i < NUM_HUD_SPRITES; ++i) {
+		Sprites[i].Delete();
+	}
+
+	int HudTXD = CTxdStore::FindTxdSlot("hud");
+	CTxdStore::RemoveTxdSlot(HudTXD);
+
+	debug("Reloading HUD.TXD...\n");
+
+	HudTXD = CTxdStore::AddTxdSlot("hud");
+	CTxdStore::LoadTxd(HudTXD, "MODELS/HUD.TXD");
+	CTxdStore::AddRef(HudTXD);
+	CTxdStore::PopCurrentTxd();
+	CTxdStore::SetCurrentTxd(HudTXD);
+
+	for (int i = 0; i < NUM_HUD_SPRITES; i++) {
+		Sprites[i].SetTexture(WeaponFilenames[i].name, WeaponFilenames[i].mask);
+	}
+}
+#endif
+
 void CHud::Initialise()
 {
 	m_Wants_To_Draw_Hud = true;
@@ -1417,6 +1541,29 @@ void CHud::Initialise()
 	PagerSoundPlayed = 0;
 	PagerXOffset = 150.0f;
 
+#ifdef HUD_AUTO_FADE
+	m_EnergyLostState = START_FADE_OUT;
+	m_WantedState = START_FADE_OUT;
+	m_DisplayScoreState = START_FADE_OUT;
+	m_WeaponState = START_FADE_OUT;
+#else
+	m_EnergyLostState = FADE_DISABLED;
+	m_WantedState = FADE_DISABLED;
+	m_DisplayScoreState = FADE_DISABLED;
+	m_WeaponState = FADE_DISABLED;
+#endif
+	m_WantedFadeTimer = 0;
+	m_WantedTimer = 0;
+	m_EnergyLostFadeTimer = 0;
+	m_EnergyLostTimer = 0;
+	m_DisplayScoreFadeTimer = 0;
+	m_DisplayScoreTimer = 0;
+	m_WeaponFadeTimer = 0;
+	m_WeaponTimer = 0;
+
+	m_LastDisplayScore = CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney;
+	m_LastWanted = 0;
+
 	CTxdStore::PopCurrentTxd();
 }
 
@@ -1440,6 +1587,29 @@ void CHud::ReInitialise() {
 	PagerTimer = 0;
 	PagerSoundPlayed = 0;
 	PagerXOffset = 150.0f;
+
+#ifdef HUD_AUTO_FADE
+	m_EnergyLostState = START_FADE_OUT;
+	m_WantedState = START_FADE_OUT;
+	m_DisplayScoreState = START_FADE_OUT;
+	m_WeaponState = START_FADE_OUT;
+#else
+	m_EnergyLostState = FADE_DISABLED;
+	m_WantedState = FADE_DISABLED;
+	m_DisplayScoreState = FADE_DISABLED;
+	m_WeaponState = FADE_DISABLED;
+#endif
+	m_WantedFadeTimer = 0;
+	m_WantedTimer = 0;
+	m_EnergyLostFadeTimer = 0;
+	m_EnergyLostTimer = 0;
+	m_DisplayScoreFadeTimer = 0;
+	m_DisplayScoreTimer = 0;
+	m_WeaponFadeTimer = 0;
+	m_WeaponTimer = 0;
+
+	m_LastDisplayScore = CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney;
+	m_LastWanted = 0;
 }
 
 wchar LastBigMessage[6][128];
@@ -1536,3 +1706,106 @@ void CHud::Shutdown()
 	int HudTXD = CTxdStore::FindTxdSlot("hud");
 	CTxdStore::RemoveTxdSlot(HudTXD);
 }
+
+float CHud::DrawFadeState(DRAW_FADE_STATE fadingElement, int forceFadingIn)
+{
+	float alpha = 255.0f;
+	uint32 operation, timer;
+	int32 fadeTimer;
+
+	switch (fadingElement) {
+		case HUD_WANTED_FADING:
+			fadeTimer = m_WantedFadeTimer;
+			operation = m_WantedState;
+			timer = m_WantedTimer;
+			break;
+		case HUD_ENERGY_FADING:
+			fadeTimer = m_EnergyLostFadeTimer;
+			operation = m_EnergyLostState;
+			timer = m_EnergyLostTimer;
+			break;
+		case HUD_SCORE_FADING:
+			fadeTimer = m_DisplayScoreFadeTimer;
+			operation = m_DisplayScoreState;
+			timer = m_DisplayScoreTimer;
+			break;
+		case HUD_WEAPON_FADING:
+			fadeTimer = m_WeaponFadeTimer;
+			operation = m_WeaponState;
+			timer = m_WeaponTimer;
+			break;
+		default:
+			break;
+	}
+	if (forceFadingIn) {
+		switch (operation) {
+			case FADED_OUT:
+				fadeTimer = 0;
+			case START_FADE_OUT:
+			case FADING_OUT:
+				timer = 5;
+				operation = FADING_IN;
+				break;
+			default:
+				break;
+		}
+	}
+	if (operation != FADED_OUT && operation != FADE_DISABLED) {
+		switch (operation) {
+			case START_FADE_OUT:
+				fadeTimer = 1000;
+				alpha = 255.0f;
+				if (timer > 10000) {
+					fadeTimer = 3000;
+					operation = FADING_OUT;
+				}
+				break;
+			case FADING_IN:
+				fadeTimer += CTimer::GetTimeStepInMilliseconds();
+				if (fadeTimer > 1000.0f) {
+					operation = START_FADE_OUT;
+					fadeTimer = 1000;
+				}
+				alpha = fadeTimer / 1000.0f * 255.0f;
+				break;
+			case FADING_OUT:
+				fadeTimer -= CTimer::GetTimeStepInMilliseconds();
+				if (fadeTimer < 0.0f) {
+					fadeTimer = 0;
+					operation = FADED_OUT;
+				}
+				alpha = fadeTimer / 1000.0f * 255.0f;
+				break;
+			default:
+				break;
+		}
+		timer += CTimer::GetTimeStepInMilliseconds();
+	}
+
+	switch (fadingElement) {
+		case HUD_WANTED_FADING:
+			m_WantedFadeTimer = fadeTimer;
+			m_WantedState = operation;
+			m_WantedTimer = timer;
+			break;
+		case HUD_ENERGY_FADING:
+			m_EnergyLostFadeTimer = fadeTimer;
+			m_EnergyLostState = operation;
+			m_EnergyLostTimer = timer;
+			break;
+		case HUD_SCORE_FADING:
+			m_DisplayScoreFadeTimer = fadeTimer;
+			m_DisplayScoreState = operation;
+			m_DisplayScoreTimer = timer;
+			break;
+		case HUD_WEAPON_FADING:
+			m_WeaponFadeTimer = fadeTimer;
+			m_WeaponState = operation;
+			m_WeaponTimer = timer;
+			break;
+		default:
+			break;
+	}
+
+	return clamp(alpha, 0.0f, 255.0f);
+}
diff --git a/src/render/Hud.h b/src/render/Hud.h
index 701e47e2..db92e32c 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -9,6 +9,25 @@ enum eItems
 	ITEM_RADAR = 8
 };
 
+// Thanks for vague name, R*
+enum DRAW_FADE_STATE
+{
+	HUD_WANTED_FADING = 0,
+	HUD_ENERGY_FADING,
+	HUD_SCORE_FADING,
+	HUD_WEAPON_FADING,
+};
+
+// My name
+enum eFadeOperation
+{
+	FADED_OUT = 0,
+	START_FADE_OUT,
+	FADING_IN,
+	FADING_OUT,
+	FADE_DISABLED = 5,
+};
+
 enum eSprites 
 {
 	HUD_FIST,
@@ -32,6 +51,10 @@ enum eSprites
 	NUM_HUD_SPRITES,
 };
 
+// TODO(Miami): Make those 0.7f - 1.25f once fonts have been ported
+#define HUD_TEXT_SCALE_X 0.8f
+#define HUD_TEXT_SCALE_Y 1.35f
+
 class CHud
 {
 public:
@@ -82,10 +105,29 @@ public:
 	static int16 PagerTimer;
 	static int16 PagerOn;
 
+	static uint32 m_WantedFadeTimer;
+	static uint32 m_WantedState;
+	static uint32 m_WantedTimer;
+	static uint32 m_EnergyLostFadeTimer;
+	static uint32 m_EnergyLostState;
+	static uint32 m_EnergyLostTimer;
+	static uint32 m_DisplayScoreFadeTimer;
+	static uint32 m_DisplayScoreState;
+	static uint32 m_DisplayScoreTimer;
+	static uint32 m_WeaponFadeTimer;
+	static uint32 m_WeaponState;
+	static uint32 m_WeaponTimer;
+
+	static uint32 m_LastDisplayScore;
+	static uint32 m_LastWanted;
+
 public:
 	static void Draw();
 	static void DrawAfterFade();
 	static void GetRidOfAllHudMessages();
+#ifdef RELOADABLES
+	static void ReloadTXD();
+#endif
 	static void Initialise();
 	static void ReInitialise();
 	static void SetBigMessage(wchar *message, int16 style);
@@ -95,4 +137,5 @@ public:
 	static void SetVehicleName(wchar *name);
 	static void SetZoneName(wchar *name);
 	static void Shutdown();
+	static float DrawFadeState(DRAW_FADE_STATE, int);
 };
diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index 68ec1194..9934ae18 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -3,14 +3,17 @@
 #include "RwHelper.h"
 #include "Camera.h"
 #include "MBlur.h"
+#include "Timer.h"
 
 // Originally taken from RW example 'mblur'
 
 RwRaster *CMBlur::pFrontBuffer;
 bool CMBlur::ms_bJustInitialised;
 bool CMBlur::BlurOn;
+float CMBlur::Drunkness;
 
 static RwIm2DVertex Vertex[4];
+static RwIm2DVertex Vertex2[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
 
 void
@@ -103,29 +106,62 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
 	RwIm2DVertexSetV(&Vertex[3], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
 	RwIm2DVertexSetIntRGBA(&Vertex[3], 255, 255, 255, 255);
 
+
+	RwIm2DVertexSetScreenX(&Vertex2[0], zero);
+	RwIm2DVertexSetScreenY(&Vertex2[0], zero);
+	RwIm2DVertexSetScreenZ(&Vertex2[0], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetCameraZ(&Vertex2[0], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&Vertex2[0], 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetU(&Vertex2[0], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetV(&Vertex2[0], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetIntRGBA(&Vertex2[0], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX(&Vertex2[1], zero);
+	RwIm2DVertexSetScreenY(&Vertex2[1], ymax);
+	RwIm2DVertexSetScreenZ(&Vertex2[1], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetCameraZ(&Vertex2[1], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&Vertex2[1], 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetU(&Vertex2[1], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetV(&Vertex2[1], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetIntRGBA(&Vertex2[1], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX(&Vertex2[2], xmax);
+	RwIm2DVertexSetScreenY(&Vertex2[2], ymax);
+	RwIm2DVertexSetScreenZ(&Vertex2[2], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetCameraZ(&Vertex2[2], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&Vertex2[2], 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetU(&Vertex2[2], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetV(&Vertex2[2], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetIntRGBA(&Vertex2[2], 255, 255, 255, 255);
+
+	RwIm2DVertexSetScreenX(&Vertex2[3], xmax);
+	RwIm2DVertexSetScreenY(&Vertex2[3], zero);
+	RwIm2DVertexSetScreenZ(&Vertex2[3], RwIm2DGetNearScreenZ());
+	RwIm2DVertexSetCameraZ(&Vertex2[3], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&Vertex2[3], 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetU(&Vertex2[3], 1.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetV(&Vertex2[3], 0.0f, 1.0f/RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetIntRGBA(&Vertex2[3], 255, 255, 255, 255);
+
 }
 
 void
-CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha)
+CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type)
 {
 	RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
+	if(ms_bJustInitialised)
+		ms_bJustInitialised = false;
+	else
+		OverlayRender(cam, pFrontBuffer, color, type);
 	if(BlurOn){
-		if(pFrontBuffer){
-			if(ms_bJustInitialised)
-				ms_bJustInitialised = false;
-			else
-				OverlayRender(cam, pFrontBuffer, color, type, addalpha);
-		}
 		RwRasterPushContext(pFrontBuffer);
 		RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
 		RwRasterPopContext();
-	}else{
-		OverlayRender(cam, nil, color, type, addalpha);
 	}
 }
 
 void
-CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 addalpha)
+CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type)
 {
 	int r, g, b, a;
 
@@ -170,41 +206,75 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 	}
 
 	if(!BlurOn){
-		r *= 0.6f;
-		g *= 0.6f;
-		b *= 0.6f;
-		if(type != 1)
-			a *= 0.6f;
-		// game clamps to 255 here, but why?
+		// gta clamps these to 255 (probably a macro or inlined function)
+		int ovR = r * 0.6f;
+		int ovG = g * 0.6f;
+		int ovB = b * 0.6f;
+		int ovA = type == MBLUR_SNIPER ? a : a*0.6f;
+		RwIm2DVertexSetIntRGBA(&Vertex[0], ovR, ovG, ovB, ovA);
+		RwIm2DVertexSetIntRGBA(&Vertex[1], ovR, ovG, ovB, ovA);
+		RwIm2DVertexSetIntRGBA(&Vertex[2], ovR, ovG, ovB, ovA);
+		RwIm2DVertexSetIntRGBA(&Vertex[3], ovR, ovG, ovB, ovA);
+	}else{
+		RwIm2DVertexSetIntRGBA(&Vertex2[0], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex[0], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex2[1], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex[1], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex2[2], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex[2], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex2[3], r, g, b, a);
+		RwIm2DVertexSetIntRGBA(&Vertex[3], r, g, b, a);
 	}
-	RwIm2DVertexSetIntRGBA(&Vertex[0], r, g, b, a);
-	RwIm2DVertexSetIntRGBA(&Vertex[1], r, g, b, a);
-	RwIm2DVertexSetIntRGBA(&Vertex[2], r, g, b, a);
-	RwIm2DVertexSetIntRGBA(&Vertex[3], r, g, b, a);
 
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
 
-	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, BlurOn ? raster : nil);
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, raster);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
-
-	a = addalpha/2;
-	if(a < 30)
-		a = 30;
-
-	if(BlurOn && a != 0){	// the second condition should always be true
-		RwIm2DVertexSetIntRGBA(&Vertex[0], 255, 255, 255, a);
-		RwIm2DVertexSetIntRGBA(&Vertex[1], 255, 255, 255, a);
-		RwIm2DVertexSetIntRGBA(&Vertex[2], 255, 255, 255, a);
-		RwIm2DVertexSetIntRGBA(&Vertex[3], 255, 255, 255, a);
-		RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+
+	if(BlurOn){
+		if(type == MBLUR_SNIPER){
+			RwIm2DVertexSetIntRGBA(&Vertex2[0], r, g, b, 80);
+			RwIm2DVertexSetIntRGBA(&Vertex2[1], r, g, b, 80);
+			RwIm2DVertexSetIntRGBA(&Vertex2[2], r, g, b, 80);
+			RwIm2DVertexSetIntRGBA(&Vertex2[3], r, g, b, 80);
+			RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+			RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+			// TODO(MIAMI): pBufVertCount = 0;
+		}else{
+			RwIm2DVertexSetIntRGBA(&Vertex2[0], r*2, g*2, b*2, 30);
+			RwIm2DVertexSetIntRGBA(&Vertex2[1], r*2, g*2, b*2, 30);
+			RwIm2DVertexSetIntRGBA(&Vertex2[2], r*2, g*2, b*2, 30);
+			RwIm2DVertexSetIntRGBA(&Vertex2[3], r*2, g*2, b*2, 30);
+			RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+			RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+
+			RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex2, 4, Index, 6);
+
+			RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
+			RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+
+			RwIm2DVertexSetIntRGBA(&Vertex2[0], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex[0], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex2[1], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex[1], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex2[2], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex[2], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex2[3], r, g, b, a);
+			RwIm2DVertexSetIntRGBA(&Vertex[3], r, g, b, a);
+			RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
+			RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex2, 4, Index, 6);
+		}
 	}
 
+	// TODO(MIAMI): drunkness
+
+	// TODO(MIAMI): OverlayRenderFx
+
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
@@ -213,3 +283,10 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
 }
+
+void
+CMBlur::ClearDrunkBlur()
+{
+	Drunkness = 0.0f;
+	CTimer::SetTimeScale(1.0f);
+}
\ No newline at end of file
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index e8a5bef8..5eac8dc0 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -1,16 +1,32 @@
 #pragma once
 
+enum FxType
+{
+	FXTYPE_0 = 0,
+	FXTYPE_1,
+	FXTYPE_2,
+	FXTYPE_3,
+	FXTYPE_4,
+	FXTYPE_5,
+};
+
 class CMBlur
 {
 public:
 	static RwRaster *pFrontBuffer;
 	static bool ms_bJustInitialised;
 	static bool BlurOn;
+	static float Drunkness;
 
 public:
 	static void MotionBlurOpen(RwCamera *cam);
 	static void MotionBlurClose(void);
 	static void CreateImmediateModeData(RwCamera *cam, RwRect *rect);
-	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 addalpha);
-	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, uint32 bluralpha);
+	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type);
+	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type);
+	static void ClearDrunkBlur();
+	
+	//TODO
+	static void AddRenderFx(RwCamera *,RwRect *,float,FxType)
+	{}
 };
diff --git a/src/render/Occlusion.cpp b/src/render/Occlusion.cpp
new file mode 100644
index 00000000..1c4e4266
--- /dev/null
+++ b/src/render/Occlusion.cpp
@@ -0,0 +1,44 @@
+#include "common.h"
+
+#include "Occlusion.h"
+
+int32 COcclusion::NumOccludersOnMap;
+int16 COcclusion::FarAwayList;
+int16 COcclusion::NearbyList;
+int16 COcclusion::ListWalkThroughFA;
+int16 COcclusion::PreviousListWalkThroughFA;
+COccluder COcclusion::aOccluders[NUMOCCLUSIONVOLUMES];
+
+void
+COcclusion::Init(void)
+{
+	NumOccludersOnMap = 0;
+	FarAwayList = -1;
+	NearbyList = -1;
+	ListWalkThroughFA = -1;
+	PreviousListWalkThroughFA = -1;
+}
+
+void
+COcclusion::AddOne(float x, float y, float z, float width, float length, float height, float angle)
+{
+	if(NumOccludersOnMap >= NUMOCCLUSIONVOLUMES)
+		return;
+
+	aOccluders[NumOccludersOnMap].x = x;
+	aOccluders[NumOccludersOnMap].y = y;
+	aOccluders[NumOccludersOnMap].z = z;
+	aOccluders[NumOccludersOnMap].width = width;
+	aOccluders[NumOccludersOnMap].length = length;
+	aOccluders[NumOccludersOnMap].height = height;
+	while(angle < 0.0f) angle += 360.0f;
+	while(angle > 360.0f) angle -= 360.0f;
+	aOccluders[NumOccludersOnMap].angle = angle * UINT16_MAX/360.0f;
+	aOccluders[NumOccludersOnMap].listIndex = FarAwayList;
+	FarAwayList = NumOccludersOnMap++;
+}
+
+void
+COcclusion::ProcessBeforeRendering(void)
+{
+}
diff --git a/src/render/Occlusion.h b/src/render/Occlusion.h
new file mode 100644
index 00000000..0d3e26e9
--- /dev/null
+++ b/src/render/Occlusion.h
@@ -0,0 +1,29 @@
+#pragma once
+
+class COccluder
+{
+public:
+	int16 width, length, height;
+	int16 x, y, z;
+	uint16 angle;
+	int16 listIndex;
+};
+
+class COcclusion
+{
+public:
+	static int32 NumOccludersOnMap;
+	static int16 FarAwayList;
+	static int16 NearbyList;
+	static int16 ListWalkThroughFA;
+	static int16 PreviousListWalkThroughFA;
+
+	static COccluder aOccluders[NUMOCCLUSIONVOLUMES];
+
+	static void Init(void);
+	static void AddOne(float x, float y, float z, float width, float length, float height, float angle);
+	static void ProcessBeforeRendering(void);
+	
+	//TODO:
+	static bool IsAABoxOccluded(CVector pos, float, float, float) { return false; }
+};
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index a867ae13..db40781e 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -5,23 +5,27 @@
 #include "TxdStore.h"
 #include "Sprite.h"
 #include "Camera.h"
+#include "Clock.h"
 #include "Collision.h"
 #include "World.h"
 #include "Shadows.h"
+#include "Replay.h"
+#include "Stats.h"
+#include "Weather.h"
+#include "MBlur.h"
+#include "main.h"
 #include "AudioScriptObject.h"
 #include "ParticleObject.h"
 #include "Particle.h"
 #include "soundlist.h"
 
 
-#define MAX_PARTICLES_ON_SCREEN   (1000)
+#define MAX_PARTICLES_ON_SCREEN   (750)
 
 
 //(5)
 #define MAX_SMOKE_FILES           ARRAY_SIZE(SmokeFiles)
 
-//(5)
-#define MAX_SMOKE2_FILES          ARRAY_SIZE(Smoke2Files)
 //(5) 
 #define MAX_RUBBER_FILES          ARRAY_SIZE(RubberFiles)
 //(5)
@@ -36,16 +40,16 @@
 #define MAX_RAINSPLASHUP_FILES    ARRAY_SIZE(RainSplashupFiles)
 //(4)
 #define MAX_BIRDFRONT_FILES       ARRAY_SIZE(BirdfrontFiles)
+//(8)
+#define MAX_BOAT_FILES            ARRAY_SIZE(BoatFiles)
 //(4)
 #define MAX_CARDEBRIS_FILES       ARRAY_SIZE(CardebrisFiles)
 //(4)
 #define MAX_CARSPLASH_FILES       ARRAY_SIZE(CarsplashFiles)
 
-//(4)
-#define MAX_RAINDROP_FILES        ARRAY_SIZE(RaindropFiles)
-
-
+#define MAX_RAINDRIP_FILES       (2)
 
+	
 const char SmokeFiles[][6+1] =
 {
 	"smoke1",
@@ -56,15 +60,6 @@ const char SmokeFiles[][6+1] =
 };
 
 
-const char Smoke2Files[][9+1] =
-{
-	"smokeII_1",
-	"smokeII_2",
-	"smokeII_3",
-	"smokeII_4",
-	"smokeII_5"
-};
-
 const char RubberFiles[][7+1] =
 {
 	"rubber1",
@@ -108,14 +103,6 @@ const char GunFlashFiles[][9+1] =
 	"gunflash4"
 };
 
-const char RaindropFiles[][9+1] =
-{
-	"raindrop1",
-	"raindrop2",
-	"raindrop3",
-	"raindrop4"
-};
-
 const char RainSplashupFiles[][10+1] =
 {
 	"splash_up1",
@@ -130,6 +117,18 @@ const char BirdfrontFiles[][8+1] =
 	"birdf_04"
 };
 
+const char BoatFiles[][8+1] =
+{
+	"boats_01",
+	"boats_02",
+	"boats_03",
+	"boats_04",
+	"boats_05",
+	"boats_06",
+	"boats_07",
+	"boats_08"
+};
+
 const char CardebrisFiles[][12+1] =
 {
 	"cardebris_01",
@@ -149,7 +148,7 @@ const char CarsplashFiles[][12+1] =
 CParticle gParticleArray[MAX_PARTICLES_ON_SCREEN];
 
 RwTexture *gpSmokeTex[MAX_SMOKE_FILES];
-RwTexture *gpSmoke2Tex[MAX_SMOKE2_FILES];
+RwTexture *gpSmoke2Tex;
 RwTexture *gpRubberTex[MAX_RUBBER_FILES];
 RwTexture *gpRainSplashTex[MAX_RAINSPLASH_FILES];
 RwTexture *gpWatersprayTex[MAX_WATERSPRAY_FILES];
@@ -157,26 +156,27 @@ RwTexture *gpExplosionMediumTex[MAX_EXPLOSIONMEDIUM_FILES];
 RwTexture *gpGunFlashTex[MAX_GUNFLASH_FILES];
 RwTexture *gpRainSplashupTex[MAX_RAINSPLASHUP_FILES];
 RwTexture *gpBirdfrontTex[MAX_BIRDFRONT_FILES];
+RwTexture *gpBoatTex[MAX_BOAT_FILES];
 RwTexture *gpCarDebrisTex[MAX_CARDEBRIS_FILES];
 RwTexture *gpCarSplashTex[MAX_CARSPLASH_FILES];
 
+RwTexture *gpBoatWakeTex;
 RwTexture *gpFlame1Tex;
 RwTexture *gpFlame5Tex;
 RwTexture *gpRainDropSmallTex;
 RwTexture *gpBloodTex;
 RwTexture *gpLeafTex;
-RwTexture *gpCloudTex1; // unused
+RwTexture *gpCloudTex1;
 RwTexture *gpCloudTex4;
 RwTexture *gpBloodSmallTex;
 RwTexture *gpGungeTex;
 RwTexture *gpCollisionSmokeTex;
 RwTexture *gpBulletHitTex;
 RwTexture *gpGunShellTex;
-RwTexture *gpWakeOldTex;
 RwTexture *gpPointlightTex;
 
 RwRaster  *gpSmokeRaster[MAX_SMOKE_FILES];
-RwRaster  *gpSmoke2Raster[MAX_SMOKE2_FILES];
+RwRaster  *gpSmoke2Raster;
 RwRaster  *gpRubberRaster[MAX_RUBBER_FILES];
 RwRaster  *gpRainSplashRaster[MAX_RAINSPLASH_FILES];
 RwRaster  *gpWatersprayRaster[MAX_WATERSPRAY_FILES];
@@ -184,45 +184,62 @@ RwRaster  *gpExplosionMediumRaster[MAX_EXPLOSIONMEDIUM_FILES];
 RwRaster  *gpGunFlashRaster[MAX_GUNFLASH_FILES];
 RwRaster  *gpRainSplashupRaster[MAX_RAINSPLASHUP_FILES];
 RwRaster  *gpBirdfrontRaster[MAX_BIRDFRONT_FILES];
+RwRaster  *gpBoatRaster[MAX_BOAT_FILES];
 RwRaster  *gpCarDebrisRaster[MAX_CARDEBRIS_FILES];
 RwRaster  *gpCarSplashRaster[MAX_CARSPLASH_FILES];
 
+RwRaster  *gpBoatWakeRaster;
 RwRaster  *gpFlame1Raster;
 RwRaster  *gpFlame5Raster;
 RwRaster  *gpRainDropSmallRaster;
 RwRaster  *gpBloodRaster;
 RwRaster  *gpLeafRaster;
-RwRaster  *gpCloudRaster1; // unused
+RwRaster  *gpCloudRaster1;
 RwRaster  *gpCloudRaster4;
 RwRaster  *gpBloodSmallRaster;
 RwRaster  *gpGungeRaster;
 RwRaster  *gpCollisionSmokeRaster;
 RwRaster  *gpBulletHitRaster;
 RwRaster  *gpGunShellRaster;
-RwRaster  *gpWakeOldRaster;
-
-
-RwRaster  *gpPointlightRaster;	// CPointLights::RenderFogEffect
-
-RwTexture *gpRainDropTex[MAX_RAINDROP_FILES]; // CWeather::RenderRainStreaks
-
-
-RwRaster  *gpRainDropRaster[MAX_RAINDROP_FILES];
+RwRaster  *gpPointlightRaster;
+
+RwTexture *gpRainDropTex;
+RwRaster  *gpRainDropRaster;
+
+RwTexture *gpLetterTex;
+RwRaster *gpLetterRaster;
+
+RwTexture *gpSparkTex;
+RwTexture *gpNewspaperTex;
+RwTexture *gpGunSmokeTex;
+RwTexture *gpDotTex;
+RwTexture *gpHeathazeTex;
+RwTexture *gpBeastieTex;
+RwTexture *gpRaindripTex1[MAX_RAINDRIP_FILES];
+RwTexture *gpRaindripTex2[MAX_RAINDRIP_FILES];
+
+RwRaster *gpSparkRaster;
+RwRaster *gpNewspaperRaster;
+RwRaster *gpGunSmokeRaster;
+RwRaster *gpDotRaster;
+RwRaster *gpHeathazeRaster;
+RwRaster *gpBeastieRaster;
+RwRaster *gpRaindripRaster1[MAX_RAINDRIP_FILES];
+RwRaster *gpRaindripRaster2[MAX_RAINDRIP_FILES];
 
 float      CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE];
-
-
 CParticle *CParticle::m_pUnusedListHead;
-
-
 float      CParticle::m_SinTable[CParticle::SIN_COS_TABLE_SIZE];
 float      CParticle::m_CosTable[CParticle::SIN_COS_TABLE_SIZE]; 
 
 int32 Randomizer;
-
 int32 nParticleCreationInterval = 1;
+float PARTICLE_WIND_TEST_SCALE  = 0.002f;
 float fParticleScaleLimit       = 0.5f;
 
+bool clearWaterDrop;
+int32 numWaterDropOnScreen;
+
 #ifdef DEBUGMENU
 SETTWEAKPATH("Particle");
 TWEAKINT32(nParticleCreationInterval, 0, 5, 1);
@@ -230,6 +247,8 @@ TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f);
 TWEAKFUNC(CParticle::ReloadConfig);
 #endif
 
+
+
 void CParticle::ReloadConfig()
 {
 	debug("Initialising CParticleMgr...");
@@ -302,8 +321,8 @@ void CParticle::Initialise()
 	{		
 		float angle = DEGTORAD(float(i) * float(360.0f / SIN_COS_TABLE_SIZE));
 
-		m_SinTable[i] = Sin(angle);
-		m_CosTable[i] = Cos(angle);
+		m_SinTable[i] = ::Sin(angle);
+		m_CosTable[i] = ::Cos(angle);
 	}
 	
 	int32 slot = CTxdStore::FindTxdSlot("particle");
@@ -317,11 +336,8 @@ void CParticle::Initialise()
 		gpSmokeRaster[i] = RwTextureGetRaster(gpSmokeTex[i]);
 	}
 	
-	for ( int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
-	{
-		gpSmoke2Tex[i] = RwTextureRead(Smoke2Files[i], nil);
-		gpSmoke2Raster[i] = RwTextureGetRaster(gpSmoke2Tex[i]);
-	}
+	gpSmoke2Tex = RwTextureRead("smokeII_3", nil);
+	gpSmoke2Raster = RwTextureGetRaster(gpSmoke2Tex);
 	
 	for ( int32 i = 0; i < MAX_RUBBER_FILES; i++ )
 	{
@@ -349,15 +365,13 @@ void CParticle::Initialise()
 	
 	for ( int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
 	{
-		gpGunFlashTex[i] = RwTextureRead(GunFlashFiles[i], NULL);
+		gpGunFlashTex[i] = RwTextureRead(GunFlashFiles[i], nil);
 		gpGunFlashRaster[i] = RwTextureGetRaster(gpGunFlashTex[i]);
 	}
 	
-	for ( int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
-	{
-		gpRainDropTex[i] = RwTextureRead(RaindropFiles[i], nil);
-		gpRainDropRaster[i] = RwTextureGetRaster(gpRainDropTex[i]);
-	}
+	gpRainDropTex = RwTextureRead("raindrop4", nil);
+	gpRainDropRaster = RwTextureGetRaster(gpRainDropTex);
+
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
 	{
@@ -367,10 +381,16 @@ void CParticle::Initialise()
 	
 	for ( int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
 	{
-		gpBirdfrontTex[i] = RwTextureRead(BirdfrontFiles[i], NULL);
+		gpBirdfrontTex[i] = RwTextureRead(BirdfrontFiles[i], nil);
 		gpBirdfrontRaster[i] = RwTextureGetRaster(gpBirdfrontTex[i]);
 	}
 	
+	for ( int32 i = 0; i < MAX_BOAT_FILES; i++ )
+	{
+		gpBoatTex[i] = RwTextureRead(BoatFiles[i], nil);
+		gpBoatRaster[i] = RwTextureGetRaster(gpBoatTex[i]);
+	}
+	
 	for ( int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
 	{
 		gpCarDebrisTex[i] = RwTextureRead(CardebrisFiles[i], nil);
@@ -383,7 +403,10 @@ void CParticle::Initialise()
 		gpCarSplashRaster[i] = RwTextureGetRaster(gpCarSplashTex[i]);
 	}
 
-	gpFlame1Tex = RwTextureRead("flame1", NULL);
+	gpBoatWakeTex = RwTextureRead("boatwake2", nil);
+	gpBoatWakeRaster = RwTextureGetRaster(gpBoatWakeTex);
+	
+	gpFlame1Tex = RwTextureRead("flame1", nil);
 	gpFlame1Raster = RwTextureGetRaster(gpFlame1Tex);
 
 	gpFlame5Tex = RwTextureRead("flame5", nil);
@@ -402,6 +425,9 @@ void CParticle::Initialise()
 
 	gpLeafTex = RwTextureRead("gameleaf01_64", nil);
 	gpLeafRaster = RwTextureGetRaster(gpLeafTex);
+	
+	gpLetterTex = RwTextureRead("letter", nil);
+	gpLetterRaster = RwTextureGetRaster(gpLetterTex);
 
 	gpCloudTex1 = RwTextureRead("cloud3", nil);
 	gpCloudRaster1 = RwTextureGetRaster(gpCloudTex1);
@@ -424,12 +450,39 @@ void CParticle::Initialise()
 	gpGunShellTex = RwTextureRead("gunshell", nil);
 	gpGunShellRaster = RwTextureGetRaster(gpGunShellTex);
 
-	gpWakeOldTex = RwTextureRead("wake_old", nil);
-	gpWakeOldRaster = RwTextureGetRaster(gpWakeOldTex);
-
 	gpPointlightTex = RwTextureRead("pointlight", nil);
 	gpPointlightRaster = RwTextureGetRaster(gpPointlightTex);
 	
+	gpSparkTex = RwTextureRead("spark", nil);
+	gpSparkRaster = RwTextureGetRaster(gpSparkTex);
+	
+	gpNewspaperTex = RwTextureRead("newspaper02_64", nil);
+	gpNewspaperRaster = RwTextureGetRaster(gpNewspaperTex);
+	
+	gpGunSmokeTex = RwTextureRead("gunsmoke3", nil);
+	gpGunSmokeRaster = RwTextureGetRaster(gpGunSmokeTex);
+	
+	gpDotTex = RwTextureRead("dot", nil);
+	gpDotRaster = RwTextureGetRaster(gpDotTex);
+	
+	gpHeathazeTex = RwTextureRead("heathaze", nil);
+	gpHeathazeRaster = RwTextureGetRaster(gpHeathazeTex);
+	
+	gpBeastieTex = RwTextureRead("beastie", nil);
+	gpBeastieRaster = RwTextureGetRaster(gpBeastieTex);
+	
+	gpRaindripTex1[0] = RwTextureRead("raindrip64", nil);
+	gpRaindripRaster1[0] = RwTextureGetRaster(gpRaindripTex1[0]);
+	
+	gpRaindripTex1[1] = RwTextureRead("raindripb64", nil);
+	gpRaindripRaster1[1] = RwTextureGetRaster(gpRaindripTex1[1]);
+	
+	gpRaindripTex2[0] = RwTextureRead("raindrip64_d", nil);
+	gpRaindripRaster2[0] = RwTextureGetRaster(gpRaindripTex2[0]);
+	
+	gpRaindripTex2[1] = RwTextureRead("raindripb64_d", nil);
+	gpRaindripRaster2[1] = RwTextureGetRaster(gpRaindripTex2[1]);
+	
 	CTxdStore::PopCurrentTxd();
 	
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
@@ -438,145 +491,180 @@ void CParticle::Initialise()
 		
 		switch ( i )
 		{
+			case PARTICLE_SPARK:
+			case PARTICLE_SPARK_SMALL:
+			case PARTICLE_RAINDROP_SMALL:
+			case PARTICLE_HELI_ATTACK:
+				entry->m_ppRaster = &gpRainDropSmallRaster;
+				break;
+			
+			case PARTICLE_WATER_SPARK:
+				entry->m_ppRaster = &gpSparkRaster;
+				break;
+			
+			case PARTICLE_WHEEL_DIRT:
+			case PARTICLE_SAND:
+			case PARTICLE_STEAM2:
+			case PARTICLE_STEAM_NY:
+			case PARTICLE_STEAM_NY_SLOWMOTION:
+			case PARTICLE_GROUND_STEAM:
+			case PARTICLE_ENGINE_STEAM:
+			case PARTICLE_PEDFOOT_DUST:
+			case PARTICLE_CAR_DUST:
+			case PARTICLE_EXHAUST_FUMES:
+				entry->m_ppRaster = &gpSmoke2Raster;
+				break;
+			
+			case PARTICLE_WHEEL_WATER:
+			case PARTICLE_WATER:
+			case PARTICLE_SMOKE:
+			case PARTICLE_SMOKE_SLOWMOTION:
+			case PARTICLE_DRY_ICE:
+			case PARTICLE_GARAGEPAINT_SPRAY:
+			case PARTICLE_STEAM:
+			case PARTICLE_WATER_CANNON:
+			case PARTICLE_EXTINGUISH_STEAM:
+			case PARTICLE_HELI_DUST:
+			case PARTICLE_PAINT_SMOKE:
+			case PARTICLE_BULLETHIT_SMOKE:
+				entry->m_ppRaster = gpSmokeRaster;
+				break;
+			
 			case PARTICLE_BLOOD:
 				entry->m_ppRaster = &gpBloodRaster;
 				break;
-
+			
 			case PARTICLE_BLOOD_SMALL:
 			case PARTICLE_BLOOD_SPURT:
 				entry->m_ppRaster = &gpBloodSmallRaster;
 				break;
-
+			
+			case PARTICLE_DEBRIS:
+			case PARTICLE_TREE_LEAVES:
+				entry->m_ppRaster = &gpLeafRaster;
+				break;
+			
 			case PARTICLE_DEBRIS2:
 				entry->m_ppRaster = &gpGungeRaster;
 				break;
-
+			
+			case PARTICLE_FLYERS:
+				entry->m_ppRaster = &gpNewspaperRaster;
+				break;
+			
+			case PARTICLE_FLAME:
+			case PARTICLE_CARFLAME:
+				entry->m_ppRaster = &gpFlame1Raster;
+				break;
+			
+			case PARTICLE_FIREBALL:
+				entry->m_ppRaster = &gpFlame5Raster;
+				break;
+			
 			case PARTICLE_GUNFLASH:
 			case PARTICLE_GUNFLASH_NOANIM:
 				entry->m_ppRaster = gpGunFlashRaster;
 				break;
-
+			
+			
 			case PARTICLE_GUNSMOKE:
-			case PARTICLE_SPLASH:
+			case PARTICLE_WATERDROP:
+			case PARTICLE_BLOODDROP:
+			case PARTICLE_HEATHAZE:
+			case PARTICLE_HEATHAZE_IN_DIST:
 				entry->m_ppRaster = nil;
 				break;
-
-			case PARTICLE_FLAME:
-			case PARTICLE_CARFLAME:
-				entry->m_ppRaster = &gpFlame1Raster;
+			
+			case PARTICLE_GUNSMOKE2:
+			case PARTICLE_BOAT_THRUSTJET:
+			case PARTICLE_RUBBER_SMOKE:
+				entry->m_ppRaster = gpRubberRaster;
 				break;
-
-			case PARTICLE_FIREBALL:
-				entry->m_ppRaster = &gpFlame5Raster;
+			
+			case PARTICLE_CIGARETTE_SMOKE:
+				entry->m_ppRaster = &gpGunSmokeRaster;
 				break;
-
+			
+			case PARTICLE_TEARGAS:
+				entry->m_ppRaster = &gpHeathazeRaster;
+				break;
+			
+			case PARTICLE_SHARD:
+			case PARTICLE_RAINDROP:
+			case PARTICLE_RAINDROP_2D:
+				entry->m_ppRaster = &gpRainDropRaster;
+				break;
+			
+			case PARTICLE_SPLASH:
+			case PARTICLE_PED_SPLASH:
+			case PARTICLE_CAR_SPLASH:
+			case PARTICLE_WATER_HYDRANT:
+				entry->m_ppRaster = gpCarSplashRaster;
+				break;
+			
 			case PARTICLE_RAIN_SPLASH:
 			case PARTICLE_RAIN_SPLASH_BIGGROW:
 				entry->m_ppRaster = gpRainSplashRaster;
 				break;
-
+			
 			case PARTICLE_RAIN_SPLASHUP:
 				entry->m_ppRaster = gpRainSplashupRaster;
 				break;
-
+			
 			case PARTICLE_WATERSPRAY:
 				entry->m_ppRaster = gpWatersprayRaster;
 				break;
-
-			case PARTICLE_SHARD:
-			case PARTICLE_RAINDROP:
-			case PARTICLE_RAINDROP_2D:
-				entry->m_ppRaster = gpRainDropRaster;
-				break;
-
+			
 			case PARTICLE_EXPLOSION_MEDIUM:
 			case PARTICLE_EXPLOSION_LARGE:
 			case PARTICLE_EXPLOSION_MFAST:
 			case PARTICLE_EXPLOSION_LFAST:
 				entry->m_ppRaster = gpExplosionMediumRaster;
 				break;
-
-			case PARTICLE_BOAT_WAKE:
-				entry->m_ppRaster = &gpWakeOldRaster;
-				break;
-
-			case PARTICLE_CAR_SPLASH:
-			case PARTICLE_WATER_HYDRANT:
-			case PARTICLE_PED_SPLASH:
-				entry->m_ppRaster = gpCarSplashRaster;
-				break;
-
-			case PARTICLE_SPARK:
-			case PARTICLE_SPARK_SMALL:
-			case PARTICLE_RAINDROP_SMALL:
-			case PARTICLE_HELI_ATTACK:
-				entry->m_ppRaster = &gpRainDropSmallRaster;
-				break;
-
-			case PARTICLE_DEBRIS:
-			case PARTICLE_TREE_LEAVES:
-				entry->m_ppRaster = &gpLeafRaster;
-				break;
-
-			case PARTICLE_CAR_DEBRIS:
-			case PARTICLE_HELI_DEBRIS:
-				entry->m_ppRaster = gpCarDebrisRaster;
-				break;
-
-			case PARTICLE_WHEEL_DIRT:
-			case PARTICLE_STEAM2:
-			case PARTICLE_STEAM_NY:
-			case PARTICLE_STEAM_NY_SLOWMOTION:
-			case PARTICLE_ENGINE_STEAM:
-			case PARTICLE_BOAT_THRUSTJET:
-			case PARTICLE_PEDFOOT_DUST:
-			case PARTICLE_EXHAUST_FUMES:
-				entry->m_ppRaster = gpSmoke2Raster;
+			
+			case PARTICLE_BOAT_SPLASH:
+				entry->m_ppRaster = &gpBoatWakeRaster;
 				break;
-
-			case PARTICLE_GUNSMOKE2:
-			case PARTICLE_RUBBER_SMOKE:
-				entry->m_ppRaster = gpRubberRaster;
+			
+			case PARTICLE_ENGINE_SMOKE:
+			case PARTICLE_ENGINE_SMOKE2:
+			case PARTICLE_CARFLAME_SMOKE:
+			case PARTICLE_FIREBALL_SMOKE:
+			case PARTICLE_ROCKET_SMOKE:
+			case PARTICLE_TEST:
+				entry->m_ppRaster = &gpCloudRaster4;
 				break;
-
+			
 			case PARTICLE_CARCOLLISION_DUST:
 			case PARTICLE_BURNINGRUBBER_SMOKE:
 				entry->m_ppRaster = &gpCollisionSmokeRaster;
 				break;
-
-			case PARTICLE_WHEEL_WATER:
-			case PARTICLE_WATER:
-			case PARTICLE_SMOKE:
-			case PARTICLE_SMOKE_SLOWMOTION:
-			case PARTICLE_GARAGEPAINT_SPRAY:
-			case PARTICLE_STEAM:
-			case PARTICLE_BOAT_SPLASH:
-			case PARTICLE_WATER_CANNON:
-			case PARTICLE_EXTINGUISH_STEAM:
-			case PARTICLE_HELI_DUST:
-			case PARTICLE_PAINT_SMOKE:
-			case PARTICLE_BULLETHIT_SMOKE:
-				entry->m_ppRaster = gpSmokeRaster;
+			
+			case PARTICLE_CAR_DEBRIS:
+			case PARTICLE_HELI_DEBRIS:
+			case PARTICLE_BIRD_DEBRIS:
+				entry->m_ppRaster = gpCarDebrisRaster;
 				break;
-
+			
 			case PARTICLE_GUNSHELL_FIRST:
 			case PARTICLE_GUNSHELL:
 			case PARTICLE_GUNSHELL_BUMP1:
 			case PARTICLE_GUNSHELL_BUMP2:
 				entry->m_ppRaster = &gpGunShellRaster;
 				break;
-
-			case PARTICLE_ENGINE_SMOKE:
-			case PARTICLE_ENGINE_SMOKE2:
-			case PARTICLE_CARFLAME_SMOKE:
-			case PARTICLE_FIREBALL_SMOKE:
-			case PARTICLE_TEST:
-				entry->m_ppRaster = &gpCloudRaster4;
-				break;
-
+			
+			
 			case PARTICLE_BIRD_FRONT:
 				entry->m_ppRaster = gpBirdfrontRaster;
 				break;
+			
+			case PARTICLE_SHIP_SIDE:
+				entry->m_ppRaster = gpBoatRaster;
+				break;
+			
+			case PARTICLE_BEASTIE:
+				entry->m_ppRaster = &gpBeastieRaster;
+				break;
 		}
 	}
 
@@ -590,168 +678,145 @@ void CParticle::Shutdown()
 	for ( int32 i = 0; i < MAX_SMOKE_FILES; i++ )
 	{
 		RwTextureDestroy(gpSmokeTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpSmokeTex[i] = nil;
-#endif
 	}
 
-	for ( int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
-	{
-		RwTextureDestroy(gpSmoke2Tex[i]);
-#ifdef GTA3_1_1_PATCH
-		gpSmoke2Tex[i] = nil;
-#endif
-	}
+	RwTextureDestroy(gpSmoke2Tex);
+	gpSmoke2Tex = nil;
 	 
 	for ( int32 i = 0; i < MAX_RUBBER_FILES; i++ )
 	{
 		RwTextureDestroy(gpRubberTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRubberTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpRainSplashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRainSplashTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_WATERSPRAY_FILES; i++ )
 	{
 		RwTextureDestroy(gpWatersprayTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpWatersprayTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_EXPLOSIONMEDIUM_FILES; i++ )
 	{
 		RwTextureDestroy(gpExplosionMediumTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpExplosionMediumTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpGunFlashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpGunFlashTex[i] = nil;
-#endif
 	}
 	
-	for ( int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
-	{
-		RwTextureDestroy(gpRainDropTex[i]);
-#ifdef GTA3_1_1_PATCH
-		gpRainDropTex[i] = nil;
-#endif
-	}
+	RwTextureDestroy(gpRainDropTex);
+	gpRainDropTex = nil;
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
 	{
 		RwTextureDestroy(gpRainSplashupTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRainSplashupTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
 	{
 		RwTextureDestroy(gpBirdfrontTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpBirdfrontTex[i] = nil;
-#endif
+	}
+	
+	for ( int32 i = 0; i < MAX_BOAT_FILES; i++ )
+	{
+		RwTextureDestroy(gpBoatTex[i]);
+		gpBoatTex[i] = nil;
 	}
 	
 	for ( int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
 	{
 		RwTextureDestroy(gpCarDebrisTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpCarDebrisTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_CARSPLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpCarSplashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpCarSplashTex[i] = nil;
-#endif
 	}
 	
+	for ( int32 i = 0; i < MAX_RAINDRIP_FILES; i++ )
+	{
+		RwTextureDestroy(gpRaindripTex1[i]);
+		gpRaindripTex1[i] = nil;
+
+		RwTextureDestroy(gpRaindripTex2[i]);
+		gpRaindripTex2[i] = nil;
+	}
+	
+	RwTextureDestroy(gpBoatWakeTex);
+	gpBoatWakeTex = nil;
+
 	RwTextureDestroy(gpFlame1Tex);
-#ifdef GTA3_1_1_PATCH
 	gpFlame1Tex = nil;
-#endif
 
 	RwTextureDestroy(gpFlame5Tex);
-#ifdef GTA3_1_1_PATCH
 	gpFlame5Tex = nil;
-#endif
 	
 	RwTextureDestroy(gpRainDropSmallTex);
-#ifdef GTA3_1_1_PATCH
 	gpRainDropSmallTex = nil;
-#endif
 	
 	RwTextureDestroy(gpBloodTex);
-#ifdef GTA3_1_1_PATCH
 	gpBloodTex = nil;
-#endif
 	
 	RwTextureDestroy(gpLeafTex);
-#ifdef GTA3_1_1_PATCH
 	gpLeafTex = nil;
-#endif
+
+	RwTextureDestroy(gpLetterTex);
+	gpLetterTex = nil;
 	
 	RwTextureDestroy(gpCloudTex1);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex1 = nil;
-#endif
 	
 	RwTextureDestroy(gpCloudTex4);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex4 = nil;
-#endif
 	
 	RwTextureDestroy(gpBloodSmallTex);
-#ifdef GTA3_1_1_PATCH
 	gpBloodSmallTex = nil;
-#endif
 	
 	RwTextureDestroy(gpGungeTex);
-#ifdef GTA3_1_1_PATCH
 	gpGungeTex = nil;
-#endif
 	
 	RwTextureDestroy(gpCollisionSmokeTex);
-#ifdef GTA3_1_1_PATCH
 	gpCollisionSmokeTex = nil;
-#endif
 	
 	RwTextureDestroy(gpBulletHitTex);
-#ifdef GTA3_1_1_PATCH
 	gpBulletHitTex = nil;
-#endif
 	
 	RwTextureDestroy(gpGunShellTex);
-#ifdef GTA3_1_1_PATCH
 	gpGunShellTex = nil;
-#endif
-	
-	RwTextureDestroy(gpWakeOldTex);
-#ifdef GTA3_1_1_PATCH
-	gpWakeOldTex = nil;
-#endif
 	
 	RwTextureDestroy(gpPointlightTex);
-#ifdef GTA3_1_1_PATCH
 	gpPointlightTex = nil;
-#endif
+
+	RwTextureDestroy(gpSparkTex);
+	gpSparkTex = nil;
+	
+	RwTextureDestroy(gpNewspaperTex);
+	gpNewspaperTex = nil;
+
+	RwTextureDestroy(gpGunSmokeTex);
+	gpGunSmokeTex = nil;
+	
+	RwTextureDestroy(gpDotTex);
+	gpDotTex = nil;
+	RwTextureDestroy(gpHeathazeTex);
+	gpHeathazeTex = nil;
+	
+	RwTextureDestroy(gpBeastieTex);
+	gpBeastieTex = nil;
 
 	int32 slot;
 
@@ -761,6 +826,40 @@ void CParticle::Shutdown()
 	debug("CParticle shut down");
 }
 
+
+void CParticle::AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity, float fSize, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
+{
+	CVector vecDist = vecEnd - vecStart;
+	float fDist = vecDist.Magnitude();
+	float fSteps = Max(fDist / fPower, 1.0f);
+	int32 nSteps = (int32)fSteps;
+
+	CVector vecStep = vecDist * (1.0f / (float)nSteps); 
+
+	for ( int32 i = 0; i < nSteps; i++ )
+	{
+		CVector vecPos = float(i) * vecStep + vecStart;
+		AddParticle(type, vecPos, vecDir, pEntity, fSize, nRotationSpeed, nRotation, nCurFrame, nLifeSpan);
+	}
+}
+
+void CParticle::AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
+{
+	CVector vecDist = vecEnd - vecStart;
+	float fDist = vecDist.Magnitude();
+	float fSteps = Max(fDist / fPower, 1.0f);
+	int32 nSteps = (int32)fSteps;
+	
+	CVector vecStep = vecDist * (1.0f / (float)nSteps); 
+
+	for ( int32 i = 0; i < nSteps; i++ )
+	{		
+		CVector vecPos = float(i) * vecStep + vecStart;
+		
+		AddParticle(type, vecPos, vecDir, pEntity, fSize, color, nRotationSpeed, nRotation, nCurFrame, nLifeSpan);
+	}
+}
+
 CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
 {
 	CRGBA color(0, 0, 0, 0);
@@ -770,9 +869,8 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
 {
 	if ( CTimer::GetIsPaused() )
-		return NULL;
+		return nil;
 
-#ifdef PC_PARTICLE
 	if ( ( type == PARTICLE_ENGINE_SMOKE
 		|| type == PARTICLE_ENGINE_SMOKE2
 		|| type == PARTICLE_ENGINE_STEAM
@@ -785,8 +883,10 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	{
 		return nil;
 	}
-#endif
 
+	if ( !CReplay::IsPlayingBack() )
+		CReplay::RecordParticle(type, vecPos, vecDir, fSize, color);
+	
 	CParticle *pParticle = m_pUnusedListHead;
 	
 	if ( pParticle == nil )
@@ -807,7 +907,19 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		pParticle->m_nTimeWhenWillBeDestroyed = CTimer::GetTimeInMilliseconds() + psystem->m_nLifeSpan;
 
 	pParticle->m_nColorIntensity = psystem->m_nFadeToBlackInitialIntensity;
+	
+	pParticle->m_nFadeToBlackTimer = psystem->m_nFadeToBlackAmount;
+	
+	if ( psystem->m_nFadeToBlackTime )
+		pParticle->m_nFadeToBlackTimer /= psystem->m_nFadeToBlackTime;
+	
 	pParticle->m_nAlpha = psystem->m_nFadeAlphaInitialIntensity;
+	
+	pParticle->m_nFadeAlphaTimer = psystem->m_nFadeAlphaAmount;
+	
+	if ( psystem->m_nFadeAlphaTime )
+		pParticle->m_nFadeAlphaTimer /= psystem->m_nFadeAlphaTime;
+	
 	pParticle->m_nCurrentZRotation = psystem->m_nZRotationInitialAngle;
 	pParticle->m_fCurrentZRadius = psystem->m_fInitialZRadius;
 	
@@ -816,14 +928,29 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	else
 		pParticle->m_nCurrentFrame = psystem->m_nStartAnimationFrame;
 	
-	pParticle->m_nFadeToBlackTimer = 0;
-	pParticle->m_nFadeAlphaTimer = 0;
+	
 	pParticle->m_nZRotationTimer = 0;
 	pParticle->m_nZRadiusTimer = 0;
 	pParticle->m_nAnimationSpeedTimer = 0;
 	pParticle->m_fZGround = 0.0f;
-	pParticle->m_vecPosition = vecPos;
+	
+	if ( type != PARTICLE_HEATHAZE )
+		pParticle->m_vecPosition = vecPos;
+	else
+	{
+		CVector screen;
+		float w, h;
+
+		if ( !CSprite::CalcScreenCoors(vecPos, screen, &w, &h, true) )
+			return nil;
+		
+		pParticle->m_vecPosition = screen;
+		psystem->m_vecTextureStretch.x = w;
+		psystem->m_vecTextureStretch.y = h;
+	}
+	
 	pParticle->m_vecVelocity = vecDir;
+	
 	pParticle->m_vecParticleMovementOffset = CVector(0.0f, 0.0f, 0.0f);
 	pParticle->m_nTimeWhenColorWillBeChanged = 0;
 	
@@ -831,7 +958,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		RwRGBAAssign(&pParticle->m_Color, &color);
 	else
 	{
-		RwRGBAAssign(&pParticle->m_Color, &psystem->m_RenderColouring);
+		RwRGBAAssign(&pParticle->m_Color, psystem->m_RenderColouring);
 
 		if ( psystem->m_ColorFadeTime != 0 )
 			pParticle->m_nTimeWhenColorWillBeChanged = CTimer::GetTimeInMilliseconds() + psystem->m_ColorFadeTime;
@@ -839,7 +966,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		if ( psystem->m_InitialColorVariation != 0 )
 		{
 			int32 ColorVariation = CGeneral::GetRandomNumberInRange(-psystem->m_InitialColorVariation, psystem->m_InitialColorVariation);
-			//Float ColorVariation = CGeneral::GetRandomNumberInRange((float)-psystem->m_InitialColorVariation, (float)psystem->m_InitialColorVariation);
+			//float ColorVariation = CGeneral::GetRandomNumberInRange((float)-psystem->m_InitialColorVariation, (float)psystem->m_InitialColorVariation);
   
 			pParticle->m_Color.red   = clamp(pParticle->m_Color.red +
 				PERCENT(pParticle->m_Color.red, ColorVariation),
@@ -856,13 +983,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	}
 
 	pParticle->m_nRotation = nRotation;
-	
-// PC only
-	if ( pParticle->m_nRotation >= 360 )
-		pParticle->m_nRotation -= 360;
-	else if ( pParticle->m_nRotation < 0 )
-		pParticle->m_nRotation += 360;
-	
+		
 	if ( nRotationSpeed != 0 )
 		pParticle->m_nRotationStep = nRotationSpeed;
 	else
@@ -871,8 +992,6 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	if ( CGeneral::GetRandomNumber() & 1 )
 		pParticle->m_nRotationStep = -pParticle->m_nRotationStep;
 	
-	pParticle->m_vecScreenPosition.x = 0.0f; // bug ?
-	
 	if ( psystem->m_fPositionRandomError != 0.0f )
 	{
 		pParticle->m_vecPosition.x += psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
@@ -891,7 +1010,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 			pParticle->m_vecVelocity.z += psystem->m_fVelocityRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
 	}
 	
-	if ( psystem->m_fExpansionRateError != 0.0f )
+	if ( psystem->m_fExpansionRateError != 0.0f && !(psystem->Flags & SCREEN_TRAIL) )
 		pParticle->m_fExpansionRate += psystem->m_fExpansionRateError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE] + psystem->m_fExpansionRateError;
 	
 	if ( psystem->m_nRotationRateError != 0 )
@@ -1015,6 +1134,25 @@ void CParticle::Update()
 	float fFricDeccel99 = pow(0.99f, CTimer::GetTimeStep());
 	
 	CParticleObject::UpdateAll();
+	
+	// ejaculation at 23:00, 23:15, 23:30, 23:45 
+	if ( CClock::ms_nGameClockHours == 23 &&
+		(	   CClock::ms_nGameClockMinutes == 0 
+			|| CClock::ms_nGameClockMinutes == 15 
+			|| CClock::ms_nGameClockMinutes == 30
+			|| CClock::ms_nGameClockMinutes == 45 ) )
+	{
+		AddParticle(PARTICLE_CAR_SPLASH,
+					CVector(557.03f, -4.0f, 151.46f),
+					CVector(0.0f, 0.0f, 2.5f),
+					NULL,
+					2.0f,
+					CRGBA(255, 255, 255, 255),
+					0,
+					0,
+					1,
+					1000);
+	}
 
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
 	{
@@ -1028,9 +1166,199 @@ void CParticle::Update()
 				
 		for ( ; particle != nil; _Next(particle, prevParticle, psystem, bRemoveParticle) )
 		{
+			CVector vecWind(0.0f, 0.0f, 0.0f);
+			
 			bRemoveParticle = false;
 
-			CVector moveStep = particle->m_vecPosition + ( particle->m_vecVelocity * CTimer::GetTimeStep() );
+			CVector vecMoveStep = particle->m_vecVelocity * CTimer::GetTimeStep();
+			CVector vecPos = particle->m_vecPosition;
+			
+			if ( numWaterDropOnScreen == 0 )
+				clearWaterDrop = false;
+			
+			if ( psystem->m_Type == PARTICLE_WATERDROP )
+			{
+				if ( CGame::IsInInterior() || clearWaterDrop == true )
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+				
+				static uint8 nWaterDropCount;
+
+				if ( nWaterDropCount == 5 )
+				{
+					vecMoveStep = CVector(0.0f, 0.0f, 0.0f);
+					particle->m_nTimeWhenWillBeDestroyed += 1250;
+					nWaterDropCount = 0;
+				}
+				else
+				{
+					if ( TheCamera.m_CameraAverageSpeed > 0.35f )
+					{
+						if ( vecMoveStep.Magnitude() > 0.5f )
+						{
+							if ( vecMoveStep.Magnitude() > 0.4f && vecMoveStep.Magnitude() < 0.8f )
+							{
+								vecMoveStep.x += TheCamera.m_CameraAverageSpeed * 1.5f;
+								vecMoveStep.y += TheCamera.m_CameraAverageSpeed * 1.5f;
+							}
+							else if ( vecMoveStep.Magnitude() != 0.0f )
+							{
+								vecMoveStep.x += CGeneral::GetRandomNumberInRange(0.01f, 0.05f);
+								vecMoveStep.y += CGeneral::GetRandomNumberInRange(0.01f, 0.05f);
+							}
+						}
+					}
+					
+					nWaterDropCount++;
+				}
+				
+				if ( vecPos.z <= 1.5f )
+					vecMoveStep.z = 0.0f;
+			}
+			
+			if ( psystem->m_Type == PARTICLE_HEATHAZE || psystem->m_Type == PARTICLE_HEATHAZE_IN_DIST )
+			{
+				int32 nSinCosIndex = int32(DEGTORAD((float)particle->m_nRotation) * float(SIN_COS_TABLE_SIZE) / TWOPI) % SIN_COS_TABLE_SIZE;
+				
+				vecMoveStep.x = Sin(nSinCosIndex);
+				vecMoveStep.y = Sin(nSinCosIndex);
+				
+				if ( psystem->m_Type == PARTICLE_HEATHAZE_IN_DIST )
+					particle->m_nRotation = int16((float)particle->m_nRotation + 0.75f);
+				else
+					particle->m_nRotation = int16((float)particle->m_nRotation + 1.0f);
+			}
+			
+			if ( psystem->m_Type == PARTICLE_BEASTIE )
+			{
+				int32 nSinCosIndex = int32(DEGTORAD((float)particle->m_nRotation) * float(SIN_COS_TABLE_SIZE) / TWOPI) % SIN_COS_TABLE_SIZE;
+				
+				particle->m_vecVelocity.x = 0.50f * Cos(nSinCosIndex);
+				particle->m_vecVelocity.y = Cos(nSinCosIndex);
+				particle->m_vecVelocity.z = 0.25f * Sin(nSinCosIndex);
+				
+				if ( particle->m_vecVelocity.Magnitude() > 2.0f
+						|| vecPos.z > 40.0f
+						|| (TheCamera.GetPosition() - vecPos).Magnitude() < 60.0f
+					)
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+			}
+			
+			vecPos += vecMoveStep;
+			
+			if ( psystem->m_Type == PARTICLE_FIREBALL )
+			{
+				  AddParticle(PARTICLE_HEATHAZE, particle->m_vecPosition, CVector(0.0f, 0.0f, 0.0f),
+					nil, particle->m_fSize * 5.0f);
+			}
+			
+			if ( psystem->m_Type == PARTICLE_GUNSMOKE2 )
+			{
+				if ( CTimer::GetFrameCounter() & 10 )
+				{
+					if ( FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN )
+					{
+						AddParticle(PARTICLE_HEATHAZE, particle->m_vecPosition, CVector(0.0f, 0.0f, 0.0f));
+					}
+				}
+			}
+			
+			if ( CWeather::Wind > 0.0f )
+			{
+				if ( vecMoveStep.Magnitude() != 0.0f )
+				{
+					vecWind.x = CGeneral::GetRandomNumberInRange(0.75f, 1.25f) * -CWeather::Wind;
+					vecWind.y = CGeneral::GetRandomNumberInRange(0.75f, 1.25f) * -CWeather::Wind;
+					vecWind *= PARTICLE_WIND_TEST_SCALE * psystem->m_fWindFactor * CTimer::GetTimeStep();
+					particle->m_vecVelocity += vecWind;
+				}
+			}
+			
+			if ( psystem->m_Type == PARTICLE_RAINDROP
+				|| psystem->m_Type == PARTICLE_RAINDROP_SMALL
+				|| psystem->m_Type == PARTICLE_RAIN_SPLASH
+				|| psystem->m_Type == PARTICLE_RAIN_SPLASH_BIGGROW
+				|| psystem->m_Type == PARTICLE_CAR_SPLASH
+				|| psystem->m_Type == PARTICLE_BOAT_SPLASH
+				|| psystem->m_Type == PARTICLE_RAINDROP_2D )
+			{
+				int32 nMaxDrops = int32(6.0f * TheCamera.m_CameraAverageSpeed + 1.0f);
+				float fDistToCam = 0.0f;
+				
+				if ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+				{
+					if ( vecPos.z + particle->m_fSize < 5.0f )
+					{
+						bRemoveParticle = true;
+						continue;
+					}
+					
+					switch ( TheCamera.GetLookDirection() )
+					{
+						case LOOKING_LEFT:
+						case LOOKING_RIGHT:
+						case LOOKING_FORWARD:
+							nMaxDrops /= 2;
+							break;
+						
+						default:
+							nMaxDrops = 0;
+							break;
+					}
+					
+					fDistToCam = (TheCamera.GetPosition() - vecPos).Magnitude();
+				}
+
+				if ( numWaterDropOnScreen < nMaxDrops && numWaterDropOnScreen < 63
+					&& fDistToCam < 10.0f
+					&& clearWaterDrop == false
+					&& !CGame::IsInInterior() )
+				{
+					CVector vecWaterdropTarget
+					(
+						CGeneral::GetRandomNumberInRange(-0.25f, 0.25f),
+						CGeneral::GetRandomNumberInRange(0.1f, 0.75f),
+						-0.01f
+					);
+					
+					CVector vecWaterdropPos;
+					
+					if ( TheCamera.m_CameraAverageSpeed < 0.35f )
+						vecWaterdropPos.x = (float)CGeneral::GetRandomNumberInRange(50, int32(SCREEN_WIDTH) - 50);
+					else
+						vecWaterdropPos.x = (float)CGeneral::GetRandomNumberInRange(200, int32(SCREEN_WIDTH) - 200);
+					
+					if ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+						vecWaterdropPos.y = (float)CGeneral::GetRandomNumberInRange(SCREEN_HEIGHT / 2, SCREEN_HEIGHT);
+					else
+					{
+						if ( TheCamera.m_CameraAverageSpeed < 0.35f )
+							vecWaterdropPos.y  = (float)CGeneral::GetRandomNumberInRange(0, int32(SCREEN_HEIGHT));
+						else
+							vecWaterdropPos.y  = (float)CGeneral::GetRandomNumberInRange(150, int32(SCREEN_HEIGHT) - 200);
+					}
+					
+					vecWaterdropPos.z = 2.0f;
+
+					if ( AddParticle(PARTICLE_WATERDROP,
+										vecWaterdropPos,
+										vecWaterdropTarget,
+										nil,
+										CGeneral::GetRandomNumberInRange(0.1f, 0.15f),
+										0,
+										0,
+										CGeneral::GetRandomNumber() & 1,
+										0) != nil )
+					{
+						numWaterDropOnScreen++;
+					}
+				}
+			}
 			
 			if (  CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed || particle->m_nAlpha == 0 )
 			{
@@ -1057,7 +1385,7 @@ void CParticle::Update()
 						0, 255);
 				}
 				else
-					RwRGBAAssign(&particle->m_Color, &psystem->m_FadeDestinationColor);
+					RwRGBAAssign(&particle->m_Color, psystem->m_FadeDestinationColor);
 			}
 			
 			if ( psystem->Flags & CLIPOUT2D )
@@ -1070,16 +1398,41 @@ void CParticle::Update()
 				}
 			}
 			
-			float size = particle->m_fSize + particle->m_fExpansionRate;
-			
-			if ( size < 0.0f )
+			if ( !(psystem->Flags & SCREEN_TRAIL) )
 			{
-				bRemoveParticle = true;
-				continue;
+				float size;
+
+				if ( particle->m_fExpansionRate > 0.0f )
+				{
+					float speed = Max(vecWind.Magnitude(), vecMoveStep.Magnitude());
+					
+					if ( psystem->m_Type == PARTICLE_EXHAUST_FUMES || psystem->m_Type == PARTICLE_ENGINE_STEAM )
+						speed *= 2.0f;
+					
+					if ( ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+							&& particle->m_fSize > 1.2f )
+					{
+						size = particle->m_fSize - (1.0f + speed) * particle->m_fExpansionRate;
+						particle->m_vecVelocity.z -= 0.15f;
+					}
+					else
+						size = particle->m_fSize + (1.0f + speed) * particle->m_fExpansionRate;
+				}
+				else
+					size = particle->m_fSize + particle->m_fExpansionRate;
+				
+				if ( psystem->m_Type == PARTICLE_WATERDROP )
+					size = (size - Abs(vecMoveStep.x) * 0.000150000007f) + (Abs(vecMoveStep.z) * 0.0500000007f); //TODO:
+				
+				if ( size < 0.0f )
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+				
+				particle->m_fSize = size;
 			}
 			
-			particle->m_fSize = size;
-			
 			switch ( psystem->m_nFrictionDecceleration )
 			{
 				case 50:
@@ -1199,7 +1552,7 @@ void CParticle::Update()
 									
 									if ( randVal == 5 )
 									{
-										CShadows::AddPermanentShadow(1, gpBloodPoolTex, &vecPosn,
+										CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &vecPosn,
 												0.1f, 0.0f, 0.0f, -0.1f,
 												255,
 												255, 0, 0,
@@ -1207,7 +1560,7 @@ void CParticle::Update()
 									}
 									else if ( randVal == 2 )
 									{
-										CShadows::AddPermanentShadow(1, gpBloodPoolTex, &vecPosn,
+										CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &vecPosn,
 												0.2f, 0.0f, 0.0f, -0.2f,
 												255,
 												255, 0, 0,
@@ -1225,12 +1578,12 @@ void CParticle::Update()
 					CColPoint point;
 					CEntity *entity;
 
-					if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, moveStep.z, point, entity, 
+					if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, vecPos.z, point, entity, 
 														true, true, false, false, true, false, nil) )
 					{
-						if ( moveStep.z <= point.point.z )
+						if ( vecPos.z <= point.point.z )
 						{
-							moveStep.z = point.point.z;
+							vecPos.z = point.point.z;
 							if ( psystem->m_Type == PARTICLE_DEBRIS2 )
 							{
 								particle->m_vecVelocity.x *= 0.8f;
@@ -1317,16 +1670,16 @@ void CParticle::Update()
 						CColPoint point;
 						CEntity *entity;
 			
-						if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, moveStep.z, point, entity,
+						if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, vecPos.z, point, entity,
 														true, false, false, false, true, false, nil) )
 						{
-							if ( moveStep.z <= point.point.z )
+							if ( vecPos.z <= point.point.z )
 							{
-								moveStep.z = point.point.z;
+								vecPos.z = point.point.z;
 								if ( psystem->m_Type == PARTICLE_HELI_ATTACK )
 								{
 									bRemoveParticle = true;
-									AddParticle(PARTICLE_STEAM, moveStep, CVector(0.0f, 0.0f, 0.05f), nil, 0.2f, 0, 0, 0, 0);
+									AddParticle(PARTICLE_STEAM, vecPos, CVector(0.0f, 0.0f, 0.05f), nil, 0.2f, 0, 0, 0, 0);
 									continue;
 								}
 							}
@@ -1335,37 +1688,21 @@ void CParticle::Update()
 				}
 			}
 
-			if ( psystem->m_nFadeToBlackAmount != 0 )
+			if ( particle->m_nFadeToBlackTimer != 0 )
 			{
-				if ( particle->m_nFadeToBlackTimer >= psystem->m_nFadeToBlackTime )
-				{
-					particle->m_nFadeToBlackTimer = 0;
-					
-					particle->m_nColorIntensity = clamp(particle->m_nColorIntensity - psystem->m_nFadeToBlackAmount,
+				particle->m_nColorIntensity = clamp(particle->m_nColorIntensity - particle->m_nFadeToBlackTimer,
 														0, 255);
-				}
-				else
-					++particle->m_nFadeToBlackTimer;
 			}
 
-			if ( psystem->m_nFadeAlphaAmount != 0 )
+			if ( particle->m_nFadeAlphaTimer != 0 )
 			{
-				if ( particle->m_nFadeAlphaTimer >= psystem->m_nFadeAlphaTime )
-				{
-					particle->m_nFadeAlphaTimer = 0;
-					
-					particle->m_nAlpha = clamp(particle->m_nAlpha - psystem->m_nFadeAlphaAmount,
+				particle->m_nAlpha = clamp(particle->m_nAlpha - particle->m_nFadeAlphaTimer,
 														0, 255);
-#ifdef PC_PARTICLE
-					if ( particle->m_nAlpha == 0 )
-					{
-						bRemoveParticle = true;
-						continue;
-					}
-#endif
+				if ( particle->m_nAlpha == 0 )
+				{
+					bRemoveParticle = true;
+					continue;
 				}
-				else
-					++particle->m_nFadeAlphaTimer;
 			}
 			
 			if ( psystem->m_nZRotationAngleChangeAmount != 0 )
@@ -1409,31 +1746,24 @@ void CParticle::Update()
 			}
 			
 			if ( particle->m_nRotationStep != 0 )
-			{
 				particle->m_nRotation += particle->m_nRotationStep;
-				
-				if ( particle->m_nRotation >= 360 )
-					particle->m_nRotation -= 360;
-				else if ( particle->m_nRotation < 0 )
-					particle->m_nRotation += 360;
-			}
 			
 			if ( particle->m_fCurrentZRadius != 0.0f )
 			{
-				int32 nRot = particle->m_nCurrentZRotation % (SIN_COS_TABLE_SIZE - 1);
+				int32 nSinCosIndex = particle->m_nCurrentZRotation % SIN_COS_TABLE_SIZE;
 				
-				float fX = (Cos(nRot) - Sin(nRot)) * particle->m_fCurrentZRadius;
+				float fX = (Cos(nSinCosIndex) - Sin(nSinCosIndex)) * particle->m_fCurrentZRadius;
 				
-				float fY = (Sin(nRot) + Cos(nRot)) * particle->m_fCurrentZRadius;
+				float fY = (Sin(nSinCosIndex) + Cos(nSinCosIndex)) * particle->m_fCurrentZRadius;
 
-				moveStep -= particle->m_vecParticleMovementOffset;
+				vecPos -= particle->m_vecParticleMovementOffset;
 
-				moveStep += CVector(fX, fY, 0.0f);
+				vecPos += CVector(fX, fY, 0.0f);
 				
 				particle->m_vecParticleMovementOffset = CVector(fX, fY, 0.0f);
 			}
 			
-			particle->m_vecPosition = moveStep;
+			particle->m_vecPosition = vecPos;
 		}
 	}
 }
@@ -1457,13 +1787,10 @@ void CParticle::Render()
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
 	{
 		tParticleSystemData *psystem = &mod_ParticleSystemManager.m_aParticles[i];
-#ifdef PC_PARTICLE
 		bool particleBanned = false;
-#endif
 		CParticle *particle = psystem->m_pParticles;
 		
 		RwRaster **frames = psystem->m_ppRaster;
-#ifdef PC_PARTICLE
 		tParticleType type = psystem->m_Type;
 
 		if ( type == PARTICLE_ENGINE_SMOKE
@@ -1477,7 +1804,6 @@ void CParticle::Render()
 		{
 			particleBanned = true;
 		}
-#endif
 
 		if ( particle )
 		{
@@ -1519,11 +1845,10 @@ void CParticle::Render()
 		while ( particle != nil )
 		{
 			bool canDraw = true;
-#ifdef PC_PARTICLE
 
 			if ( particle->m_nAlpha == 0 )
 				canDraw = false;
-#endif
+			
 			if ( canDraw && psystem->m_nFinalAnimationFrame != 0 && frames != nil )
 			{
 				RwRaster *curFrame = frames[particle->m_nCurrentFrame];
@@ -1537,28 +1862,153 @@ void CParticle::Render()
 			
 			if ( canDraw && psystem->Flags & DRAWTOP2D )
 			{
-				if ( particle->m_nRotation != 0 )
+				float screenZ = (particle->m_vecPosition.z - CDraw::GetNearClipZ())
+					* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ())
+					* CDraw::GetFarClipZ()
+					/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * particle->m_vecPosition.z )
+					+ CSprite::GetNearScreenZ();
+				
+				float stretchTexW;
+				float stretchTexH;
+					
+				if ( i == PARTICLE_RAINDROP || i == PARTICLE_RAINDROP_SMALL || i == PARTICLE_RAINDROP_2D )
 				{
-					 CSprite::RenderBufferedOneXLUSprite2D_Rotate_Dimension(
-							particle->m_vecPosition.x,
-							particle->m_vecPosition.y,
-							particle->m_fSize * 63.0f,
-							particle->m_fSize * 63.0f,
-							particle->m_Color,
-							particle->m_nColorIntensity,
-							(float)particle->m_nRotation, //DEGTORAD((float)particle->m_nRotation) ps2
-							particle->m_nAlpha);
+					stretchTexW = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x * (float)particle->m_nCurrentFrame + 63.0f;
+					stretchTexH = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y * (float)particle->m_nCurrentFrame + 63.0f;
 				}
 				else
 				{
-					CSprite::RenderBufferedOneXLUSprite2D(
-							particle->m_vecPosition.x,
-							particle->m_vecPosition.y,
-							particle->m_fSize * 63.0f,
-							particle->m_fSize * 63.0f,
-							particle->m_Color,
-							particle->m_nColorIntensity,
-							particle->m_nAlpha);
+					stretchTexW = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x + 63.0f;
+					stretchTexH = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y + 63.0f;
+				}
+
+				
+				if ( i == PARTICLE_WATERDROP )
+				{
+					int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+					stretchTexH += (1.0f - (float)timeLeft ) * psystem->m_vecTextureStretch.y;
+					
+					RwRect rect;
+					
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					
+					FxType fxtype;
+
+					if ( particle->m_nCurrentFrame != 0 )
+						fxtype = FXTYPE_1;
+					else
+						fxtype = FXTYPE_0;
+		
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_BLOODDROP )
+				{
+					int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+					stretchTexH += (1.0f + (float)timeLeft) * psystem->m_vecTextureStretch.y;
+					stretchTexW += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.x;
+
+					RwRect rect;
+
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					
+					FxType fxtype;
+					
+					if ( particle->m_nCurrentFrame )
+						fxtype = FXTYPE_3;
+					else
+						fxtype = FXTYPE_2;
+					
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_HEATHAZE_IN_DIST )
+				{
+					RwRect rect;
+					
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH * 0.15f));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH * 0.15f));
+					
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_HEATHAZE )
+				{
+					RwRect rect;
+					
+					switch ( TheCamera.GetLookDirection() )
+					{
+						case LOOKING_LEFT:
+							rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x * 2.0f));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+
+						case LOOKING_RIGHT:
+							rect.x = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x * 4.0f));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+
+						default:
+							rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+					}
+														 
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					
+					canDraw = false;
+				}
+				
+				if ( canDraw )
+				{
+					if ( particle->m_nRotation != 0 )
+					{
+						CSprite::RenderBufferedOneXLUSprite2D_Rotate_Dimension(
+								particle->m_vecPosition.x,
+								particle->m_vecPosition.y,
+								particle->m_fSize * stretchTexW,
+								particle->m_fSize * stretchTexH,
+								particle->m_Color,
+								particle->m_nColorIntensity,
+								DEGTORAD((float)particle->m_nRotation),
+								particle->m_nAlpha);
+					}
+					else
+					{
+						CSprite::RenderBufferedOneXLUSprite2D(
+								particle->m_vecPosition.x,
+								particle->m_vecPosition.y,
+								particle->m_fSize * stretchTexW,
+								particle->m_fSize * stretchTexH,
+								particle->m_Color,
+								particle->m_nColorIntensity,
+								particle->m_nAlpha);
+					}
 				}
 				
 				canDraw = false;
@@ -1572,174 +2022,234 @@ void CParticle::Render()
 
 				if ( CSprite::CalcScreenCoors(particle->m_vecPosition, coors, &w, &h, true) )
 				{
-#ifdef PC_PARTICLE
-					if ( (!particleBanned || SCREEN_WIDTH * fParticleScaleLimit >= w)
-											&& SCREEN_HEIGHT * fParticleScaleLimit >= h )
-#endif
+					
+					if ( i == PARTICLE_ENGINE_STEAM
+						|| i == PARTICLE_ENGINE_SMOKE
+						|| i == PARTICLE_ENGINE_SMOKE2
+						|| i == PARTICLE_CARFLAME_SMOKE
+						|| i == PARTICLE_CARCOLLISION_DUST
+						|| i == PARTICLE_EXHAUST_FUMES
+						|| i == PARTICLE_RUBBER_SMOKE
+						|| i == PARTICLE_BURNINGRUBBER_SMOKE )
 					{
-						if ( particle->m_nRotation != 0 )
-						{					
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w, particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									float(particle->m_nRotation), // DEGTORAD((float)particle->m_nRotation) ps2
-									particle->m_nAlpha);
+						switch ( TheCamera.GetLookDirection() )
+						{
+							case LOOKING_LEFT:
+							case LOOKING_RIGHT:
+								w += CGeneral::GetRandomNumberInRange(1.0f, 7.5f) * psystem->m_vecTextureStretch.x;
+								h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+								break;
+
+							default:
+								w += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x;
+								h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+								break;
 						}
-						else if ( psystem->Flags & SCREEN_TRAIL )
+					}
+					else if ( i == PARTICLE_WATER_HYDRANT )
+					{
+						int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+						w += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.x;
+						h += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.y;
+					}
+					else if ( i == PARTICLE_FLYERS )
+					{
+						w += psystem->m_vecTextureStretch.x;
+						h += psystem->m_vecTextureStretch.y;
+						
+						w = Max(w, 12.0f);
+						h = Max(h, 12.0f);
+					}
+					else
+					{
+						w += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x;
+						h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+					}
+					
+					if ( i == PARTICLE_WATER_HYDRANT
+							|| (!particleBanned || SCREEN_WIDTH * fParticleScaleLimit >= w)
+							&& SCREEN_HEIGHT * fParticleScaleLimit >= h )
+					{
+						if ( i == PARTICLE_WATER_HYDRANT )
 						{
-							float fRotation;
-							float fTrailLength;
+							RwRect rect;
 							
-							if ( particle->m_vecScreenPosition.x == 0.0f )
+							if ( w > 0.0f )
 							{
-								fTrailLength = 0.0f;
-								fRotation = 0.0f;
+								rect.x = int32(coors.x - SCREEN_STRETCH_X(particle->m_fSize * w));
+								rect.w = int32(coors.x + SCREEN_STRETCH_X(particle->m_fSize * w));
 							}
 							else
 							{
-								CVector2D vecDist
-								(
-									coors.x - particle->m_vecScreenPosition.x,
-									coors.y - particle->m_vecScreenPosition.y
-								);
-
-								float fDist = vecDist.Magnitude();
-
-								fTrailLength = fDist;
-								
-								float fRot = Asin(vecDist.x / fDist);
-
-								fRotation = fRot;
-
-								if ( vecDist.y < 0.0f )
-									fRotation = -1.0f * fRot + DEGTORAD(180.0f);
-								
-								fRotation = RADTODEG(fRotation);
-	
-								if ( fRotation < 0.0f )
-									fRotation += 360.0f;
-								
-								float fSpeed = particle->m_vecVelocity.Magnitude();
-								
-								float fNewTrailLength = fSpeed * CTimer::GetTimeStep() * w * 2.0f;
-								
-								if ( fDist > fNewTrailLength )
-									fTrailLength = fNewTrailLength;
+								rect.w = int32(coors.x - SCREEN_STRETCH_X(particle->m_fSize * w));
+								rect.x = int32(coors.x + SCREEN_STRETCH_X(particle->m_fSize * w));
 							}
 							
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									fRotation,
-									particle->m_nAlpha);
-			
-							particle->m_vecScreenPosition = coors;
+							if ( h > 0.0f )
+							{
+								rect.y = int32(coors.y - SCREEN_STRETCH_Y(particle->m_fSize * h));
+								rect.h = int32(coors.y + SCREEN_STRETCH_Y(particle->m_fSize * h));
+							}
+							else
+							{
+								rect.h = int32(coors.y - SCREEN_STRETCH_Y(particle->m_fSize * h));
+								rect.y = int32(coors.y + SCREEN_STRETCH_Y(particle->m_fSize * h));
+							}
+							
+							float screenZ = (coors.z - CDraw::GetNearClipZ())
+								* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ()
+								/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * coors.z ) + CSprite::GetNearScreenZ();
+
+							CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_5);
 						}
-						else if ( psystem->Flags & SPEED_TRAIL )
+						else
 						{
-							CVector vecPrevPos = particle->m_vecPosition - particle->m_vecVelocity;
-							float fRotation;
-							float fTrailLength;
-							
-							if ( CSprite::CalcScreenCoors(vecPrevPos, particle->m_vecScreenPosition, &fTrailLength, &fRotation, true) )
+							if ( particle->m_nRotation != 0 && i != PARTICLE_BEASTIE )
+							{					
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w, particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										DEGTORAD((float)particle->m_nRotation),
+										particle->m_nAlpha);
+							}
+							else if ( psystem->Flags & SCREEN_TRAIL )
 							{
-								CVector2D vecDist
-								(
-									coors.x - particle->m_vecScreenPosition.x,
-									coors.y - particle->m_vecScreenPosition.y
-								);
-								
-								float fDist = vecDist.Magnitude();
-								
-								fTrailLength = fDist;
+								float fRotation;
+								float fTrailLength;
 								
-								float fRot = Asin(vecDist.x / fDist);
-								
-								fRotation = fRot;
+								if ( particle->m_fZGround == 0.0f )
+								{
+									fTrailLength = 0.0f;
+									fRotation = 0.0f;
+								}
+								else
+								{
+									CVector2D vecDist
+									(
+										coors.x - particle->m_fZGround,
+										coors.y - particle->m_fExpansionRate
+									);
+	
+									float fDist = vecDist.Magnitude();
+	
+									fTrailLength = fDist;
+									
+									float fRot = Asin(vecDist.x / fDist);
+	
+									fRotation = fRot;
+	
+									if ( vecDist.y < 0.0f )
+										fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+									
+									float fSpeed = particle->m_vecVelocity.Magnitude();
+									
+									float fNewTrailLength = fSpeed * CTimer::GetTimeStep() * w * 2.0f;
+									
+									if ( fDist > fNewTrailLength )
+										fTrailLength = fNewTrailLength;
+								}
 								
-								if ( vecDist.y < 0.0f )
-									fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										fRotation,
+										particle->m_nAlpha);
+				
+								particle->m_fZGround = coors.x;				// WTF ?
+								particle->m_fExpansionRate =  coors.y;		// WTF ?
+							}
+							else if ( psystem->Flags & SPEED_TRAIL )
+							{
+								CVector vecPrevPos = particle->m_vecPosition - particle->m_vecVelocity;
+								float fRotation;
+								float fTrailLength;
+								CVector vecScreenPosition;
 								
-								fRotation = RADTODEG(fRotation);
+								if ( CSprite::CalcScreenCoors(vecPrevPos, vecScreenPosition, &fTrailLength, &fRotation, true) )
+								{
+									CVector2D vecDist
+									(
+										coors.x - vecScreenPosition.x,
+										coors.y - vecScreenPosition.y
+									);
+									
+									float fDist = vecDist.Magnitude();
+									
+									fTrailLength = fDist;
+									
+									float fRot = Asin(vecDist.x / fDist);
+									
+									fRotation = fRot;
+									
+									if ( vecDist.y < 0.0f )
+										fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+								}
+								else
+								{
+									fRotation = 0.0f;
+									fTrailLength = 0.0f;
+								}
 								
-								if ( fRotation < 0.0f )
-									fRotation += 360.0f;
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										fRotation,
+										particle->m_nAlpha);
 							}
-							else
+							else if ( psystem->Flags & VERT_TRAIL )
 							{
-								fRotation = 0.0f;
-								fTrailLength = 0.0f;
+								float fTrailLength = fabsf(particle->m_vecVelocity.z * 10.0f);
+	
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										(particle->m_fSize + fTrailLength * psystem->m_fTrailLengthMultiplier) * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
+							}
+							else if ( i == PARTICLE_RAINDROP_SMALL )
+							{
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w * 0.05f,
+										particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
+							}
+							/*else if ( i == PARTICLE_BOAT_WAKE )*/
+							else
+							{							
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
 							}
-							
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									fRotation,
-									particle->m_nAlpha);
-						}
-						else if ( psystem->Flags & VERT_TRAIL )
-						{
-							float fTrailLength = fabsf(particle->m_vecVelocity.z * 10.0f);
-
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									(particle->m_fSize + fTrailLength * psystem->m_fTrailLengthMultiplier) * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else if ( i == PARTICLE_RAINDROP_SMALL )
-						{
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w * 0.05f,
-									particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else if ( i == PARTICLE_BOAT_WAKE )
-						{
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									psystem->m_fDefaultInitialRadius * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else
-						{							
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
 						}
 					}
 				}
@@ -1769,6 +2279,9 @@ void CParticle::RemovePSystem(tParticleType type)
 
 void CParticle::RemoveParticle(CParticle *pParticle, CParticle *pPrevParticle, tParticleSystemData *pPSystemData)
 {
+	if ( pPSystemData->m_Type == PARTICLE_WATERDROP )
+		--numWaterDropOnScreen;
+	
 	if ( pPrevParticle )
 		pPrevParticle->m_pNext = pParticle->m_pNext;
 	else
@@ -1857,3 +2370,89 @@ void CParticle::AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatr
 					0.3f, color, 0, 0, 0, 0);
 	}
 }
+
+void CParticle::CalWindDir(CVector *vecDirIn, CVector *vecDirOut)
+{
+	vecDirOut->x = (Cos(128) * vecDirIn->x) + (Sin(128) * vecDirIn->y);
+
+	vecDirOut->x = (Cos(128) * vecDirIn->x) + (Sin(128) * vecDirIn->y) * CWeather::Wind;
+	vecDirOut->y = (Sin(128) * vecDirIn->x) - (Cos(128) * vecDirIn->y) * CWeather::Wind;
+}
+
+void CParticle::HandleShipsAtHorizonStuff()
+{
+	tParticleSystemData *psystemdata = &mod_ParticleSystemManager.m_aParticles[PARTICLE_SHIP_SIDE];
+
+	for ( CParticle *particle = psystemdata->m_pParticles; particle; particle = particle->m_pNext )
+	{
+		if ( CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed - 32000 
+				&& CTimer::GetTimeInMilliseconds() < particle->m_nTimeWhenWillBeDestroyed - 22000 )
+		{		
+			particle->m_nAlpha = Min(particle->m_nAlpha + 1, 96);
+		}
+		if ( CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed - 10000 )
+			particle->m_nFadeAlphaTimer = 1;
+	}
+}
+
+void CParticle::HandleShootableBirdsStuff(CEntity *entity, CVector const&camPos)
+{
+	float fHeadingRad = entity->GetForward().Heading();
+	float fHeading = RADTODEG(fHeadingRad);
+	float fBirdAngle = Cos(DEGTORAD(1.5f));
+	
+	tParticleSystemData *psystem = &mod_ParticleSystemManager.m_aParticles[PARTICLE_BIRD_FRONT];
+	CParticle *particle = psystem->m_pParticles;
+	CParticle *prevParticle = nil;
+	bool bRemoveParticle;
+			
+	for ( ; particle != nil; _Next(particle, prevParticle, psystem, bRemoveParticle) )
+	{
+		bRemoveParticle = false;
+		
+		CVector2D vecPos(particle->m_vecPosition.x, particle->m_vecPosition.y);
+		CVector2D vecCamPos(camPos.x, camPos.y);
+
+		CVector2D vecDist = vecPos - vecCamPos;
+		vecDist.Normalise();
+		
+		float fHead = DEGTORAD(fHeading);
+
+		CVector2D vecDir(-::Sin(fHead), ::Cos(fHead));
+		vecDir.Normalise();
+		
+		float fDot = DotProduct2D(vecDir, vecDist);
+		
+		if ( fDot > 0.0f && fDot > fBirdAngle )
+		{
+			if ( (camPos - particle->m_vecPosition).MagnitudeSqr() < 40000.0f )
+			{
+				CStats::SeagullsKilled++;
+				
+				bRemoveParticle = true;
+
+				for ( int32 i = 0; i < 8; i++ )
+				{	
+					CParticle *pBirdDerbis = AddParticle(PARTICLE_BIRD_DEBRIS,
+												particle->m_vecPosition,
+												CVector
+												(
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f),
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f),
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f)
+												),
+												nil,
+												0.3f,
+												particle->m_Color,
+												CGeneral::GetRandomNumberInRange(20, 40),
+												0,
+												CGeneral::GetRandomNumber() & 3,
+												200);
+					if ( pBirdDerbis )
+						pBirdDerbis->m_nAlpha = particle->m_nAlpha;
+				}
+			}
+		}
+	}
+	
+}
diff --git a/src/render/Particle.h b/src/render/Particle.h
index 7f02e318..f2c3a459 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -15,25 +15,24 @@ public:
 
 	CVector   m_vecPosition;
 	CVector   m_vecVelocity;
-	CVector   m_vecScreenPosition;
-	uint32     m_nTimeWhenWillBeDestroyed;
-	uint32     m_nTimeWhenColorWillBeChanged;
+	uint32    m_nTimeWhenWillBeDestroyed;
+	uint32    m_nTimeWhenColorWillBeChanged;
 	float     m_fZGround;
 	CVector   m_vecParticleMovementOffset;
 	int16     m_nCurrentZRotation;
-	uint16     m_nZRotationTimer;
+	uint16    m_nZRotationTimer;
 	float     m_fCurrentZRadius;
-	uint16     m_nZRadiusTimer;
-	float     m_fSize;
-	float     m_fExpansionRate;
-	uint16     m_nFadeToBlackTimer;
-	uint16     m_nFadeAlphaTimer;
+	uint16    m_nZRadiusTimer;
 	uint8     m_nColorIntensity;
 	uint8     m_nAlpha;
-	uint16    m_nCurrentFrame;
+	float     m_fSize;
+	float     m_fExpansionRate;
+	int16     m_nFadeToBlackTimer;
+	int16     m_nFadeAlphaTimer;
 	int16     m_nAnimationSpeedTimer;
 	int16     m_nRotationStep;
 	int16     m_nRotation;
+	uint8     m_nCurrentFrame;
 	RwRGBA    m_Color;
 	CParticle *m_pNext;
 	
@@ -60,8 +59,11 @@ public:
 	static void Initialise();
 	static void Shutdown();
 	
-	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity = nil, float fSize = 0.0f, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
-	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+	static void AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity = nil, float fSize = 0.0f,                     int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);	
+	static void AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity,       float fSize, RwRGBA const&color,        int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+
+	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity = nil, float fSize = 0.0f,               int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity,       float fSize, RwRGBA const &color, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
 
 	static void Update();
 	static void Render();
@@ -89,6 +91,12 @@ public:
 
 	static void AddJetExplosion(CVector const &vecPos, float fPower, float fSize);
 	static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
+	static void CalWindDir(CVector *vecDirIn, CVector *vecDirOut);
+	
+	static void HandleShipsAtHorizonStuff();
+	static void HandleShootableBirdsStuff(CEntity *entity, CVector const&camPos);
 };
 
-VALIDATE_SIZE(CParticle, 0x68);
+extern bool clearWaterDrop;
+
+VALIDATE_SIZE(CParticle, 0x58);
diff --git a/src/render/ParticleMgr.cpp b/src/render/ParticleMgr.cpp
index 3387d471..f6919435 100644
--- a/src/render/ParticleMgr.cpp
+++ b/src/render/ParticleMgr.cpp
@@ -216,6 +216,18 @@ void cParticleSystemMgr::LoadParticleData()
 					case CFG_PARAM_TRAIL_LENGTH_MULTIPLIER:
 						entry->m_fTrailLengthMultiplier = atof(value);
 						break;
+						
+					case CFG_PARAM_STRETCH_VALUE_X:
+						entry->m_vecTextureStretch.x = atof(value);
+						break;
+
+					case CFG_PARAM_STRETCH_VALUE_Y:
+						entry->m_vecTextureStretch.y = atof(value);
+						break;
+
+					case CFG_PARAM_WIND_FACTOR:
+						entry->m_fWindFactor = atof(value);
+						break;
 
 					case CFG_PARAM_PARTICLE_CREATE_RANGE:
 						entry->m_fCreateRange = SQR(atof(value));
diff --git a/src/render/ParticleMgr.h b/src/render/ParticleMgr.h
index 0100bb65..f4afc018 100644
--- a/src/render/ParticleMgr.h
+++ b/src/render/ParticleMgr.h
@@ -36,14 +36,14 @@ struct tParticleSystemData
 	uint16        m_nZRadiusChangeTime;
 	float         m_fInitialZRadius;
 	float         m_fZRadiusChangeAmount;
-	uint16        m_nFadeToBlackTime;
-	int16         m_nFadeToBlackAmount;
+	int16         m_nFadeToBlackTime;
 	uint8         m_nFadeToBlackInitialIntensity;
+	int16         m_nFadeToBlackAmount;
 	uint8         m_nFadeAlphaInitialIntensity;
-	uint16        m_nFadeAlphaTime;
+	int16         m_nFadeAlphaTime;
 	int16         m_nFadeAlphaAmount;
-	uint16        m_nStartAnimationFrame;
-	uint16        m_nFinalAnimationFrame;
+	uint8         m_nStartAnimationFrame;
+	uint8         m_nFinalAnimationFrame;
 	uint16        m_nAnimationSpeed;
 	uint16        m_nRotationSpeed;
 	float         m_fGravitationalAcceleration;
@@ -56,16 +56,19 @@ struct tParticleSystemData
 	uint32        m_nLifeSpanErrorShape;
 	float         m_fTrailLengthMultiplier;
 	uint32        Flags;
-	RwRGBA        m_RenderColouring;
+	CRGBA         m_RenderColouring;
 	uint8         m_InitialColorVariation;
-	RwRGBA        m_FadeDestinationColor;
+	CRGBA         m_FadeDestinationColor;
 	uint32        m_ColorFadeTime;
+	
+	CVector2D     m_vecTextureStretch;
+	float         m_fWindFactor;
 
 	RwRaster      **m_ppRaster;
 	CParticle     *m_pParticles;
 };
 
-VALIDATE_SIZE(tParticleSystemData, 0x88);
+VALIDATE_SIZE(tParticleSystemData, 0x94);
 
 class cParticleSystemMgr
 {
@@ -107,6 +110,11 @@ class cParticleSystemMgr
 		CFG_PARAM_ROTATION_RATE_ERROR,
 		CFG_PARAM_LIFE_SPAN_ERROR_SHAPE,
 		CFG_PARAM_TRAIL_LENGTH_MULTIPLIER,
+		
+		CFG_PARAM_STRETCH_VALUE_X,
+		CFG_PARAM_STRETCH_VALUE_Y,
+		CFG_PARAM_WIND_FACTOR,
+		
 		CFG_PARAM_PARTICLE_CREATE_RANGE,
 		CFG_PARAM_FLAGS,
 
@@ -125,6 +133,6 @@ public:
 	void RangeCheck(tParticleSystemData *pData) { }
 };
 
-VALIDATE_SIZE(cParticleSystemMgr, 0x2420);
+VALIDATE_SIZE(cParticleSystemMgr, 0x2FFC);
 
 extern cParticleSystemMgr mod_ParticleSystemManager;
diff --git a/src/render/ParticleType.h b/src/render/ParticleType.h
index 8d352c44..0af9a1e1 100644
--- a/src/render/ParticleType.h
+++ b/src/render/ParticleType.h
@@ -4,13 +4,16 @@ enum tParticleType
 {
 	PARTICLE_SPARK = 0,
 	PARTICLE_SPARK_SMALL,
+	PARTICLE_WATER_SPARK,
 	PARTICLE_WHEEL_DIRT,
+	PARTICLE_SAND,
 	PARTICLE_WHEEL_WATER,
 	PARTICLE_BLOOD,
 	PARTICLE_BLOOD_SMALL,
 	PARTICLE_BLOOD_SPURT,
 	PARTICLE_DEBRIS,
 	PARTICLE_DEBRIS2,
+	PARTICLE_FLYERS,
 	PARTICLE_WATER,
 	PARTICLE_FLAME,
 	PARTICLE_FIREBALL,
@@ -18,8 +21,11 @@ enum tParticleType
 	PARTICLE_GUNFLASH_NOANIM,
 	PARTICLE_GUNSMOKE,
 	PARTICLE_GUNSMOKE2,
+	PARTICLE_CIGARETTE_SMOKE,
 	PARTICLE_SMOKE,
 	PARTICLE_SMOKE_SLOWMOTION,
+	PARTICLE_DRY_ICE,
+	PARTICLE_TEARGAS,
 	PARTICLE_GARAGEPAINT_SPRAY,
 	PARTICLE_SHARD,
 	PARTICLE_SPLASH,
@@ -28,6 +34,7 @@ enum tParticleType
 	PARTICLE_STEAM2,
 	PARTICLE_STEAM_NY,
 	PARTICLE_STEAM_NY_SLOWMOTION,
+	PARTICLE_GROUND_STEAM,
 	PARTICLE_ENGINE_STEAM,
 	PARTICLE_RAINDROP,
 	PARTICLE_RAINDROP_SMALL,
@@ -35,6 +42,8 @@ enum tParticleType
 	PARTICLE_RAIN_SPLASH_BIGGROW,
 	PARTICLE_RAIN_SPLASHUP,
 	PARTICLE_WATERSPRAY,
+	PARTICLE_WATERDROP,
+	PARTICLE_BLOODDROP,
 	PARTICLE_EXPLOSION_MEDIUM,
 	PARTICLE_EXPLOSION_LARGE,
 	PARTICLE_EXPLOSION_MFAST,
@@ -42,12 +51,12 @@ enum tParticleType
 	PARTICLE_CAR_SPLASH,
 	PARTICLE_BOAT_SPLASH,
 	PARTICLE_BOAT_THRUSTJET,
-	PARTICLE_BOAT_WAKE,
 	PARTICLE_WATER_HYDRANT,
 	PARTICLE_WATER_CANNON,
 	PARTICLE_EXTINGUISH_STEAM,
 	PARTICLE_PED_SPLASH,
 	PARTICLE_PEDFOOT_DUST,
+	PARTICLE_CAR_DUST,
 	PARTICLE_HELI_DUST,
 	PARTICLE_HELI_ATTACK,
 	PARTICLE_ENGINE_SMOKE,
@@ -58,6 +67,7 @@ enum tParticleType
 	PARTICLE_TREE_LEAVES,
 	PARTICLE_CARCOLLISION_DUST,
 	PARTICLE_CAR_DEBRIS,
+	PARTICLE_BIRD_DEBRIS,
 	PARTICLE_HELI_DEBRIS,
 	PARTICLE_EXHAUST_FUMES,
 	PARTICLE_RUBBER_SMOKE,
@@ -67,9 +77,14 @@ enum tParticleType
 	PARTICLE_GUNSHELL,
 	PARTICLE_GUNSHELL_BUMP1,
 	PARTICLE_GUNSHELL_BUMP2,
+	PARTICLE_ROCKET_SMOKE,
 	PARTICLE_TEST,
 	PARTICLE_BIRD_FRONT,
+	PARTICLE_SHIP_SIDE,
+	PARTICLE_BEASTIE,
 	PARTICLE_RAINDROP_2D,
+	PARTICLE_HEATHAZE,
+	PARTICLE_HEATHAZE_IN_DIST,
 	
 	MAX_PARTICLES,
 	PARTICLE_FIRST = PARTICLE_SPARK,
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 8a48eb11..98dce4ac 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -7,6 +7,7 @@
 #include "Ped.h"
 #include "Vehicle.h"
 #include "Heli.h"
+#include "Bike.h"
 #include "Object.h"
 #include "PathFind.h"
 #include "Collision.h"
@@ -18,13 +19,13 @@
 #include "Streaming.h"
 #include "Shadows.h"
 #include "PointLights.h"
+#include "Occlusion.h"
 #include "Renderer.h"
 
-bool gbShowPedRoadGroups;
-bool gbShowCarRoadGroups;
+//--MIAMI: file done
+
 bool gbShowCollisionPolys;
 bool gbShowCollisionLines;
-bool gbShowCullZoneDebugStuff;
 bool gbBigWhiteDebugLightSwitchedOn;
 
 bool gbDontRenderBuildings;
@@ -142,8 +143,11 @@ CRenderer::RenderOneNonRoad(CEntity *e)
 
 	resetLights = e->SetupLighting();
 
-	if(e->IsVehicle())
+	if(e->IsVehicle()){
+		// unfortunately can't use GetClump here
+		CVisibilityPlugins::SetupVehicleVariables((RpClump*)e->m_rwObject);
 		CVisibilityPlugins::InitAlphaAtomicList();
+	}
 
 	// Render Peds in vehicle before vehicle itself
 	if(e->IsVehicle()){
@@ -153,6 +157,7 @@ CRenderer::RenderOneNonRoad(CEntity *e)
 		for(i = 0; i < 8; i++)
 			if(veh->pPassengers[i] && veh->pPassengers[i]->m_nPedState == PED_DRIVING)
 				veh->pPassengers[i]->Render();
+		SetCullMode(rwCULLMODECULLNONE);
 	}
 	e->Render();
 
@@ -160,6 +165,7 @@ CRenderer::RenderOneNonRoad(CEntity *e)
 		e->bImBeingRendered = true;
 		CVisibilityPlugins::RenderAlphaAtomics();
 		e->bImBeingRendered = false;
+		SetCullMode(rwCULLMODECULLBACK);
 	}
 
 	e->RemoveLighting(resetLights);
@@ -180,38 +186,40 @@ CRenderer::RenderFirstPersonVehicle(void)
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 }
 
+inline bool IsRoad(CEntity *e) { return e->IsBuilding() && ((CSimpleModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex()))->m_wetRoadReflection; }
+
 void
 CRenderer::RenderRoads(void)
 {
 	int i;
-	CTreadable *t;
+	CEntity *e;
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	SetCullMode(rwCULLMODECULLBACK);
 	DeActivateDirectional();
 	SetAmbientColours();
 
 	for(i = 0; i < ms_nNoOfVisibleEntities; i++){
-		t = (CTreadable*)ms_aVisibleEntityPtrs[i];
-		if(t->IsBuilding() && t->GetIsATreadable()){
-#ifndef MASTER
-			if(gbShowCarRoadGroups || gbShowPedRoadGroups){
-				int ind = 0;
-				if(gbShowCarRoadGroups)
-					ind += ThePaths.m_pathNodes[t->m_nodeIndices[PATH_CAR][0]].group;
-				if(gbShowPedRoadGroups)
-					ind += ThePaths.m_pathNodes[t->m_nodeIndices[PATH_PED][0]].group;
-				SetAmbientColoursToIndicateRoadGroup(ind);
-			}
-#endif
-			RenderOneRoad(t);
-#ifndef MASTER
-			if(gbShowCarRoadGroups || gbShowPedRoadGroups)
-				ReSetAmbientAndDirectionalColours();
-#endif
-		}
+		e = ms_aVisibleEntityPtrs[i];
+		if(IsRoad(e))
+			RenderOneRoad(e);
 	}
 }
 
+inline bool PutIntoSortedVehicleList(CVehicle *veh)
+{
+	if(veh->IsBoat()){
+		int mode = TheCamera.Cams[TheCamera.ActiveCam].Mode;
+		if(mode == CCam::MODE_WHEELCAM ||
+		   mode == CCam::MODE_1STPERSON && TheCamera.GetLookDirection() != LOOKING_FORWARD && TheCamera.GetLookDirection() != LOOKING_BEHIND ||
+		   CVisibilityPlugins::GetClumpAlpha(veh->GetClump()) != 255)
+			return false;
+		return true;
+	}else
+		return veh->bTouchingWater;		
+}
+
 void
 CRenderer::RenderEverythingBarRoads(void)
 {
@@ -220,17 +228,20 @@ CRenderer::RenderEverythingBarRoads(void)
 	CVector dist;
 	EntityInfo ei;
 
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	SetCullMode(rwCULLMODECULLBACK);
 	gSortedVehiclesAndPeds.Clear();
 
 	for(i = 0; i < ms_nNoOfVisibleEntities; i++){
 		e = ms_aVisibleEntityPtrs[i];
 
-		if(e->IsBuilding() && ((CBuilding*)e)->GetIsATreadable())
+		if(IsRoad(e))
 			continue;
 
 		if(e->IsVehicle() ||
 		   e->IsPed() && CVisibilityPlugins::GetClumpAlpha((RpClump*)e->m_rwObject) != 255){
-			if(e->IsVehicle() && ((CVehicle*)e)->IsBoat()){
+			if(e->IsVehicle() && PutIntoSortedVehicleList((CVehicle*)e)){
 				ei.ent = e;
 				dist = ms_vecCameraPosition - e->GetPosition();
 				ei.sort = dist.MagnitudeSqr();
@@ -248,34 +259,19 @@ CRenderer::RenderEverythingBarRoads(void)
 }
 
 void
-CRenderer::RenderVehiclesButNotBoats(void)
-{
-	// This function doesn't do anything
-	// because only boats are inserted into the list
-	CLink<EntityInfo> *node;
-
-	for(node = gSortedVehiclesAndPeds.tail.prev;
-	    node != &gSortedVehiclesAndPeds.head;
-	    node = node->prev){
-		// only boats in this list
-		CVehicle *v = (CVehicle*)node->item.ent;
-		if(!v->IsBoat())
-			RenderOneNonRoad(v);
-	}
-}
-
-void
 CRenderer::RenderBoats(void)
 {
 	CLink<EntityInfo> *node;
 
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	SetCullMode(rwCULLMODECULLBACK);
+
 	for(node = gSortedVehiclesAndPeds.tail.prev;
 	    node != &gSortedVehiclesAndPeds.head;
 	    node = node->prev){
-		// only boats in this list
 		CVehicle *v = (CVehicle*)node->item.ent;
-		if(v->IsBoat())
-			RenderOneNonRoad(v);
+		RenderOneNonRoad(v);
 	}
 }
 
@@ -283,12 +279,22 @@ void
 CRenderer::RenderFadingInEntities(void)
 {
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	SetCullMode(rwCULLMODECULLBACK);
 	DeActivateDirectional();
 	SetAmbientColours();
 	CVisibilityPlugins::RenderFadingEntities();
 }
 
 void
+CRenderer::RenderFadingInUnderwaterEntities(void)
+{
+	DeActivateDirectional();
+	SetAmbientColours();
+	CVisibilityPlugins::RenderFadingUnderwaterEntities();
+}
+
+void
 CRenderer::RenderCollisionLines(void)
 {
 	int i;
@@ -332,7 +338,7 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 	float dist;
 
 	bool request = true;
-	if (mi->GetModelType() == MITYPE_TIME) {
+	if(mi->GetModelType() == MITYPE_TIME){
  		ti = (CTimeModelInfo*)mi;
 		other = ti->GetOtherTimeModel();
 		if(CClock::GetIsTimeInRange(ti->GetTimeOn(), ti->GetTimeOff())){
@@ -348,25 +354,35 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 			request = false;
 		}
 	}else{
-		if (mi->GetModelType() != MITYPE_SIMPLE) {
+		if(mi->GetModelType() != MITYPE_SIMPLE && mi->GetModelType() != MITYPE_WEAPON){
 			if(FindPlayerVehicle() == ent &&
-			   TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON){
+			   TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON &&
+			   !(FindPlayerVehicle()->IsBike() && ((CBike*)FindPlayerVehicle())->m_bike_flag80)){
 				// Player's vehicle in first person mode
-				if(TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_FORWARD ||
+				CVehicle *veh = (CVehicle*)ent;
+				int model = veh->GetModelIndex();
+				int direction = TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking;
+				if(direction == LOOKING_FORWARD ||
 				   ent->GetModelIndex() == MI_RHINO ||
 				   ent->GetModelIndex() == MI_COACH ||
-				   TheCamera.m_bInATunnelAndABigVehicle){
+				   TheCamera.m_bInATunnelAndABigVehicle ||
+				   direction == LOOKING_BEHIND && veh->pHandling->Flags & HANDLING_UNKNOWN){
 					ent->bNoBrightHeadLights = true;
-				}else{
+					return VIS_OFFSCREEN;
+				}
+
+				if(direction != LOOKING_BEHIND ||
+				   !veh->IsBoat() || model == MI_REEFER || model == MI_TROPIC || model == MI_PREDATOR || model == MI_SKIMMER){
 					m_pFirstPersonVehicle = (CVehicle*)ent;
 					ent->bNoBrightHeadLights = false;
+					return VIS_OFFSCREEN;
 				}
-				return VIS_OFFSCREEN;
 			}
+
 			// All sorts of Clumps
 			if(ent->m_rwObject == nil || !ent->bIsVisible)
 				return VIS_INVISIBLE;
-			if(!ent->GetIsOnScreen())
+			if(!ent->GetIsOnScreen() || ent->IsEntityOccluded())
 				return VIS_OFFSCREEN;
 			if(ent->bDrawLast){
 				dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
@@ -376,22 +392,36 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 			}
 			return VIS_VISIBLE;
 		}
-		if(ent->IsObject() &&
-		   ((CObject*)ent)->ObjectCreatedBy == TEMP_OBJECT){
+		if(ent->bDontStream){
 			if(ent->m_rwObject == nil || !ent->bIsVisible)
 				return VIS_INVISIBLE;
-			return ent->GetIsOnScreen() ? VIS_VISIBLE : VIS_OFFSCREEN;
+			if(!ent->GetIsOnScreen() || ent->IsEntityOccluded())
+				return VIS_OFFSCREEN;
+			if(ent->bDrawLast){
+				dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
+				CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
+				ent->bDistanceFade = false;
+				return VIS_INVISIBLE;
+			}
+			return VIS_VISIBLE;
 		}
 	}
 
 	// Simple ModelInfo
 
+	if(!IsAreaVisible(ent->m_area))
+		return VIS_INVISIBLE;
+
 	dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
 
-	// This can only happen with multi-atomic models (e.g. railtracks)
-	// but why do we bump up the distance? can only be fading...
-	if(LOD_DISTANCE + STREAM_DISTANCE < dist && dist < mi->GetLargestLodDistance())
-		dist = mi->GetLargestLodDistance();
+#ifndef FIX_BUGS
+	// Whatever this is supposed to do, it breaks fading for objects
+	// whose draw dist is > LOD_DISTANCE-FADE_DISTANCE, i.e. 280
+	// because decreasing dist here makes the object visible above LOD_DISTANCE
+	// before fading normally once below LOD_DISTANCE.
+	if(LOD_DISTANCE < dist && dist < mi->GetLargestLodDistance() + FADE_DISTANCE)
+		dist += mi->GetLargestLodDistance() - LOD_DISTANCE;
+#endif
 
 	if(ent->IsObject() && ent->bRenderDamaged)
 		mi->m_isDamaged = true;
@@ -411,7 +441,7 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 		if(ent->m_rwObject == nil || !ent->bIsVisible)
 			return VIS_INVISIBLE;
 
-		if(!ent->GetIsOnScreen()){
+		if(!ent->GetIsOnScreen() || ent->IsEntityOccluded()){
 			mi->m_alpha = 255;
 			return VIS_OFFSCREEN;
 		}
@@ -423,9 +453,10 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 		}
 
 		if(mi->m_drawLast || ent->bDrawLast){
-			CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
-			ent->bDistanceFade = false;
-			return VIS_INVISIBLE;
+			if(CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist)){
+				ent->bDistanceFade = false;
+				return VIS_INVISIBLE;
+			}
 		}
 		return VIS_VISIBLE;
 	}
@@ -461,7 +492,7 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 	if(ent->m_rwObject == nil || !ent->bIsVisible)
 		return VIS_INVISIBLE;
 
-	if(!ent->GetIsOnScreen()){
+	if(!ent->GetIsOnScreen() || ent->IsEntityOccluded()){
 		mi->m_alpha = 255;
 		return VIS_OFFSCREEN;
 	}else{
@@ -474,19 +505,32 @@ CRenderer::SetupEntityVisibility(CEntity *ent)
 int32
 CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 {
-	CSimpleModelInfo *mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(ent->GetModelIndex());
+	CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(ent->m_modelIndex);
 	CTimeModelInfo *ti;
 	int32 other;
 
-	if (mi->GetModelType() == MITYPE_TIME) {
- 		ti = (CTimeModelInfo*)mi;
+	if(!IsAreaVisible(ent->m_area))
+		return VIS_INVISIBLE;
+
+	bool request = true;
+	if(mi->GetModelType() == MITYPE_TIME){
+		ti = (CTimeModelInfo*)mi;
 		other = ti->GetOtherTimeModel();
-		// Hide objects not in time range if possible
-		if(CANTIMECULL)
-			if(!CClock::GetIsTimeInRange(ti->GetTimeOn(), ti->GetTimeOff()))
+		if(CClock::GetIsTimeInRange(ti->GetTimeOn(), ti->GetTimeOff())){
+			// don't fade in, or between time objects
+			if(CANTIMECULL)
+				ti->m_alpha = 255;
+		}else{
+			// Hide if possible
+			if(CANTIMECULL){
+				ent->DeleteRwObject();
 				return VIS_INVISIBLE;
-		// Draw like normal
-	} else if (mi->GetModelType() == MITYPE_VEHICLE)
+			}
+			// can't cull, so we'll try to draw this one, but don't request
+			// it since what we really want is the other one.
+			request = false;
+		}
+	}else if(mi->GetModelType() == MITYPE_VEHICLE)
 		return ent->IsVisible() ? VIS_VISIBLE : VIS_INVISIBLE;
 
 	float dist = (ms_vecCameraPosition-ent->GetPosition()).Magnitude();
@@ -495,7 +539,7 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 	// Find out whether to draw below near distance.
 	// This is only the case if there is a non-LOD which is either not
 	// loaded or not completely faded in yet.
-	if(dist < mi->GetNearDistance() && dist < LOD_DISTANCE + STREAM_DISTANCE){
+	if(dist < mi->GetNearDistance() && dist < LOD_DISTANCE){
 		// No non-LOD or non-LOD is completely visible.
 		if(nonLOD == nil ||
 		   nonLOD->GetRwObject() && nonLOD->m_alpha == 255)
@@ -503,7 +547,7 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 
 		// But if it is a time object, we'd rather draw the wrong
 		// non-LOD than the right LOD.
-		if (nonLOD->GetModelType() == MITYPE_TIME) {
+		if(nonLOD->GetModelType() == MITYPE_TIME){
 			ti = (CTimeModelInfo*)nonLOD;
 			other = ti->GetOtherTimeModel();
 			if(other != -1 && CModelInfo::GetModelInfo(other)->GetRwObject())
@@ -511,7 +555,7 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 		}
 	}
 
-	RpAtomic *a = mi->GetAtomicFromDistance(dist);
+	RpAtomic *a = mi->GetFirstAtomicFromDistance(dist);
 	if(a){
 		if(ent->m_rwObject == nil)
 			ent->CreateRwObject();
@@ -522,8 +566,18 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 		// that of an atomic for another draw distance.
 		if(RpAtomicGetGeometry(a) != RpAtomicGetGeometry(rwobj))
 			RpAtomicSetGeometry(rwobj, RpAtomicGetGeometry(a), rpATOMICSAMEBOUNDINGSPHERE); // originally 5 (mistake?)
-		if(!ent->IsVisibleComplex())
+		mi->IncreaseAlpha();
+		if(!ent->IsVisibleComplex() || ent->IsEntityOccluded()){
+			mi->m_alpha = 255;
+			return VIS_INVISIBLE;
+		}
+
+		if(mi->m_alpha != 255){
+			CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
+			ent->bDistanceFade = true;
 			return VIS_INVISIBLE;
+		}
+
 		if(mi->m_drawLast){
 			CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
 			ent->bDistanceFade = false;
@@ -539,10 +593,14 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 
 
 	// get faded atomic
-	a = mi->GetAtomicFromDistance(dist - FADE_DISTANCE);
+	a = mi->GetFirstAtomicFromDistance(dist - FADE_DISTANCE);
 	if(a == nil){
-		ent->DeleteRwObject();
-		return VIS_INVISIBLE;
+		if(ent->bStreamBIGBuilding && dist-STREAM_DISTANCE < mi->GetLodDistance(0) && request){
+			return ent->GetIsOnScreen() ? VIS_STREAMME : VIS_INVISIBLE;
+		}else{
+			ent->DeleteRwObject();
+			return VIS_INVISIBLE;
+		}
 	}
 
 	// Fade...
@@ -552,14 +610,21 @@ CRenderer::SetupBigBuildingVisibility(CEntity *ent)
 	RpAtomic *rwobj = (RpAtomic*)ent->m_rwObject;
 	if(RpAtomicGetGeometry(a) != RpAtomicGetGeometry(rwobj))
 		RpAtomicSetGeometry(rwobj, RpAtomicGetGeometry(a), rpATOMICSAMEBOUNDINGSPHERE); // originally 5 (mistake?)
-	if(ent->IsVisibleComplex())
-		CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
+	mi->IncreaseAlpha();
+	if(!ent->IsVisibleComplex() || ent->IsEntityOccluded()){
+		mi->m_alpha = 255;
+		return VIS_INVISIBLE;
+	}
+	CVisibilityPlugins::InsertEntityIntoSortedList(ent, dist);
+	ent->bDistanceFade = true;
 	return VIS_INVISIBLE;
 }
 
 void
 CRenderer::ConstructRenderList(void)
 {
+	COcclusion::ProcessBeforeRendering();
+
 	ms_nNoOfVisibleEntities = 0;
 	ms_nNoOfInVisibleEntities = 0;
 	ms_vecCameraPosition = TheCamera.GetPosition();
@@ -619,6 +684,15 @@ CRenderer::ScanWorld(void)
 	CVisibilityPlugins::InitAlphaEntityList();
 	CWorld::AdvanceCurrentScanCode();
 
+	// unused
+	static CVector prevPos;
+	static CVector prevFwd;
+	static bool smallMovement;
+	smallMovement = (TheCamera.GetPosition() - prevPos).MagnitudeSqr() < SQR(4.0f) &&
+		DotProduct(TheCamera.GetForward(), prevFwd) > 0.98f;
+	prevPos = TheCamera.GetPosition();
+	prevFwd = TheCamera.GetForward();
+
 	if(cammatrix->at.z > 0.0f){
 		// looking up, bottom corners are further away
 		vectors[CORNER_LOD_LEFT] = vectors[CORNER_FAR_BOTLEFT] * LOD_DISTANCE/f;
@@ -664,6 +738,7 @@ CRenderer::ScanWorld(void)
 			for(int y = y1; y <= y2; y++)
 				ScanSectorList(CWorld::GetSector(x1, y)->m_lists);
 	}else{
+#ifdef GTA_TRAIN
 		CVehicle *train = FindPlayerTrain();
 		if(train && train->GetPosition().z < 0.0f){
 			poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
@@ -673,7 +748,9 @@ CRenderer::ScanWorld(void)
 			poly[2].x = CWorld::GetSectorX(vectors[CORNER_LOD_RIGHT].x);
 			poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
 			ScanSectorPoly(poly, 3, ScanSectorList_Subway);
-		}else{
+		}else
+#endif
+		{
 			if(f <= LOD_DISTANCE){
 				poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
 				poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
@@ -701,7 +778,7 @@ CRenderer::ScanWorld(void)
 			}
 			ScanSectorPoly(poly, 3, ScanSectorList);
 
-			ScanBigBuildingList(CWorld::GetBigBuildingList(CCollision::ms_collisionInMemory));
+			ScanBigBuildingList(CWorld::GetBigBuildingList(CGame::currLevel));
 			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_NONE));
 		}
 	}
@@ -733,6 +810,7 @@ CRenderer::RequestObjectsInFrustum(void)
 	cammatrix = RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera));
 
 	CWorld::AdvanceCurrentScanCode();
+	ms_vecCameraPosition = TheCamera.GetPosition();
 
 	if(cammatrix->at.z > 0.0f){
 		// looking up, bottom corners are further away
@@ -945,11 +1023,26 @@ CRenderer::ScanBigBuildingList(CPtrList &list)
 {
 	CPtrNode *node;
 	CEntity *ent;
+	int vis;
 
+	int f = CTimer::GetFrameCounter() & 3;
 	for(node = list.first; node; node = node->next){
 		ent = (CEntity*)node->item;
-		if(!ent->bZoneCulled && SetupBigBuildingVisibility(ent) == VIS_VISIBLE)
+		if(ent->bOffscreen || (ent->m_randomSeed&3) != f){
+			ent->bOffscreen = true;
+			vis = SetupBigBuildingVisibility(ent);
+		}else
+			vis = VIS_VISIBLE;
+		switch(vis){
+		case VIS_VISIBLE:
 			ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
+			ent->bOffscreen = false;
+			break;
+		case VIS_STREAMME:
+			if(!CStreaming::ms_disableStreaming)
+				CStreaming::RequestModel(ent->GetModelIndex(), 0);
+			break;
+		}
 	}
 }
 
@@ -969,35 +1062,30 @@ CRenderer::ScanSectorList(CPtrList *lists)
 			if(ent->m_scanCode == CWorld::GetCurrentScanCode())
 				continue;	// already seen
 			ent->m_scanCode = CWorld::GetCurrentScanCode();
+			ent->bOffscreen = false;
 
-			if(IsEntityCullZoneVisible(ent))
-				switch(SetupEntityVisibility(ent)){
-				case VIS_VISIBLE:
-					ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
-					break;
-				case VIS_INVISIBLE:
-					if(!IsGlass(ent->GetModelIndex()))
-						break;
-					// fall through
-				case VIS_OFFSCREEN:
-					dx = ms_vecCameraPosition.x - ent->GetPosition().x;
-					dy = ms_vecCameraPosition.y - ent->GetPosition().y;
-					if(dx > -65.0f && dx < 65.0f &&
-					   dy > -65.0f && dy < 65.0f &&
-					   ms_nNoOfInVisibleEntities < NUMINVISIBLEENTITIES - 1)
-						ms_aInVisibleEntityPtrs[ms_nNoOfInVisibleEntities++] = ent;
-					break;
-				case VIS_STREAMME:
-					if(!CStreaming::ms_disableStreaming)
-						if(!m_loadingPriority || CStreaming::ms_numModelsRequested < 10)
-							CStreaming::RequestModel(ent->GetModelIndex(), 0);
+			switch(SetupEntityVisibility(ent)){
+			case VIS_VISIBLE:
+				ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
+				break;
+			case VIS_INVISIBLE:
+				if(!IsGlass(ent->GetModelIndex()))
 					break;
-				}
-			else if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){
+				// fall through
+			case VIS_OFFSCREEN:
+				ent->bOffscreen = true;
+				dx = ms_vecCameraPosition.x - ent->GetPosition().x;
+				dy = ms_vecCameraPosition.y - ent->GetPosition().y;
+				if(dx > -30.0f && dx < 30.0f &&
+				   dy > -30.0f && dy < 30.0f &&
+				   ms_nNoOfInVisibleEntities < NUMINVISIBLEENTITIES - 1)
+					ms_aInVisibleEntityPtrs[ms_nNoOfInVisibleEntities++] = ent;
+				break;
+			case VIS_STREAMME:
 				if(!CStreaming::ms_disableStreaming)
-					if(SetupEntityVisibility(ent) == VIS_STREAMME)
-						if(!m_loadingPriority || CStreaming::ms_numModelsRequested < 10)
-							CStreaming::RequestModel(ent->GetModelIndex(), 0);
+					if(!m_loadingPriority || CStreaming::ms_numModelsRequested < 10)
+						CStreaming::RequestModel(ent->GetModelIndex(), 0);
+				break;
 			}
 		}
 	}
@@ -1019,41 +1107,38 @@ CRenderer::ScanSectorList_Priority(CPtrList *lists)
 			if(ent->m_scanCode == CWorld::GetCurrentScanCode())
 				continue;	// already seen
 			ent->m_scanCode = CWorld::GetCurrentScanCode();
+			ent->bOffscreen = false;
 
-			if(IsEntityCullZoneVisible(ent))
-				switch(SetupEntityVisibility(ent)){
-				case VIS_VISIBLE:
-					ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
-					break;
-				case VIS_INVISIBLE:
-					if(!IsGlass(ent->GetModelIndex()))
-						break;
-					// fall through
-				case VIS_OFFSCREEN:
-					dx = ms_vecCameraPosition.x - ent->GetPosition().x;
-					dy = ms_vecCameraPosition.y - ent->GetPosition().y;
-					if(dx > -65.0f && dx < 65.0f &&
-					   dy > -65.0f && dy < 65.0f &&
-					   ms_nNoOfInVisibleEntities < NUMINVISIBLEENTITIES - 1)
-						ms_aInVisibleEntityPtrs[ms_nNoOfInVisibleEntities++] = ent;
-					break;
-				case VIS_STREAMME:
-					if(!CStreaming::ms_disableStreaming){
-						CStreaming::RequestModel(ent->GetModelIndex(), 0);
-						if(CStreaming::ms_aInfoForModel[ent->GetModelIndex()].m_loadState != STREAMSTATE_LOADED)
-							m_loadingPriority = true;
-					}
+			switch(SetupEntityVisibility(ent)){
+			case VIS_VISIBLE:
+				ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
+				break;
+			case VIS_INVISIBLE:
+				if(!IsGlass(ent->GetModelIndex()))
 					break;
+				// fall through
+			case VIS_OFFSCREEN:
+				ent->bOffscreen = true;
+				dx = ms_vecCameraPosition.x - ent->GetPosition().x;
+				dy = ms_vecCameraPosition.y - ent->GetPosition().y;
+				if(dx > -30.0f && dx < 30.0f &&
+				   dy > -30.0f && dy < 30.0f &&
+				   ms_nNoOfInVisibleEntities < NUMINVISIBLEENTITIES - 1)
+					ms_aInVisibleEntityPtrs[ms_nNoOfInVisibleEntities++] = ent;
+				break;
+			case VIS_STREAMME:
+				if(!CStreaming::ms_disableStreaming){
+					CStreaming::RequestModel(ent->GetModelIndex(), 0);
+					if(CStreaming::ms_aInfoForModel[ent->GetModelIndex()].m_loadState != STREAMSTATE_LOADED)
+						m_loadingPriority = true;
 				}
-			else if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){
-				if(!CStreaming::ms_disableStreaming)
-					if(SetupEntityVisibility(ent) == VIS_STREAMME)
-						CStreaming::RequestModel(ent->GetModelIndex(), 0);
+				break;
 			}
 		}
 	}
 }
 
+#ifdef GTA_TRAIN
 void
 CRenderer::ScanSectorList_Subway(CPtrList *lists)
 {
@@ -1070,15 +1155,17 @@ CRenderer::ScanSectorList_Subway(CPtrList *lists)
 			if(ent->m_scanCode == CWorld::GetCurrentScanCode())
 				continue;	// already seen
 			ent->m_scanCode = CWorld::GetCurrentScanCode();
+			ent->bOffscreen = false;
 			switch(SetupEntityVisibility(ent)){
 			case VIS_VISIBLE:
 				ms_aVisibleEntityPtrs[ms_nNoOfVisibleEntities++] = ent;
 				break;
 			case VIS_OFFSCREEN:
+				ent->bOffscreen = true;
 				dx = ms_vecCameraPosition.x - ent->GetPosition().x;
 				dy = ms_vecCameraPosition.y - ent->GetPosition().y;
-				if(dx > -65.0f && dx < 65.0f &&
-				   dy > -65.0f && dy < 65.0f &&
+				if(dx > -30.0f && dx < 30.0f &&
+				   dy > -30.0f && dy < 30.0f &&
 				   ms_nNoOfInVisibleEntities < NUMINVISIBLEENTITIES - 1)
 					ms_aInVisibleEntityPtrs[ms_nNoOfInVisibleEntities++] = ent;
 				break;
@@ -1086,6 +1173,7 @@ CRenderer::ScanSectorList_Subway(CPtrList *lists)
 		}
 	}
 }
+#endif
 
 void
 CRenderer::ScanSectorList_RequestModels(CPtrList *lists)
@@ -1102,8 +1190,7 @@ CRenderer::ScanSectorList_RequestModels(CPtrList *lists)
 			if(ent->m_scanCode == CWorld::GetCurrentScanCode())
 				continue;	// already seen
 			ent->m_scanCode = CWorld::GetCurrentScanCode();
-			if(IsEntityCullZoneVisible(ent))
-			if(ShouldModelBeStreamed(ent))
+			if(ShouldModelBeStreamed(ent, ms_vecCameraPosition))
 				CStreaming::RequestModel(ent->GetModelIndex(), 0);
 		}
 	}
@@ -1138,70 +1225,29 @@ CRenderer::SortBIGBuildingsForSectorList(CPtrList *list)
 }
 
 bool
-CRenderer::ShouldModelBeStreamed(CEntity *ent)
+CRenderer::ShouldModelBeStreamed(CEntity *ent, const CVector &campos)
 {
-	CSimpleModelInfo *mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(ent->GetModelIndex());
-	float dist = (ent->GetPosition() - ms_vecCameraPosition).Magnitude();
+	if(!IsAreaVisible(ent->m_area))
+		return false;
+	CTimeModelInfo *mi = (CTimeModelInfo *)CModelInfo::GetModelInfo(ent->GetModelIndex());
+	if(mi->GetModelType() == MITYPE_TIME)
+		if(!CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff()))
+			return false;
+	float dist = (ent->GetPosition() - campos).Magnitude();
 	if(mi->m_noFade)
 		return dist - STREAM_DISTANCE < mi->GetLargestLodDistance();
 	else
 		return dist - FADE_DISTANCE - STREAM_DISTANCE < mi->GetLargestLodDistance();
 }
 
-bool
-CRenderer::IsEntityCullZoneVisible(CEntity *ent)
-{
-	CPed *ped;
-	CObject *obj;
-
-	if(ent->bZoneCulled)
-		return false;
-
-	switch(ent->GetType()){
-	case ENTITY_TYPE_VEHICLE:
-		return IsVehicleCullZoneVisible(ent);
-	case ENTITY_TYPE_PED:
-		ped = (CPed*)ent;
-		if (ped->bInVehicle) {
-			if (ped->m_pMyVehicle)
-				return IsVehicleCullZoneVisible(ped->m_pMyVehicle);
-			else
-				return true;
-		}
-		return !(ped->m_pCurSurface && ped->m_pCurSurface->bZoneCulled2);
-	case ENTITY_TYPE_OBJECT:
-		obj = (CObject*)ent;
-		if(!obj->IsStatic())
-			return true;
-		return !(obj->m_pCurSurface && obj->m_pCurSurface->bZoneCulled2);
-	default: break;
-	}
-	return true;
-}
-
-bool
-CRenderer::IsVehicleCullZoneVisible(CEntity *ent)
-{
-	CVehicle *v = (CVehicle*)ent;
-	switch(v->GetStatus()) {
-	case STATUS_SIMPLE:
-	case STATUS_PHYSICS:
-	case STATUS_ABANDONED:
-	case STATUS_WRECKED:
-		return !(v->m_pCurGroundEntity && v->m_pCurGroundEntity->bZoneCulled2);
-	default: break;
-	}
-	return true;
-}
-
 void
 CRenderer::RemoveVehiclePedLights(CEntity *ent, bool reset)
 {
-	if(ent->bRenderScorched){
-		WorldReplaceScorchedLightsWithNormal(Scene.world);
-		return;
+	if(!ent->bRenderScorched){
+		CPointLights::RemoveLightsAffectingObject();
+		if(reset)
+			ReSetAmbientAndDirectionalColours();
 	}
-	CPointLights::RemoveLightsAffectingObject();
-	if(reset)
-		ReSetAmbientAndDirectionalColours();
+	SetAmbientColours();
+	DeActivateDirectional();
 }
diff --git a/src/render/Renderer.h b/src/render/Renderer.h
index 362741e3..e9f82078 100644
--- a/src/render/Renderer.h
+++ b/src/render/Renderer.h
@@ -2,11 +2,8 @@
 
 class CEntity;
 
-extern bool gbShowPedRoadGroups;
-extern bool gbShowCarRoadGroups;
 extern bool gbShowCollisionPolys;
 extern bool gbShowCollisionLines;
-extern bool gbShowCullZoneDebugStuff;
 extern bool gbBigWhiteDebugLightSwitchedOn;
 
 extern bool gbDontRenderBuildings;
@@ -38,8 +35,8 @@ public:
 
 	static void RenderRoads(void);
 	static void RenderFadingInEntities(void);
+	static void RenderFadingInUnderwaterEntities(void);
 	static void RenderEverythingBarRoads(void);
-	static void RenderVehiclesButNotBoats(void);
 	static void RenderBoats(void);
 	static void RenderOneRoad(CEntity *);
 	static void RenderOneNonRoad(CEntity *);
@@ -63,9 +60,7 @@ public:
 	static void SortBIGBuildings(void);
 	static void SortBIGBuildingsForSectorList(CPtrList *list);
 
-	static bool ShouldModelBeStreamed(CEntity *ent);
-	static bool IsEntityCullZoneVisible(CEntity *ent);
-	static bool IsVehicleCullZoneVisible(CEntity *ent);
+	static bool ShouldModelBeStreamed(CEntity *ent, const CVector &campos);
 
 	static void RemoveVehiclePedLights(CEntity *ent, bool reset);
 };
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index d07c302a..fac35aeb 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -18,6 +18,7 @@
 #endif
 #include "PointLights.h"
 #include "SpecialFX.h"
+#include "Script.h"
 #include "Shadows.h"
 
 #ifdef DEBUGMENU
@@ -1766,6 +1767,6 @@ CShadows::RenderIndicatorShadow(uint32 nID, uint8 ShadowType, RwTexture *pTextur
 	ASSERT(pPosn != NULL);
 
 	C3dMarkers::PlaceMarkerSet(nID, _TODOCONST(4), *pPosn, Max(fFrontX, -fSideY),
-			0, 128, 255, 128,
-			2048, 0.2f, 0);
+		SPHERE_MARKER_R, SPHERE_MARKER_G, SPHERE_MARKER_B,
+		SPHERE_MARKER_A, SPHERE_MARKER_PULSE_PERIOD, 0.2f, 0);
 }
diff --git a/src/render/Skidmarks.cpp b/src/render/Skidmarks.cpp
index 5d521041..efd88387 100644
--- a/src/render/Skidmarks.cpp
+++ b/src/render/Skidmarks.cpp
@@ -11,8 +11,6 @@ CSkidmark CSkidmarks::aSkidmarks[NUMSKIDMARKS];
 RwImVertexIndex SkidmarkIndexList[SKIDMARK_LENGTH * 6];
 RwIm3DVertex SkidmarkVertices[SKIDMARK_LENGTH * 2];
 RwTexture *gpSkidTex;
-RwTexture *gpSkidBloodTex;
-RwTexture *gpSkidMudTex;
 
 void
 CSkidmarks::Init(void)
@@ -22,8 +20,6 @@ CSkidmarks::Init(void)
 	slot = CTxdStore::FindTxdSlot("particle");
 	CTxdStore::SetCurrentTxd(slot);
 	gpSkidTex = RwTextureRead("particleskid", nil);
-	gpSkidBloodTex = RwTextureRead("particleskidblood", nil);
-	gpSkidMudTex = RwTextureRead("particleskidmud", nil);
 	CTxdStore::PopCurrentTxd();
 
 	for(i = 0; i < NUMSKIDMARKS; i++){
@@ -54,17 +50,7 @@ void
 CSkidmarks::Shutdown(void)
 {
 	RwTextureDestroy(gpSkidTex);
-#ifdef GTA3_1_1_PATCH
 	gpSkidTex = nil;
-#endif
-	RwTextureDestroy(gpSkidBloodTex);
-#ifdef GTA3_1_1_PATCH
-	gpSkidBloodTex = nil;
-#endif
-	RwTextureDestroy(gpSkidMudTex);
-#ifdef GTA3_1_1_PATCH
-	gpSkidMudTex = nil;
-#endif
 }
 
 void
@@ -116,32 +102,23 @@ void
 CSkidmarks::Render(void)
 {
 	int i, j;
-	RwTexture *lastTex = nil;
 
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
 	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpSkidTex));
 
 	for(i = 0; i < NUMSKIDMARKS; i++){
 		if(aSkidmarks[i].m_state == 0 || aSkidmarks[i].m_last < 1)
 			continue;
 
-		if(aSkidmarks[i].m_isBloody){
-			if(lastTex != gpSkidBloodTex){
-				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpSkidBloodTex));
-				lastTex = gpSkidBloodTex;
-			}
-		}else if(aSkidmarks[i].m_isMuddy){
-			if(lastTex != gpSkidMudTex){
-				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpSkidMudTex));
-				lastTex = gpSkidMudTex;
-			}
-		}else{
-			if(lastTex != gpSkidTex){
-				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpSkidTex));
-				lastTex = gpSkidTex;
-			}
+		CRGBA color(0, 0, 0, 255);
+		switch(aSkidmarks[i].m_type){
+		case SKIDMARK_NORMAL: color = CRGBA(0, 0, 0, 255); break;
+		case SKIDMARK_MUDDY: color = CRGBA(90, 62, 9, 255); break;
+		case SKIDMARK_SANDY: color = CRGBA(108, 108, 96, 255); break;
+		case SKIDMARK_BLOODY: color = CRGBA(132, 34, 11, 255); break;
 		}
 
 		uint32 fade, alpha;
@@ -156,11 +133,15 @@ CSkidmarks::Render(void)
 				alpha = 0;
 			alpha = alpha*fade/256;
 
-			CVector p1 = aSkidmarks[i].m_pos[j] + aSkidmarks[i].m_side[j];
-			CVector p2 = aSkidmarks[i].m_pos[j] - aSkidmarks[i].m_side[j];
-			RwIm3DVertexSetRGBA(&SkidmarkVertices[j*2+0], 255, 255, 255, alpha);
+			CVector p1 = aSkidmarks[i].m_pos[j];
+			p1.x += aSkidmarks[i].m_sideX[j];
+			p1.y += aSkidmarks[i].m_sideY[j];
+			CVector p2 = aSkidmarks[i].m_pos[j];
+			p2.x -= aSkidmarks[i].m_sideX[j];
+			p2.y -= aSkidmarks[i].m_sideY[j];
+			RwIm3DVertexSetRGBA(&SkidmarkVertices[j*2+0], color.red, color.green, color.blue, alpha);
 			RwIm3DVertexSetPos(&SkidmarkVertices[j*2+0], p1.x, p1.y, p1.z+0.1f);
-			RwIm3DVertexSetRGBA(&SkidmarkVertices[j*2+1], 255, 255, 255, alpha);
+			RwIm3DVertexSetRGBA(&SkidmarkVertices[j*2+1], color.red, color.green, color.blue, alpha);
 			RwIm3DVertexSetPos(&SkidmarkVertices[j*2+1], p2.x, p2.y, p2.z+0.1f);
 		}
 
@@ -177,7 +158,20 @@ CSkidmarks::Render(void)
 }
 
 void
-CSkidmarks::RegisterOne(uintptr id, CVector pos, float fwdX, float fwdY, bool *isMuddy, bool *isBloody)
+CSkidmarks::RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, bool *isMuddy, bool *isBloody)
+{
+	eSkidmarkType type;
+	if(*isBloody)
+		type = SKIDMARK_BLOODY;
+	else if(*isMuddy)
+		type = SKIDMARK_MUDDY;
+	else
+		type = SKIDMARK_NORMAL;
+	RegisterOne(id, pos, fwdX, fwdY, type, isBloody);
+}
+
+void
+CSkidmarks::RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, eSkidmarkType type, bool *isBloody)
 {
 	int i;
 	CVector2D fwd(fwdX, fwdY);
@@ -193,7 +187,7 @@ CSkidmarks::RegisterOne(uintptr id, CVector pos, float fwdX, float fwdY, bool *i
 	if(i < NUMSKIDMARKS){
 		// Continue this one
 
-		if(aSkidmarks[i].m_isBloody != *isBloody){
+		if((aSkidmarks[i].m_type==SKIDMARK_BLOODY) != *isBloody){
 			// Blood-status changed, end this one
 			aSkidmarks[i].m_state = 2;
 			aSkidmarks[i].m_fadeStart = CTimer::GetTimeInMilliseconds() + 10000;
@@ -223,14 +217,17 @@ CSkidmarks::RegisterOne(uintptr id, CVector pos, float fwdX, float fwdY, bool *i
 		aSkidmarks[i].m_pos[aSkidmarks[i].m_last] = pos;
 
 		CVector2D dist = aSkidmarks[i].m_pos[aSkidmarks[i].m_last] - aSkidmarks[i].m_pos[aSkidmarks[i].m_last-1];
-		dist.NormaliseSafe();
-		fwd.NormaliseSafe();
+		dist.Normalise();
+		fwd.Normalise();
 		CVector2D right(dist.y, -dist.x);
 		float turn = DotProduct2D(fwd, right);
 		turn = Abs(turn) + 1.0f;
-		aSkidmarks[i].m_side[aSkidmarks[i].m_last] = CVector(right.x, right.y, 0.0f) * turn * 0.125f;
-		if(aSkidmarks[i].m_last == 1)
-			aSkidmarks[i].m_side[0] = aSkidmarks[i].m_side[1];
+		aSkidmarks[i].m_sideX[aSkidmarks[i].m_last] = right.x * turn * 0.125f;
+		aSkidmarks[i].m_sideY[aSkidmarks[i].m_last] = right.y * turn * 0.125f;
+		if(aSkidmarks[i].m_last == 1){
+			aSkidmarks[i].m_sideX[0] = aSkidmarks[i].m_sideX[1];
+			aSkidmarks[i].m_sideY[0] = aSkidmarks[i].m_sideY[1];
+		}
 
 		if(aSkidmarks[i].m_last > 8)
 			*isBloody = false;	// stop blood marks after 8
@@ -246,12 +243,15 @@ CSkidmarks::RegisterOne(uintptr id, CVector pos, float fwdX, float fwdY, bool *i
 		aSkidmarks[i].m_state = 1;
 		aSkidmarks[i].m_id = id;
 		aSkidmarks[i].m_pos[0] = pos;
-		aSkidmarks[i].m_side[0] = CVector(0.0f, 0.0f, 0.0f);
+		aSkidmarks[i].m_sideX[0] = 0.0f;
+		aSkidmarks[i].m_sideY[0] = 0.0f;
 		aSkidmarks[i].m_wasUpdated = true;
 		aSkidmarks[i].m_last = 0;
 		aSkidmarks[i].m_lastUpdate = CTimer::GetTimeInMilliseconds() - 1000;
-		aSkidmarks[i].m_isBloody = *isBloody;
-		aSkidmarks[i].m_isMuddy = *isMuddy;
+		if(*isBloody)
+			aSkidmarks[i].m_type = SKIDMARK_BLOODY;
+		else
+			aSkidmarks[i].m_type = type;
 	}else
 		*isBloody = false;	// stop blood marks if no space
 }
diff --git a/src/render/Skidmarks.h b/src/render/Skidmarks.h
index c061782d..28082f08 100644
--- a/src/render/Skidmarks.h
+++ b/src/render/Skidmarks.h
@@ -2,20 +2,28 @@
 
 enum { SKIDMARK_LENGTH = 16 };
 
+enum eSkidmarkType
+{
+	SKIDMARK_NORMAL,
+	SKIDMARK_MUDDY,
+	SKIDMARK_SANDY,
+	SKIDMARK_BLOODY
+};
+
 class CSkidmark
 {
 public:
-	uint8 m_state;
-	bool m_wasUpdated;
-	bool m_isBloody;
-	bool m_isMuddy;
+	CVector m_pos[SKIDMARK_LENGTH];
+	float m_sideX[SKIDMARK_LENGTH];
+	float m_sideY[SKIDMARK_LENGTH];
 	uintptr m_id;
-	int16 m_last;
 	uint32 m_lastUpdate;
 	uint32 m_fadeStart;
 	uint32 m_fadeEnd;
-	CVector m_pos[SKIDMARK_LENGTH];
-	CVector m_side[SKIDMARK_LENGTH];
+	uint32 m_type;
+	int16 m_last;
+	uint8 m_state;
+	bool m_wasUpdated;
 };
 
 class CSkidmarks
@@ -28,5 +36,6 @@ public:
 	static void Clear(void);
 	static void Update(void);
 	static void Render(void);
-	static void RegisterOne(uintptr id, CVector pos, float fwdX, float fwdY, bool *isMuddy, bool *isBloody);
+	static void RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, eSkidmarkType type, bool *isBloody);
+	static void RegisterOne(uintptr id, const CVector &pos, float fwdX, float fwdY, bool *isMuddy, bool *isBloody);
 };
diff --git a/src/render/SpecialFX.cpp b/src/render/SpecialFX.cpp
index 6a42f9d1..4133e2fb 100644
--- a/src/render/SpecialFX.cpp
+++ b/src/render/SpecialFX.cpp
@@ -28,6 +28,7 @@ RwImVertexIndex StreakIndexList[12];
 RwIm3DVertex TraceVertices[6];
 RwImVertexIndex TraceIndexList[12];
 
+bool CSpecialFX::bSnapShotActive;
 
 void
 CSpecialFX::Init(void)
diff --git a/src/render/SpecialFX.h b/src/render/SpecialFX.h
index 2d9f18b1..7bc3750a 100644
--- a/src/render/SpecialFX.h
+++ b/src/render/SpecialFX.h
@@ -3,6 +3,8 @@
 class CSpecialFX
 {
 public:
+	static bool bSnapShotActive;
+
 	static void Render(void);
 	static void Update(void);
 	static void Init(void);
diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp
index 0789769a..a6d2db7b 100644
--- a/src/render/Sprite.cpp
+++ b/src/render/Sprite.cpp
@@ -267,8 +267,8 @@ CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(float x, float y, float z,
 {
 	m_bFlushSpriteBufferSwitchZTest = 0;
 	// TODO: replace with lookup
-	float c = Cos(DEGTORAD(rotation));
-	float s = Sin(DEGTORAD(rotation));
+	float c = Cos(rotation);
+	float s = Sin(rotation);
 
 	float xs[4];
 	float ys[4];
@@ -580,8 +580,8 @@ CSprite::RenderBufferedOneXLUSprite2D_Rotate_Dimension(float x, float y, float w
 {
 	m_bFlushSpriteBufferSwitchZTest = 1;
 	CRGBA col(intens * colour.red >> 8, intens * colour.green >> 8, intens * colour.blue >> 8, alpha);
-	float c = Cos(DEGTORAD(rotation));
-	float s = Sin(DEGTORAD(rotation));
+	float c = Cos(rotation);
+	float s = Sin(rotation);
 
 	Set6Vertices2D(&SpriteBufferVerts[6 * nSpriteBufferIndex],
 		x + c*w - s*h,
diff --git a/src/render/Sprite.h b/src/render/Sprite.h
index ec4c1d1b..fae6684e 100644
--- a/src/render/Sprite.h
+++ b/src/render/Sprite.h
@@ -7,6 +7,9 @@ class CSprite
 	static float m_fRecipNearClipPlane;
 	static int32 m_bFlushSpriteBufferSwitchZTest;
 public:
+	static float GetNearScreenZ(void) { return m_f2DNearScreenZ; }
+	static float GetFarScreenZ(void) { return m_f2DFarScreenZ; }
+
 	static float CalcHorizonCoors(void);
 	static bool CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip);
 	static void InitSpriteBuffer(void);
diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp
index 52b85018..2675c95f 100644
--- a/src/render/Sprite2d.cpp
+++ b/src/render/Sprite2d.cpp
@@ -4,11 +4,11 @@
 #include "Draw.h"
 #include "Camera.h"
 #include "Sprite2d.h"
+#include "Font.h"
 
 RwIm2DVertex CSprite2d::maVertices[8];
 float CSprite2d::RecipNearClip;
 int32 CSprite2d::mCurrentBank;
-RwTexture *CSprite2d::mpBankTextures[10];
 int32 CSprite2d::mCurrentSprite[10];
 int32 CSprite2d::mBankStart[10];
 RwIm2DVertex CSprite2d::maBankVertices[500];
@@ -16,7 +16,7 @@ RwIm2DVertex CSprite2d::maBankVertices[500];
 void
 CSprite2d::SetRecipNearClip(void)
 {
-	RecipNearClip = 1.0f / RwCameraGetNearClipPlane(Scene.camera);
+	// Used but empty in VC, instead they set in InitPerFrame. Isn't that great?
 }
 
 void
@@ -24,17 +24,15 @@ CSprite2d::InitPerFrame(void)
 {
 	int i;
 
+	RecipNearClip = 1.0f / RwCameraGetNearClipPlane(Scene.camera);
 	mCurrentBank = 0;
 	for(i = 0; i < 10; i++)
 		mCurrentSprite[i] = 0;
-	for(i = 0; i < 10; i++)
-		mpBankTextures[i] = nil;
 }
 
 int32
 CSprite2d::GetBank(int32 n, RwTexture *tex)
 {
-	mpBankTextures[mCurrentBank] = tex;
 	mCurrentSprite[mCurrentBank] = 0;
 	mBankStart[mCurrentBank+1] = mBankStart[mCurrentBank] + n;
 	return mCurrentBank++;
@@ -59,13 +57,14 @@ CSprite2d::DrawBank(int32 bank)
 {
 	if(mCurrentSprite[bank] == 0)
 		return;
-	RwRenderStateSet(rwRENDERSTATETEXTURERASTER,
-		mpBankTextures[bank] ? RwTextureGetRaster(mpBankTextures[bank]) : nil);
+
+	// This is hacked III function to make it work with VC frontend.
+	CFont::Sprite[bank].SetRenderState();
 	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
 	RwIm2DRenderPrimitive(rwPRIMTYPETRILIST, &maBankVertices[6*mBankStart[bank]], 6*mCurrentSprite[bank]);
 	mCurrentSprite[bank] = 0;
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
+	//RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
 }
 
 
@@ -151,7 +150,6 @@ CSprite2d::Draw(float x1, float y1, float x2, float y2, float x3, float y3, floa
 	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::maVertices, 4);
 }
 
-
 // Arguments:
 // 2---3
 // |   |
@@ -461,6 +459,22 @@ CSprite2d::DrawRectXLU(const CRect &r, const CRGBA &c0, const CRGBA &c1, const C
 	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
 }
 
+void
+CSprite2d::DrawAnyRect(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4,
+		const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3)
+{
+	SetVertices(x1, y1, x2, y2, x3, y3, x4, y4, c0, c1, c2, c3);
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEGOURAUD);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)(c0.alpha != 255 || c1.alpha != 255 || c2.alpha != 255 || c3.alpha != 255));
+	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::maVertices, 4);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATESHADEMODE, (void*)rwSHADEMODEGOURAUD);
+}
+
 void CSprite2d::Draw2DPolygon(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, const CRGBA &color)
 {
 	SetVertices(x1, y1, x2, y2, x3, y3, x4, y4, color, color, color, color);
diff --git a/src/render/Sprite2d.h b/src/render/Sprite2d.h
index 0e12d441..04b40591 100644
--- a/src/render/Sprite2d.h
+++ b/src/render/Sprite2d.h
@@ -46,6 +46,8 @@ public:
 	static void DrawRect(const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3);
 	static void DrawRect(const CRect &r, const CRGBA &col);
 	static void DrawRectXLU(const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3);
+	static void DrawAnyRect(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4,
+		const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3);
 
 	static void Draw2DPolygon(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, const CRGBA &color);
 
diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp
index 1989db5c..bf55d7bc 100644
--- a/src/render/Timecycle.cpp
+++ b/src/render/Timecycle.cpp
@@ -10,9 +10,20 @@
 #include "FileMgr.h"
 #include "Timecycle.h"
 
+// TODO(MIAMI): change some of the types here
+
 int   CTimeCycle::m_nAmbientRed[NUMHOURS][NUMWEATHERS];
 int   CTimeCycle::m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
 int   CTimeCycle::m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientRed_Obj[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientGreen_Obj[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientBlue_Obj[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientRed_Bl[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientGreen_Bl[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientBlue_Bl[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientRed_Obj_Bl[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientGreen_Obj_Bl[NUMHOURS][NUMWEATHERS];
+int   CTimeCycle::m_nAmbientBlue_Obj_Bl[NUMHOURS][NUMWEATHERS];
 int   CTimeCycle::m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
 int   CTimeCycle::m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
 int   CTimeCycle::m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
@@ -33,7 +44,7 @@ float CTimeCycle::m_fSpriteSize[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fSpriteBrightness[NUMHOURS][NUMWEATHERS];
 short CTimeCycle::m_nShadowStrength[NUMHOURS][NUMWEATHERS];
 short CTimeCycle::m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
-short CTimeCycle::m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
+short CTimeCycle::m_nPoleShadowStrength[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fFogStart[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fFarClip[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fLightsOnGroundBrightness[NUMHOURS][NUMWEATHERS];
@@ -49,11 +60,24 @@ int   CTimeCycle::m_nFluffyCloudsBottomBlue[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurRed[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurGreen[NUMHOURS][NUMWEATHERS];
 float CTimeCycle::m_fBlurBlue[NUMHOURS][NUMWEATHERS];
-float CTimeCycle::m_fBlurAlpha[NUMHOURS][NUMWEATHERS];
+float CTimeCycle::m_fWaterRed[NUMHOURS][NUMWEATHERS];
+float CTimeCycle::m_fWaterGreen[NUMHOURS][NUMWEATHERS];
+float CTimeCycle::m_fWaterBlue[NUMHOURS][NUMWEATHERS];
+float CTimeCycle::m_fWaterAlpha[NUMHOURS][NUMWEATHERS];
+
 
 float CTimeCycle::m_fCurrentAmbientRed;
 float CTimeCycle::m_fCurrentAmbientGreen;
 float CTimeCycle::m_fCurrentAmbientBlue;
+float CTimeCycle::m_fCurrentAmbientRed_Obj;
+float CTimeCycle::m_fCurrentAmbientGreen_Obj;
+float CTimeCycle::m_fCurrentAmbientBlue_Obj;
+float CTimeCycle::m_fCurrentAmbientRed_Bl;
+float CTimeCycle::m_fCurrentAmbientGreen_Bl;
+float CTimeCycle::m_fCurrentAmbientBlue_Bl;
+float CTimeCycle::m_fCurrentAmbientRed_Obj_Bl;
+float CTimeCycle::m_fCurrentAmbientGreen_Obj_Bl;
+float CTimeCycle::m_fCurrentAmbientBlue_Obj_Bl;
 float CTimeCycle::m_fCurrentDirectionalRed;
 float CTimeCycle::m_fCurrentDirectionalGreen;
 float CTimeCycle::m_fCurrentDirectionalBlue;
@@ -74,7 +98,7 @@ float CTimeCycle::m_fCurrentSpriteSize;
 float CTimeCycle::m_fCurrentSpriteBrightness;
 int   CTimeCycle::m_nCurrentShadowStrength;
 int   CTimeCycle::m_nCurrentLightShadowStrength;
-int   CTimeCycle::m_nCurrentTreeShadowStrength;
+int   CTimeCycle::m_nCurrentPoleShadowStrength;
 float CTimeCycle::m_fCurrentFogStart;
 float CTimeCycle::m_fCurrentFarClip;
 float CTimeCycle::m_fCurrentLightsOnGroundBrightness;
@@ -90,7 +114,10 @@ int   CTimeCycle::m_nCurrentFluffyCloudsBottomBlue;
 float CTimeCycle::m_fCurrentBlurRed;
 float CTimeCycle::m_fCurrentBlurGreen;
 float CTimeCycle::m_fCurrentBlurBlue;
-float CTimeCycle::m_fCurrentBlurAlpha;
+float CTimeCycle::m_fCurrentWaterRed;
+float CTimeCycle::m_fCurrentWaterGreen;
+float CTimeCycle::m_fCurrentWaterBlue;
+float CTimeCycle::m_fCurrentWaterAlpha;
 int   CTimeCycle::m_nCurrentFogColourRed;
 int   CTimeCycle::m_nCurrentFogColourGreen;
 int   CTimeCycle::m_nCurrentFogColourBlue;
@@ -115,18 +142,22 @@ CTimeCycle::Initialise(void)
 	char line[1040];
 
 	int ambR, ambG, ambB;
+	int ambobjR, ambobjG, ambobjB;
+	int ambblR, ambblG, ambblB;
+	int ambobjblR, ambobjblG, ambobjblB;
 	int dirR, dirG, dirB;
 	int skyTopR, skyTopG, skyTopB;
 	int skyBotR, skyBotG, skyBotB;
 	int sunCoreR, sunCoreG, sunCoreB;
 	int sunCoronaR, sunCoronaG, sunCoronaB;
 	float sunSz, sprSz, sprBght;
-	int shad, lightShad, treeShad;
+	int shad, lightShad, poleShad;
 	float farClp, fogSt, lightGnd;
 	int cloudR, cloudG, cloudB;
 	int fluffyTopR, fluffyTopG, fluffyTopB;
 	int fluffyBotR, fluffyBotG, fluffyBotB;
-	float blurR, blurG, blurB, blurA;
+	float blurR, blurG, blurB;
+	float waterR, waterG, waterB, waterA;
 
 	debug("Intialising CTimeCycle...\n");
 
@@ -144,31 +175,49 @@ CTimeCycle::Initialise(void)
 					bi++;
 				bi++;
 			}
-			while(work_buff[bi] != '\n')
+			while(work_buff[bi] != '\n'
+#ifdef FIX_BUGS
+			&& work_buff[bi] != '\0'
+#endif
+			)
 				line[li++] = work_buff[bi++];
 			line[li] = '\0';
 			bi++;
 
 			sscanf(line, "%d %d %d  %d %d %d  %d %d %d  %d %d %d "
+			             "%d %d %d  %d %d %d  %d %d %d "
 			             "%d %d %d  %d %d %d  %f %f %f %d %d %d %f %f %f "
-			             "%d %d %d  %d %d %d  %d %d %d  %f %f %f %f",
+			             "%d %d %d  %d %d %d  %d %d %d  %f %f %f  %f %f %f %f",
 				&ambR, &ambG, &ambB,
-				 &dirR, &dirG, &dirB,
+				 &ambobjR, &ambobjG, &ambobjB,
+				 &ambblR, &ambblG, &ambblB,
+				 &ambobjblR, &ambobjblG, &ambobjblB,
+				&dirR, &dirG, &dirB,
 				 &skyTopR, &skyTopG, &skyTopB,
 				 &skyBotR, &skyBotG, &skyBotB,
 				&sunCoreR, &sunCoreG, &sunCoreB,
 				 &sunCoronaR, &sunCoronaG, &sunCoronaB,
 				 &sunSz, &sprSz, &sprBght,
-				 &shad, &lightShad, &treeShad,
+				 &shad, &lightShad, &poleShad,
 				 &farClp, &fogSt, &lightGnd,
 				&cloudR, &cloudG, &cloudB,
 				 &fluffyTopR, &fluffyTopG, &fluffyTopB,
 				 &fluffyBotR, &fluffyBotG, &fluffyBotB,
-				 &blurR, &blurG, &blurB, &blurA);
+				 &blurR, &blurG, &blurB,
+				 &waterR, &waterG, &waterB, &waterA);
 
 			m_nAmbientRed[h][w] = ambR;
 			m_nAmbientGreen[h][w] = ambG;
 			m_nAmbientBlue[h][w] = ambB;
+			m_nAmbientRed_Obj[h][w] = ambobjR;
+			m_nAmbientGreen_Obj[h][w] = ambobjG;
+			m_nAmbientBlue_Obj[h][w] = ambobjB;
+			m_nAmbientRed_Bl[h][w] = ambblR;
+			m_nAmbientGreen_Bl[h][w] = ambblG;
+			m_nAmbientBlue_Bl[h][w] = ambblB;
+			m_nAmbientRed_Obj_Bl[h][w] = ambobjblR;
+			m_nAmbientGreen_Obj_Bl[h][w] = ambobjblG;
+			m_nAmbientBlue_Obj_Bl[h][w] = ambobjblB;
 			m_nDirectionalRed[h][w] = dirR;
 			m_nDirectionalGreen[h][w] = dirG;
 			m_nDirectionalBlue[h][w] = dirB;
@@ -189,7 +238,7 @@ CTimeCycle::Initialise(void)
 			m_fSpriteBrightness[h][w] = sprBght;
 			m_nShadowStrength[h][w] = shad;
 			m_nLightShadowStrength[h][w] = lightShad;
-			m_nTreeShadowStrength[h][w] = treeShad;
+			m_nPoleShadowStrength[h][w] = poleShad;
 			m_fFarClip[h][w] = farClp;
 			m_fFogStart[h][w] = fogSt;
 			m_fLightsOnGroundBrightness[h][w] = lightGnd;
@@ -205,7 +254,10 @@ CTimeCycle::Initialise(void)
 			m_fBlurRed[h][w] = blurR;
 			m_fBlurGreen[h][w] = blurG;
 			m_fBlurBlue[h][w] = blurB;
-			m_fBlurAlpha[h][w] = blurA;
+			m_fWaterRed[h][w] = waterR;
+			m_fWaterGreen[h][w] = waterG;
+			m_fWaterBlue[h][w] = waterB;
+			m_fWaterAlpha[h][w] = waterA;
 		}
 
 	m_FogReduction = 0;
@@ -220,7 +272,7 @@ CTimeCycle::Update(void)
 	int h2 = (h1+1)%24;
 	int w1 = CWeather::OldWeatherType;
 	int w2 = CWeather::NewWeatherType;
-	float timeInterp = CClock::GetMinutes()/60.0f;
+	float timeInterp = (CClock::GetMinutes() + CClock::GetSeconds()/60.0f)/60.0f;
 	// coefficients for a bilinear interpolation
 	float c0 = (1.0f-timeInterp) * (1.0f-CWeather::InterpolationValue);
 	float c1 = timeInterp * (1.0f-CWeather::InterpolationValue);
@@ -240,16 +292,22 @@ CTimeCycle::Update(void)
 	m_fCurrentAmbientRed = INTERP(m_nAmbientRed);
 	m_fCurrentAmbientGreen = INTERP(m_nAmbientGreen);
 	m_fCurrentAmbientBlue = INTERP(m_nAmbientBlue);
-	m_fCurrentAmbientRed /= 255.0f;
-	m_fCurrentAmbientGreen /= 255.0f;
-	m_fCurrentAmbientBlue /= 255.0f;
+
+	m_fCurrentAmbientRed_Obj = INTERP(m_nAmbientRed_Obj);
+	m_fCurrentAmbientGreen_Obj = INTERP(m_nAmbientGreen_Obj);
+	m_fCurrentAmbientBlue_Obj = INTERP(m_nAmbientBlue_Obj);
+
+	m_fCurrentAmbientRed_Bl = INTERP(m_nAmbientRed_Bl);
+	m_fCurrentAmbientGreen_Bl = INTERP(m_nAmbientGreen_Bl);
+	m_fCurrentAmbientBlue_Bl = INTERP(m_nAmbientBlue_Bl);
+
+	m_fCurrentAmbientRed_Obj_Bl = INTERP(m_nAmbientRed_Obj_Bl);
+	m_fCurrentAmbientGreen_Obj_Bl = INTERP(m_nAmbientGreen_Obj_Bl);
+	m_fCurrentAmbientBlue_Obj_Bl = INTERP(m_nAmbientBlue_Obj_Bl);
 
 	m_fCurrentDirectionalRed = INTERP(m_nDirectionalRed);
 	m_fCurrentDirectionalGreen = INTERP(m_nDirectionalGreen);
 	m_fCurrentDirectionalBlue = INTERP(m_nDirectionalBlue);
-	m_fCurrentDirectionalRed /= 255.0f;
-	m_fCurrentDirectionalGreen /= 255.0f;
-	m_fCurrentDirectionalBlue /= 255.0f;
 
 	m_nCurrentSunCoreRed = INTERP(m_nSunCoreRed);
 	m_nCurrentSunCoreGreen = INTERP(m_nSunCoreGreen);
@@ -264,7 +322,7 @@ CTimeCycle::Update(void)
 	m_fCurrentSpriteBrightness = INTERP(m_fSpriteBrightness);
 	m_nCurrentShadowStrength = INTERP(m_nShadowStrength);
 	m_nCurrentLightShadowStrength = INTERP(m_nLightShadowStrength);
-	m_nCurrentTreeShadowStrength = INTERP(m_nTreeShadowStrength);
+	m_nCurrentPoleShadowStrength = INTERP(m_nPoleShadowStrength);
 	m_fCurrentFarClip = INTERP(m_fFarClip);
 	m_fCurrentFogStart = INTERP(m_fFogStart);
 	m_fCurrentLightsOnGroundBrightness = INTERP(m_fLightsOnGroundBrightness);
@@ -284,26 +342,49 @@ CTimeCycle::Update(void)
 	m_fCurrentBlurRed = INTERP(m_fBlurRed);
 	m_fCurrentBlurGreen = INTERP(m_fBlurGreen);
 	m_fCurrentBlurBlue = INTERP(m_fBlurBlue);
-	m_fCurrentBlurAlpha = INTERP(m_fBlurAlpha);
 
-	if(TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL)
-		TheCamera.SetMotionBlur(m_fCurrentBlurRed, m_fCurrentBlurGreen, m_fCurrentBlurBlue, m_fCurrentBlurAlpha, MBLUR_NORMAL);
+	m_fCurrentWaterRed = INTERP(m_fWaterRed);
+	m_fCurrentWaterGreen = INTERP(m_fWaterGreen);
+	m_fCurrentWaterBlue = INTERP(m_fWaterBlue);
+	m_fCurrentWaterAlpha = INTERP(m_fWaterAlpha);
 
 	if(m_FogReduction != 0)
 		m_fCurrentFarClip = Max(m_fCurrentFarClip, m_FogReduction/64.0f * 650.0f);
-	m_nCurrentFogColourRed = (m_nCurrentSkyTopRed + 2*m_nCurrentSkyBottomRed) / 3;
-	m_nCurrentFogColourGreen = (m_nCurrentSkyTopGreen + 2*m_nCurrentSkyBottomGreen) / 3;
-	m_nCurrentFogColourBlue = (m_nCurrentSkyTopBlue + 2*m_nCurrentSkyBottomBlue) / 3;
 
 	m_CurrentStoredValue = (m_CurrentStoredValue+1)&0xF;
 
-	float sunAngle = 2*PI*(CClock::GetMinutes() + CClock::GetHours()*60)/(24*60);
+	float sunAngle = 2*PI*(CClock::GetSeconds()/60.0f + CClock::GetMinutes() + CClock::GetHours()*60)/(24*60);
 	CVector &sunPos = GetSunDirection();
 	sunPos.x = Sin(sunAngle);
 	sunPos.y = 1.0f;
 	sunPos.z = 0.2f - Cos(sunAngle);
 	sunPos.Normalise();
 
+	// TODO(MIAMI): extra colours
+
+	if(TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL)
+		TheCamera.SetMotionBlur(m_fCurrentBlurRed, m_fCurrentBlurGreen, m_fCurrentBlurBlue, 5, MBLUR_NORMAL);
+
+	m_nCurrentFogColourRed = (m_nCurrentSkyTopRed + 2*m_nCurrentSkyBottomRed) / 3;
+	m_nCurrentFogColourGreen = (m_nCurrentSkyTopGreen + 2*m_nCurrentSkyBottomGreen) / 3;
+	m_nCurrentFogColourBlue = (m_nCurrentSkyTopBlue + 2*m_nCurrentSkyBottomBlue) / 3;
+
+	m_fCurrentAmbientRed /= 255.0f;
+	m_fCurrentAmbientGreen /= 255.0f;
+	m_fCurrentAmbientBlue /= 255.0f;
+	m_fCurrentAmbientRed_Obj /= 255.0f;
+	m_fCurrentAmbientGreen_Obj /= 255.0f;
+	m_fCurrentAmbientBlue_Obj /= 255.0f;
+	m_fCurrentAmbientRed_Bl /= 255.0f;
+	m_fCurrentAmbientGreen_Bl /= 255.0f;
+	m_fCurrentAmbientBlue_Bl /= 255.0f;
+	m_fCurrentAmbientRed_Obj_Bl /= 255.0f;
+	m_fCurrentAmbientGreen_Obj_Bl /= 255.0f;
+	m_fCurrentAmbientBlue_Obj_Bl /= 255.0f;
+	m_fCurrentDirectionalRed /= 255.0f;
+	m_fCurrentDirectionalGreen /= 255.0f;
+	m_fCurrentDirectionalBlue /= 255.0f;
+
 	CShadows::CalcPedShadowValues(sunPos, 
 		&m_fShadowFrontX[m_CurrentStoredValue], &m_fShadowFrontY[m_CurrentStoredValue],
 		&m_fShadowSideX[m_CurrentStoredValue], &m_fShadowSideY[m_CurrentStoredValue],
diff --git a/src/render/Timecycle.h b/src/render/Timecycle.h
index 0cb02b67..60c9e29f 100644
--- a/src/render/Timecycle.h
+++ b/src/render/Timecycle.h
@@ -5,6 +5,15 @@ class CTimeCycle
 	static int   m_nAmbientRed[NUMHOURS][NUMWEATHERS];
 	static int   m_nAmbientGreen[NUMHOURS][NUMWEATHERS];
 	static int   m_nAmbientBlue[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientRed_Obj[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientGreen_Obj[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientBlue_Obj[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientRed_Bl[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientGreen_Bl[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientBlue_Bl[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientRed_Obj_Bl[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientGreen_Obj_Bl[NUMHOURS][NUMWEATHERS];
+	static int   m_nAmbientBlue_Obj_Bl[NUMHOURS][NUMWEATHERS];
 	static int   m_nDirectionalRed[NUMHOURS][NUMWEATHERS];
 	static int   m_nDirectionalGreen[NUMHOURS][NUMWEATHERS];
 	static int   m_nDirectionalBlue[NUMHOURS][NUMWEATHERS];
@@ -25,7 +34,7 @@ class CTimeCycle
 	static float m_fSpriteBrightness[NUMHOURS][NUMWEATHERS];
 	static short m_nShadowStrength[NUMHOURS][NUMWEATHERS];
 	static short m_nLightShadowStrength[NUMHOURS][NUMWEATHERS];
-	static short m_nTreeShadowStrength[NUMHOURS][NUMWEATHERS];
+	static short m_nPoleShadowStrength[NUMHOURS][NUMWEATHERS];
 	static float m_fFogStart[NUMHOURS][NUMWEATHERS];
 	static float m_fFarClip[NUMHOURS][NUMWEATHERS];
 	static float m_fLightsOnGroundBrightness[NUMHOURS][NUMWEATHERS];
@@ -41,11 +50,23 @@ class CTimeCycle
 	static float m_fBlurRed[NUMHOURS][NUMWEATHERS];
 	static float m_fBlurGreen[NUMHOURS][NUMWEATHERS];
 	static float m_fBlurBlue[NUMHOURS][NUMWEATHERS];
-	static float m_fBlurAlpha[NUMHOURS][NUMWEATHERS];
+	static float m_fWaterRed[NUMHOURS][NUMWEATHERS];
+	static float m_fWaterGreen[NUMHOURS][NUMWEATHERS];
+	static float m_fWaterBlue[NUMHOURS][NUMWEATHERS];
+	static float m_fWaterAlpha[NUMHOURS][NUMWEATHERS];
 
 	static float m_fCurrentAmbientRed;
 	static float m_fCurrentAmbientGreen;
 	static float m_fCurrentAmbientBlue;
+	static float m_fCurrentAmbientRed_Obj;
+	static float m_fCurrentAmbientGreen_Obj;
+	static float m_fCurrentAmbientBlue_Obj;
+	static float m_fCurrentAmbientRed_Bl;
+	static float m_fCurrentAmbientGreen_Bl;
+	static float m_fCurrentAmbientBlue_Bl;
+	static float m_fCurrentAmbientRed_Obj_Bl;
+	static float m_fCurrentAmbientGreen_Obj_Bl;
+	static float m_fCurrentAmbientBlue_Obj_Bl;
 	static float m_fCurrentDirectionalRed;
 	static float m_fCurrentDirectionalGreen;
 	static float m_fCurrentDirectionalBlue;
@@ -66,7 +87,7 @@ class CTimeCycle
 	static float m_fCurrentSpriteBrightness;
 	static int   m_nCurrentShadowStrength;
 	static int   m_nCurrentLightShadowStrength;
-	static int   m_nCurrentTreeShadowStrength;
+	static int   m_nCurrentPoleShadowStrength;
 	static float m_fCurrentFogStart;
 	static float m_fCurrentFarClip;
 	static float m_fCurrentLightsOnGroundBrightness;
@@ -82,7 +103,10 @@ class CTimeCycle
 	static float m_fCurrentBlurRed;
 	static float m_fCurrentBlurGreen;
 	static float m_fCurrentBlurBlue;
-	static float m_fCurrentBlurAlpha;
+	static float m_fCurrentWaterRed;
+	static float m_fCurrentWaterGreen;
+	static float m_fCurrentWaterBlue;
+	static float m_fCurrentWaterAlpha;
 	static int   m_nCurrentFogColourRed;
 	static int   m_nCurrentFogColourGreen;
 	static int   m_nCurrentFogColourBlue;
@@ -102,6 +126,15 @@ public:
 	static float GetAmbientRed(void) { return m_fCurrentAmbientRed; }
 	static float GetAmbientGreen(void) { return m_fCurrentAmbientGreen; }
 	static float GetAmbientBlue(void) { return m_fCurrentAmbientBlue; }
+	static float GetAmbientRed_Obj(void) { return m_fCurrentAmbientRed_Obj; }
+	static float GetAmbientGreen_Obj(void) { return m_fCurrentAmbientGreen_Obj; }
+	static float GetAmbientBlue_Obj(void) { return m_fCurrentAmbientBlue_Obj; }
+	static float GetAmbientRed_Bl(void) { return m_fCurrentAmbientRed_Bl; }
+	static float GetAmbientGreen_Bl(void) { return m_fCurrentAmbientGreen_Bl; }
+	static float GetAmbientBlue_Bl(void) { return m_fCurrentAmbientBlue_Bl; }
+	static float GetAmbientRed_Obj_Bl(void) { return m_fCurrentAmbientRed_Obj_Bl; }
+	static float GetAmbientGreen_Obj_Bl(void) { return m_fCurrentAmbientGreen_Obj_Bl; }
+	static float GetAmbientBlue_Obj_Bl(void) { return m_fCurrentAmbientBlue_Obj_Bl; }
 	static float GetDirectionalRed(void) { return m_fCurrentDirectionalRed; }
 	static float GetDirectionalGreen(void) { return m_fCurrentDirectionalGreen; }
 	static float GetDirectionalBlue(void) { return m_fCurrentDirectionalBlue; }
@@ -140,6 +173,11 @@ public:
 	static int GetFogBlue(void) { return m_nCurrentFogColourBlue; }
 	static int GetFogReduction(void) { return m_FogReduction; }
 
+	static int GetWaterRed(void) { return m_fCurrentWaterRed; }
+	static int GetWaterGreen(void) { return m_fCurrentWaterGreen; }
+	static int GetWaterBlue(void) { return m_fCurrentWaterBlue; }
+	static int GetWaterAlpha(void) { return m_fCurrentWaterAlpha; }
+
 	static void Initialise(void);
 	static void Update(void);
 	static CVector &GetSunDirection(void) { return m_VectorToSun[m_CurrentStoredValue]; }
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 6133b1d7..0fd1e076 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -6,6 +6,7 @@
 #include "Weather.h"
 #include "Camera.h"
 #include "Vehicle.h"
+#include "PlayerPed.h"
 #include "Boat.h"
 #include "World.h"
 #include "General.h"
@@ -19,46 +20,101 @@
 #include "CdStream.h"
 #include "Pad.h"
 #include "RenderBuffer.h"
+#include <rwcore.h>
 #include <rpworld.h>
+#include <rpmatfx.h>
+#include "Occlusion.h"
+#include "Replay.h"
 #include "WaterLevel.h"
+#include "SurfaceTable.h"
 
+#define RwIm3DVertexSet_RGBA(vert, rgba) RwIm3DVertexSetRGBA(vert, rgba.red, rgba.green, rgba.blue, rgba.alpha) // (RwRGBAAssign(&(_dst)->color, &_src))
 
 float TEXTURE_ADDU;
 float TEXTURE_ADDV;
 
+float _TEXTURE_MASK_ADDU;
+float _TEXTURE_MASK_ADDV;
+
+float _TEXTURE_WAKE_ADDU;
+float _TEXTURE_WAKE_ADDV;
+
 int32 CWaterLevel::ms_nNoOfWaterLevels;
 float CWaterLevel::ms_aWaterZs[48];
 CRect CWaterLevel::ms_aWaterRects[48];
-uint8 CWaterLevel::aWaterBlockList[WATER_BLOCK_SIZE][WATER_BLOCK_SIZE];
-uint8 CWaterLevel::aWaterFineBlockList[WATER_FINEBLOCK_SIZE][WATER_FINEBLOCK_SIZE];
+uint8 CWaterLevel::aWaterBlockList[WATER_BLOCK_SECTORS][WATER_BLOCK_SECTORS];
+uint8 CWaterLevel::aWaterFineBlockList[WATER_FINEBLOCK_SECTORS][WATER_FINEBLOCK_SECTORS];
 bool CWaterLevel::WavesCalculatedThisFrame;
+
+
+bool CWaterLevel::RequireWavySector;
+bool CWaterLevel::MaskCalculatedThisFrame;
+CVector CWaterLevel::PreCalculatedMaskPosn;
+bool CWaterLevel::m_bRenderSeaBed;
+int32 CWaterLevel::m_nRenderWaterLayers;
+
 RpAtomic *CWaterLevel::ms_pWavyAtomic;
-RpGeometry *CWaterLevel::apGeomArray[8];
-int16 CWaterLevel::nGeomUsed;
+RpAtomic *CWaterLevel::ms_pMaskAtomic;
 //"Custom" Don´t Render Water Toggle
 bool gbDontRenderWater;
 
-//RwTexture *gpWaterTex;
-//RwRaster *gpWaterRaster;
 
 RwTexture *gpWaterTex;
-RwRaster *gpWaterRaster;
+RwTexture *gpWaterEnvTex;
+RwTexture *gpWaterEnvBaseTex;
+RwTexture *gpWaterWakeTex;
 
+RwRaster *gpWaterRaster;
+RwRaster *gpWaterEnvRaster;
+RwRaster *gpWaterEnvBaseRaster;
+RwRaster *gpWaterWakeRaster;
 
-const float fAdd1 = 180.0f;
-const float fAdd2 = 80.0f;
-const float fRedMult = 0.6f;
-const float fGreenMult = 1.0f;
-const float fBlueMult = 1.4f;
+bool _bSeaLife;
+float _fWaterZOffset = 0.5f;
 
+#ifdef PC_WATER
+float fEnvScale               = 0.25f;
+#else
+float fEnvScale               = 0.5f;
+#endif
+float fWave2InvLength         = 0.03f;
+float fWave2NormScale         = 0.5f;
+float fWave2Ampl              = 0.1f;
+uint8 nWaterAlpha             = 192;
+uint8 nWakeAlpha              = 192;
+float fUnder1                 = 4.0;
+float fUnder2                 = 2.5;
+float fUnder3                 = 1.5;
+int nMaskAlpha                = 230;
+float fAdd1                   = 180.0f;
+float fAdd2                   = 80.0;
+float fRedMult                = 0.6f;
+float fGreenMult              = 1.0f;
+float fBlueMult               = 1.4f;
+float fAlphaMult              = 500.0f;
+float fAlphaBase              = 30.0f;
+float fRandomMoveDiv          = 8.0f;
+float fRandomDamp             = 0.99f;
+float fNormMult               = 2.0f;
+float fNormMultB              = 1.0f;
+float fBumpScale              = 1.5;
+float fBumpTexRepeat          = 2.0;
+float fNormalDirectionScalar1 = 2.0f;
+float fNormalDirectionScalar2 = 1.0f;
+bool bTestDoNormals           = true;
+float fSeaBedZ                =  25.0f;
+float aAlphaFade[5]           = { 0.4f, 1.0f, 0.2f, 1.0f, 0.4f};	//CWaterLevel::RenderWakeSegment
+float fFlatWaterBlendRange    = 0.05f;
+float fStartBlendDistanceAdd  = 64.0f;
+float fMinWaterAlphaMult      = -30.0f;
 
 
 void
-CWaterLevel::Initialise(Const char *pWaterDat)
+WaterLevelInitialise(Const char *pWaterDat)
 {
-	ms_nNoOfWaterLevels = 0;
+	CWaterLevel::ms_nNoOfWaterLevels = 0;
 	
-	int32 hFile = -1;
+	int32 hFile;
 	
 	do
 	{
@@ -70,11 +126,11 @@ CWaterLevel::Initialise(Const char *pWaterDat)
 	{
 		if ( hFile >= 0 )
 		{
-			CFileMgr::Read(hFile, (char *)&ms_nNoOfWaterLevels, sizeof(ms_nNoOfWaterLevels));
-			CFileMgr::Read(hFile, (char *)ms_aWaterZs,	sizeof(ms_aWaterZs));
-			CFileMgr::Read(hFile, (char *)ms_aWaterRects, sizeof(ms_aWaterRects));
-			CFileMgr::Read(hFile, (char *)aWaterBlockList, sizeof(aWaterBlockList));
-			CFileMgr::Read(hFile, (char *)aWaterFineBlockList, sizeof(aWaterFineBlockList));
+			CFileMgr::Read(hFile, (char *)&CWaterLevel::ms_nNoOfWaterLevels, sizeof(CWaterLevel::ms_nNoOfWaterLevels));
+			CFileMgr::Read(hFile, (char *)CWaterLevel::ms_aWaterZs,	sizeof(CWaterLevel::ms_aWaterZs));
+			CFileMgr::Read(hFile, (char *)CWaterLevel::ms_aWaterRects, sizeof(CWaterLevel::ms_aWaterRects));
+			CFileMgr::Read(hFile, (char *)CWaterLevel::aWaterBlockList, sizeof(CWaterLevel::aWaterBlockList));
+			CFileMgr::Read(hFile, (char *)CWaterLevel::aWaterFineBlockList, sizeof(CWaterLevel::aWaterFineBlockList));
 		}
 		
 		CFileMgr::CloseFile(hFile);
@@ -85,14 +141,27 @@ CWaterLevel::Initialise(Const char *pWaterDat)
 	int32 slot = CTxdStore::FindTxdSlot("particle");
 	CTxdStore::SetCurrentTxd(slot);
 	
-	if ( gpWaterTex == NULL )
-		gpWaterTex = RwTextureRead("water_old", NULL);
+	if ( gpWaterTex == nil )
+		gpWaterTex = RwTextureRead("waterclear256", nil);
 	gpWaterRaster = RwTextureGetRaster(gpWaterTex);
 	
+	if ( gpWaterEnvTex == nil )
+		gpWaterEnvTex = RwTextureRead("waterreflection2", nil);
+	gpWaterEnvRaster = RwTextureGetRaster(gpWaterEnvTex);
+	
+#ifdef PC_WATER
+	if ( gpWaterEnvBaseTex == nil )
+		gpWaterEnvBaseTex = RwTextureRead("sandywater", nil);
+	gpWaterEnvBaseRaster = RwTextureGetRaster(gpWaterEnvBaseTex);
+#endif
+	
+	if ( gpWaterWakeTex == nil )
+		gpWaterWakeTex = RwTextureRead("waterwake", nil);
+	gpWaterWakeRaster = RwTextureGetRaster(gpWaterWakeTex);
+	
 	CTxdStore::PopCurrentTxd();
 
-	CreateWavyAtomic();
-	FreeBoatWakeArray();
+	CWaterLevel::CreateWavyAtomic();
 	
 	printf("Done Initing waterlevels\n");
 }
@@ -100,92 +169,153 @@ CWaterLevel::Initialise(Const char *pWaterDat)
 void
 CWaterLevel::Shutdown()
 {
-	FreeBoatWakeArray();
 	DestroyWavyAtomic();
 
-	if ( gpWaterTex != NULL )
-	{
-		RwTextureDestroy(gpWaterTex);
-		gpWaterTex = NULL;
-	}
+#define _DELETE_TEXTURE(t) if ( t )	\
+		{ \
+			RwTextureDestroy(t); \
+			t = nil; \
+		}
+
+	_DELETE_TEXTURE(gpWaterTex);
+	_DELETE_TEXTURE(gpWaterEnvTex);
+	_DELETE_TEXTURE(gpWaterEnvBaseTex);
+
+#undef _DELETE_TEXTURE
 }
 
 void
 CWaterLevel::CreateWavyAtomic()
 {
 	RpGeometry *wavyGeometry;
+	RpGeometry *maskGeometry;
 	RpMaterial *wavyMaterial;
-	RpTriangle *wavyTriangles;
+	RpMaterial *maskMaterial;
+	
+	RpTriangle *wavytlist;
+	RpTriangle *masktlist;
+	
 	RpMorphTarget *wavyMorphTarget;
-	RwSphere boundingSphere;	
+	RpMorphTarget *maskMorphTarget;
+	
+	RwSphere boundingSphere;
+	
 	RwV3d *wavyVert;
-
+	RwV3d *wavyNormal;
+	
+	RwV3d *maskVert;
+	RwV3d *maskNormal;
+	
 	RwFrame *wavyFrame;
+	RwFrame *maskFrame;
 	
 	{
-		wavyGeometry = RpGeometryCreate(9*9, 8*8*2, rpGEOMETRYTRISTRIP
+		wavyGeometry = RpGeometryCreate(17*17, 512, rpGEOMETRYTRISTRIP
 													|rpGEOMETRYTEXTURED
 													|rpGEOMETRYPRELIT
+													|rpGEOMETRYNORMALS
 													|rpGEOMETRYMODULATEMATERIALCOLOR);
-													
-		ASSERT(wavyGeometry != NULL);
-	
+#ifdef PC_WATER
+		RpGeometryAddMorphTarget(wavyGeometry);
+#endif
+	}
+
+	{
+		maskGeometry = RpGeometryCreate(33*33, 2048, rpGEOMETRYTRISTRIP
+													|rpGEOMETRYTEXTURED
+													|rpGEOMETRYPRELIT
+													|rpGEOMETRYNORMALS
+													|rpGEOMETRYMODULATEMATERIALCOLOR);
+#ifdef PC_WATER
+		RpGeometryAddMorphTarget(maskGeometry);
+#endif
 	}
 	
 	{
 		wavyMaterial = RpMaterialCreate();
-		
-		ASSERT(wavyMaterial != NULL);
-		ASSERT(gpWaterTex   != NULL);
-		
 		RpMaterialSetTexture(wavyMaterial, gpWaterTex);
+		RwRGBA watercolor = { 255, 255, 255, 192 };
+		RpMaterialSetColor(wavyMaterial, &watercolor);
 	}
 	
 	{
-		wavyTriangles = RpGeometryGetTriangles(wavyGeometry);
-		
-		ASSERT(wavyTriangles != NULL);
-		/*  
-			[B]       [C]
-			 ***********
-			 *       * *
-			 *     *   *
-			 *   *     *
-			 * *       *
-			 ***********
-			[A]       [D]
-		*/
+		maskMaterial = RpMaterialCreate();
+#ifdef PC_WATER
+		RpMaterialSetTexture(maskMaterial, gpWaterEnvBaseTex);
+#else
+		RpMaterialSetTexture(maskMaterial, gpWaterTex);
+#endif
+		RwRGBA watercolor = { 255, 255, 255, 192 };
+		RpMaterialSetColor(maskMaterial, &watercolor);
+	}
+	
+	{
+		wavytlist = RpGeometryGetTriangles(wavyGeometry);
 		
-		for ( int32 i = 0; i < 8; i++ )
+		for ( int32 i = 0; i < 16; i++ )
 		{
-			for ( int32 j = 0; j < 8; j++ )
-			{	
+			for ( int32 j = 0; j < 16; j++ )
+			{
+				const RwUInt16 base = (RwUInt16)((16 + 1)*i+j);
+	
+				RpGeometryTriangleSetVertexIndices(wavyGeometry, 
+						wavytlist,     (RwInt16)base, (RwInt16)(base+1),    (RwInt16)(base+16+2));
+
 				RpGeometryTriangleSetVertexIndices(wavyGeometry, 
-						&wavyTriangles[2 * 8*i + 2*j + 0], /*A*/9*i+j+0, /*B*/9*i+j+1,   /*C*/9*i+j+9+1);
-                                                                  
-				RpGeometryTriangleSetVertexIndices(wavyGeometry,  
-						&wavyTriangles[2 * 8*i + 2*j + 1], /*A*/9*i+j+0, /*C*/9*i+j+9+1, /*D*/9*i+j+9  );
+						(wavytlist+1), (RwInt16)base, (RwInt16)(base+16+2), (RwInt16)(base+16+1));
 	
-				RpGeometryTriangleSetMaterial(wavyGeometry, &wavyTriangles[2 * 8*i + 2*j + 0], wavyMaterial);
-				RpGeometryTriangleSetMaterial(wavyGeometry, &wavyTriangles[2 * 8*i + 2*j + 1], wavyMaterial);
+				RpGeometryTriangleSetMaterial(wavyGeometry, wavytlist,     wavyMaterial);
+
+				RpGeometryTriangleSetMaterial(wavyGeometry, (wavytlist+1), wavyMaterial);
+				
+				wavytlist+=2;
 			}
 		}
 	}
 	
+	{
+		masktlist = RpGeometryGetTriangles(maskGeometry);
+		
+		for ( int32 i = 0; i < 32; i++ )
+		{
+			for ( int32 j = 0; j < 32; j++ )
+			{
+				const RwUInt16 base = (RwUInt16)((32 + 1)*i+j);
+	
+				RpGeometryTriangleSetVertexIndices(maskGeometry, 
+						masktlist,     (RwInt16)base, (RwInt16)(base+1),    (RwInt16)(base+32+2));
+
+				RpGeometryTriangleSetVertexIndices(maskGeometry,
+						(masktlist+1), (RwInt16)base, (RwInt16)(base+32+2), (RwInt16)(base+32+1));
+	
+				RpGeometryTriangleSetMaterial(maskGeometry, masktlist,     maskMaterial);
+
+				RpGeometryTriangleSetMaterial(maskGeometry, (masktlist+1), maskMaterial);
+				
+				masktlist+=2;
+			}
+		}
+	}
 
 	{
 		wavyMorphTarget = RpGeometryGetMorphTarget(wavyGeometry, 0);
-		ASSERT(wavyMorphTarget != NULL);
-		wavyVert = RpMorphTargetGetVertices(wavyMorphTarget);	
-		ASSERT(wavyVert != NULL);
+		wavyVert = RpMorphTargetGetVertices(wavyMorphTarget);
+		wavyNormal = RpMorphTargetGetVertexNormals(wavyMorphTarget);
 		
-		for ( int32 i = 0; i < 9; i++ )
+		for ( int32 i = 0; i < 17; i++ )
 		{
-			for ( int32 j = 0; j < 9; j++ )
+			for ( int32 j = 0; j < 17; j++ )
 			{
-				wavyVert[9*i+j].x = (float)i * 4.0f;
-				wavyVert[9*i+j].y = (float)j * 4.0f;
-				wavyVert[9*i+j].z = 0.0f;
+				(*wavyVert).x = (float)i * 2.0f;
+				(*wavyVert).y = (float)j * 2.0f;
+				(*wavyVert).z = 0.0f;
+				
+				(*wavyNormal).x = 0.0f;
+				(*wavyNormal).y = 0.0f;
+				(*wavyNormal).z = 1.0f;
+				
+				wavyVert++;
+				wavyNormal++;
 			}
 		}
 		
@@ -194,60 +324,112 @@ CWaterLevel::CreateWavyAtomic()
 		RpGeometryUnlock(wavyGeometry);
 	}
 	
-	
 	{
-		wavyFrame = RwFrameCreate();
-		ASSERT( wavyFrame != NULL );
+		maskMorphTarget = RpGeometryGetMorphTarget(maskGeometry, 0);
+		maskVert = RpMorphTargetGetVertices(maskMorphTarget);
+		maskNormal = RpMorphTargetGetVertexNormals(maskMorphTarget);
 		
-		ms_pWavyAtomic = RpAtomicCreate();		
-		ASSERT( ms_pWavyAtomic != NULL );
+		for ( int32 i = 0; i < 33; i++ )
+		{
+			for ( int32 j = 0; j < 33; j++ )
+			{
+				(*maskVert).x = (float)i * 2.0f;
+				(*maskVert).y = (float)j * 2.0f;
+				(*maskVert).z = 0.0f;
+				
+				(*maskNormal).x = 0.0f;
+				(*maskNormal).y = 0.0f;
+				(*maskNormal).z = 1.0f;
+				
+				maskVert++;
+				maskNormal++;
+			}
+		}
 		
+		RpMorphTargetCalcBoundingSphere(maskMorphTarget, &boundingSphere);
+		RpMorphTargetSetBoundingSphere(maskMorphTarget, &boundingSphere);
+		RpGeometryUnlock(maskGeometry);
+	}
+	
+	{
+		wavyFrame = RwFrameCreate();
+		ms_pWavyAtomic = RpAtomicCreate();
 		RpAtomicSetGeometry(ms_pWavyAtomic, wavyGeometry, 0);
 		RpAtomicSetFrame(ms_pWavyAtomic, wavyFrame);
 		RpMaterialDestroy(wavyMaterial);
 		RpGeometryDestroy(wavyGeometry);
 	}
+	
+	{
+		maskFrame = RwFrameCreate();
+		ms_pMaskAtomic = RpAtomicCreate();
+		RpAtomicSetGeometry(ms_pMaskAtomic, maskGeometry, 0);
+		RpAtomicSetFrame(ms_pMaskAtomic, maskFrame);
+		RpMaterialDestroy(maskMaterial);
+		RpGeometryDestroy(maskGeometry);
+	}
+	
+	static RwFrame *wakeEnvFrame;
+	
+	if ( wakeEnvFrame == nil )
+	{
+		wakeEnvFrame = RwFrameCreate();
+		RwMatrixSetIdentity(RwFrameGetMatrix(wakeEnvFrame));
+		RwFrameUpdateObjects(wakeEnvFrame);
+	}
+	
+	RpMatFXMaterialSetEffects(maskMaterial, rpMATFXEFFECTENVMAP);
+	RpMatFXMaterialSetupEnvMap(maskMaterial, gpWaterEnvTex, wakeEnvFrame, TRUE, fEnvScale);
+	RpMatFXAtomicEnableEffects(ms_pMaskAtomic);
 }
 
 void
 CWaterLevel::DestroyWavyAtomic()
 {
-	RwFrame *frame;
-	
-	frame = RpAtomicGetFrame(ms_pWavyAtomic);
-	
-	RpAtomicDestroy(ms_pWavyAtomic);
+#define _DELETE_ATOMIC(a) \
+		{ \
+			RwFrame *frame; \
+			frame = RpAtomicGetFrame(a); \
+			RpAtomicDestroy(a); \
+			RwFrameDestroy(frame); \
+		}
+
+	_DELETE_ATOMIC(ms_pWavyAtomic);
+	_DELETE_ATOMIC(ms_pMaskAtomic);
 	
-	RwFrameDestroy(frame);	
+#undef _DELETE_ATOMIC
 }
 
 bool
 CWaterLevel::GetWaterLevel(float fX, float fY, float fZ, float *pfOutLevel, bool bDontCheckZ)
 {
-	int32 x = WATER_HUGE_X(fX);
-	int32 y = WATER_HUGE_Y(fY);
-	
-	ASSERT( x >= 0 && x < HUGE_SECTOR_SIZE );
-	ASSERT( y >= 0 && y < HUGE_SECTOR_SIZE );
+	int32 x = WATER_TO_SMALL_SECTOR_X(fX + WATER_X_OFFSET);
+	int32 y = WATER_TO_SMALL_SECTOR_Y(fY);
+		
+#ifdef FIX_BUGS
+	if ( x < 0 || x >= MAX_SMALL_SECTORS ) return false;
+	if ( y < 0 || y >= MAX_SMALL_SECTORS ) return false;
+#endif
 
 	uint8 nBlock = aWaterFineBlockList[x][y];
 
-	if ( nBlock == 128 )
+	if ( nBlock == 0x80 )
 		return false;
 
-	ASSERT( pfOutLevel != NULL );
+	ASSERT( pfOutLevel != nil );
 	*pfOutLevel = ms_aWaterZs[nBlock];
 
 	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
 	
 	float fWave = Sin
 	(
-		/*( WATER_UNSIGN_Y(fY) - float(y) * MAX_HUGE_SECTORS + WATER_UNSIGN_X(fX) - float(x) * MAX_HUGE_SECTORS )*/ // VC
-		(float)( ((int32)fX & (MAX_HUGE_SECTORS-1)) + ((int32)fY & (MAX_HUGE_SECTORS-1)) )
-		* (TWOPI / MAX_HUGE_SECTORS ) + fAngle
+		( WATER_UNSIGN_Y(fY)                  - y*SMALL_SECTOR_SIZE
+		+ WATER_UNSIGN_X(fX + WATER_X_OFFSET) - x*SMALL_SECTOR_SIZE )
+		
+		* (TWOPI / SMALL_SECTOR_SIZE ) + fAngle
 	);
 
-	float fWindFactor = CWeather::Wind * 0.7f + 0.3f;
+	float fWindFactor = CWeather::WindClipped * 0.4f + 0.2f;
 	
 	*pfOutLevel += fWave * fWindFactor;
 
@@ -263,35 +445,69 @@ CWaterLevel::GetWaterLevel(float fX, float fY, float fZ, float *pfOutLevel, bool
 bool
 CWaterLevel::GetWaterLevelNoWaves(float fX, float fY, float fZ, float *pfOutLevel)
 {
-	int32 x = WATER_HUGE_X(fX);
-	int32 y = WATER_HUGE_Y(fY);
-	
-	ASSERT( x >= 0 && x < HUGE_SECTOR_SIZE );
-	ASSERT( y >= 0 && y < HUGE_SECTOR_SIZE );
+	int32 x = WATER_TO_SMALL_SECTOR_X(fX + WATER_X_OFFSET);
+	int32 y = WATER_TO_SMALL_SECTOR_Y(fY);
+		
+#ifdef FIX_BUGS
+	if ( x < 0 || x >= MAX_SMALL_SECTORS ) return false;
+	if ( y < 0 || y >= MAX_SMALL_SECTORS ) return false;
+#endif
 	
 	uint8 nBlock = aWaterFineBlockList[x][y];
 		
-	if ( nBlock == 128 )
+	if ( nBlock == 0x80 )
 		return false;
 	
-	ASSERT( pfOutLevel != NULL );
+	ASSERT( pfOutLevel != nil );
 	*pfOutLevel = ms_aWaterZs[nBlock];
 
 	return true;
 }
 
-inline float
-_GetWaterDrawDist()
+float
+CWaterLevel::GetWaterWavesOnly(short x, short y)
 {
-	// if z less then 15.0f return 1200.0f 
-	if ( TheCamera.GetPosition().z < 15.0f )
-		return 1200.0f;
+	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
+	
+	float fWindFactor = CWeather::WindClipped * 0.7f + 0.3f;
+	
+	float fWave = Sin( float(float(4 * y + 4 * x) * (TWOPI / SMALL_SECTOR_SIZE )) + fAngle );
+	
+	return fWave * fWindFactor;
+}
+	   
+CVector
+CWaterLevel::GetWaterNormal(float fX, float fY)
+{
+	//TODO: BUG ? no x offset
+	
+	int32 x = WATER_TO_SMALL_SECTOR_X(fX);
+	int32 y = WATER_TO_SMALL_SECTOR_Y(fY);
+	
+	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
+	float fWindFactor = CWeather::WindClipped * 0.4f + 0.2f;
+	
+	//TODO: 
+	float _fWave = (WATER_UNSIGN_Y(fY) - y*SMALL_SECTOR_SIZE + WATER_UNSIGN_X(fX) - x*SMALL_SECTOR_SIZE)
+			* (TWOPI / SMALL_SECTOR_SIZE ) + fAngle;
+
+	CVector vA(1.0f, 0.0f, fWindFactor * (TWOPI / SMALL_SECTOR_SIZE ) * Cos(_fWave));
+	CVector vB(0.0f, 1.0f, fWindFactor * (TWOPI / SMALL_SECTOR_SIZE ) * Cos(_fWave));
+	
+	CVector norm = CrossProduct(vA, vB);
+	
+	norm.Normalise();
+	
+	return norm;
+}
 
-	// if z greater then 60.0f return 2000.0f;
-	if ( TheCamera.GetPosition().z > 60.0f )
-		return 2000.0f;
 
-	return (TheCamera.GetPosition().z + -15.0f) * 800.0f / 45.0f + 1200.0f;
+inline float
+_GetWaterDrawDist()
+{
+	if     ( TheCamera.GetPosition().z < 15.0f  ) return 1200.0f;
+	if     ( TheCamera.GetPosition().z > 60.0f  ) return 2000.0f;
+	return ( TheCamera.GetPosition().z + -15.0f ) * 800.0f / 45.0f + 1200.0f;
 }
 
 inline float
@@ -325,6 +541,49 @@ _GetCamBounds(bool *bUseCamStartY, bool *bUseCamEndY, bool *bUseCamStartX, bool
 	}
 }
 
+
+inline bool 
+_IsColideWithBlock(int32 x, int32 y, int32 &block)
+{
+	block = CWaterLevel::aWaterFineBlockList[x + 0][y + 0];
+	if (!(block & 0x80))
+		return true;
+
+	block = CWaterLevel::aWaterFineBlockList[x + 0][y + 1];
+	if (!(block & 0x80))
+	{
+		block = CWaterLevel::aWaterFineBlockList[x + 0][y + 2];
+		if (!(block & 0x80))
+			return true;
+	}
+
+	block = CWaterLevel::aWaterFineBlockList[x + 1][y + 0];
+	if (!(block & 0x80))
+		return true;
+
+	block = CWaterLevel::aWaterFineBlockList[x + 1][y + 1];
+	if (!(block & 0x80))
+	{
+		block = CWaterLevel::aWaterFineBlockList[x + 1][y + 2];
+		if (!(block & 0x80))
+			return true;
+	}
+
+	block = CWaterLevel::aWaterFineBlockList[x + 2][y + 0];
+	if (!(block & 0x80))
+		return true;
+
+	block = CWaterLevel::aWaterFineBlockList[x + 2][y + 1];
+	if (!(block & 0x80))
+	{
+		block = CWaterLevel::aWaterFineBlockList[x + 2][y + 2];
+		if (!(block & 0x80))
+			return true;
+	}
+
+	return false;
+}
+
 inline float
 SectorRadius(float fSize)
 {
@@ -345,64 +604,85 @@ CWaterLevel::RenderWater()
 	bool bUseCamStartX = false;
 	bool bUseCamEndY   = false;
 	
-	float fWavySectorMaxRenderDist      = _GetWavyDrawDist();
-	float fWavySectorMaxRenderDistSqr   = SQR(fWavySectorMaxRenderDist);
+	if ( !CGame::CanSeeWaterFromCurrArea() )
+		return;
 	
 	_GetCamBounds(&bUseCamStartY, &bUseCamEndY, &bUseCamStartX, &bUseCamEndX);
 
 	float fHugeSectorMaxRenderDist    = _GetWaterDrawDist();
 	float fHugeSectorMaxRenderDistSqr = SQR(fHugeSectorMaxRenderDist);
 	
-	float windAddUV = CWeather::Wind * 0.0015f + 0.0005f;
+	float windAddUV = CWeather::WindClipped * 0.0005f + 0.0006f;
 	
+	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
 	
 	if ( !CTimer::GetIsPaused() )
 	{
-#ifdef FIX_BUGS
-		TEXTURE_ADDU += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
-		TEXTURE_ADDV += (CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV) * CTimer::GetTimeStepFix();
-#else
-		TEXTURE_ADDU += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
-		TEXTURE_ADDV += CGeneral::GetRandomNumberInRange(-0.0005f, 0.0005f) + windAddUV;
-#endif
+		TEXTURE_ADDU       += windAddUV;
+		TEXTURE_ADDV       += windAddUV;
+		
+		_TEXTURE_MASK_ADDU += Sin(fAngle) 		 * 0.0005f + 1.1f * windAddUV;
+		_TEXTURE_MASK_ADDV -= Cos(fAngle * 1.3f) * 0.0005f + 1.2f * windAddUV;
+		
+		_TEXTURE_WAKE_ADDU -= Sin(fAngle) 		 * 0.0003f + windAddUV;
+		_TEXTURE_WAKE_ADDV += Cos(fAngle * 0.7f) * 0.0003f + windAddUV;
 	}
 	
+	if ( _TEXTURE_MASK_ADDU >= 1.0f )
+		_TEXTURE_MASK_ADDU = 0.0f;
+	if ( _TEXTURE_MASK_ADDV >= 1.0f )
+		_TEXTURE_MASK_ADDV = 0.0f;
+	
+	if ( _TEXTURE_WAKE_ADDU >= 1.0f )
+		_TEXTURE_WAKE_ADDU = 0.0f;
+	if ( _TEXTURE_WAKE_ADDV >= 1.0f )
+		_TEXTURE_WAKE_ADDV = 0.0f;
+	
 	if ( TEXTURE_ADDU >= 1.0f )
 		TEXTURE_ADDU = 0.0f;
 	if ( TEXTURE_ADDV >= 1.0f )
 		TEXTURE_ADDV = 0.0f;
 	
-	WavesCalculatedThisFrame = false;
+#ifdef PC_WATER
+	_fWaterZOffset = CWeather::WindClipped * 0.5f + 0.25f;
+#endif
 
 	RwRGBA color = { 0, 0, 0, 255 };
-	
-	color.red   = uint32((CTimeCycle::GetDirectionalRed()   * 0.5f + CTimeCycle::GetAmbientRed()  ) * 255.0f);
-	color.green = uint32((CTimeCycle::GetDirectionalGreen() * 0.5f + CTimeCycle::GetAmbientGreen()) * 255.0f);
-	color.blue  = uint32((CTimeCycle::GetDirectionalBlue()  * 0.5f + CTimeCycle::GetAmbientBlue() ) * 255.0f);
+
+	color.red   = CTimeCycle::GetWaterRed();
+	color.green = CTimeCycle::GetWaterGreen();
+	color.blue  = CTimeCycle::GetWaterBlue();
+
+#ifndef PC_WATER
+	RwRGBA colorUnderwater = { 0, 0, 0, 255 };
+	colorUnderwater.red = (uint32)(0.8f * (float)colorUnderwater.red);
+	colorUnderwater.green = (uint32)(0.8f * (float)colorUnderwater.green);
+	colorUnderwater.blue = (uint32)(0.8f * (float)colorUnderwater.blue);
+#endif
 
 	TempBufferVerticesStored = 0;
 	TempBufferIndicesStored = 0;
+
+#ifndef PC_WATER
+	WavesCalculatedThisFrame = false;
+#endif
 	
 	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)gpWaterRaster);
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE,     (void *)TRUE);
 	RwRenderStateSet(rwRENDERSTATESRCBLEND,      (void *)rwBLENDONE);
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND,     (void *)rwBLENDZERO);
 	
-	CVector2D camPos
-	(
-		TheCamera.GetPosition().x,
-		TheCamera.GetPosition().y
-	);
+	CVector2D camPos(TheCamera.GetPosition().x, TheCamera.GetPosition().y);
 
-	int32 nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x - fHugeSectorMaxRenderDist);
-	int32 nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x + fHugeSectorMaxRenderDist) + 1;
+	int32 nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x - fHugeSectorMaxRenderDist + WATER_X_OFFSET);
+	int32 nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x + fHugeSectorMaxRenderDist + WATER_X_OFFSET) + 1;
 	int32 nStartY = WATER_TO_HUGE_SECTOR_Y(camPos.y - fHugeSectorMaxRenderDist);
 	int32 nEndY   = WATER_TO_HUGE_SECTOR_Y(camPos.y + fHugeSectorMaxRenderDist) + 1;
-
+	
 	if ( bUseCamStartX )
-		nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x);
+		nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x + WATER_X_OFFSET);
 	if ( bUseCamEndX )
-		nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x);
+		nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x + WATER_X_OFFSET);
 	if ( bUseCamStartY )
 		nStartY = WATER_TO_HUGE_SECTOR_Y(camPos.y);
 	if ( bUseCamEndY )                             
@@ -417,12 +697,279 @@ CWaterLevel::RenderWater()
 	{
 		for ( int32 y = nStartY; y <= nEndY; y++ )
 		{
-			if (   !(aWaterBlockList[2*x+0][2*y+0] & 128)
-				|| !(aWaterBlockList[2*x+1][2*y+0] & 128)
-				|| !(aWaterBlockList[2*x+0][2*y+1] & 128)
-				|| !(aWaterBlockList[2*x+1][2*y+1] & 128) )
+			if (   !(aWaterBlockList[2*x+0][2*y+0] & 0x80)
+				|| !(aWaterBlockList[2*x+1][2*y+0] & 0x80)
+				|| !(aWaterBlockList[2*x+0][2*y+1] & 0x80)
+				|| !(aWaterBlockList[2*x+1][2*y+1] & 0x80) )
+			{
+				float fX = WATER_FROM_HUGE_SECTOR_X(x) - WATER_X_OFFSET;
+				float fY = WATER_FROM_HUGE_SECTOR_Y(y);
+
+				CVector2D vecHugeSectorCentre(fX + HUGE_SECTOR_SIZE/2,fY + HUGE_SECTOR_SIZE/2);
+
+				float fHugeSectorDistToCamSqr = (camPos - vecHugeSectorCentre).MagnitudeSqr();
+				
+				if ( fHugeSectorMaxRenderDistSqr > fHugeSectorDistToCamSqr )
+				{
+					if ( TheCamera.IsSphereVisible(CVector(vecHugeSectorCentre.x, vecHugeSectorCentre.y, 0.0f), SectorRadius(HUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
+					{
+#ifndef PC_WATER
+						WavesCalculatedThisFrame = true;
+#endif
+
+
+						float fZ;
+
+						if ( !(aWaterBlockList[2*x+0][2*y+0] & 0x80) )
+							fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+0] ];
+
+						if ( !(aWaterBlockList[2*x+1][2*y+0] & 0x80) )
+							fZ = ms_aWaterZs[ aWaterBlockList[2*x+1][2*y+0] ];
+
+						if ( !(aWaterBlockList[2*x+0][2*y+1] & 0x80) )
+							fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+1] ];
+
+						if ( !(aWaterBlockList[2*x+1][2*y+1] & 0x80) )
+							fZ = ms_aWaterZs[ aWaterBlockList[2*x+1][2*y+1] ];
+						
+						if ( fHugeSectorDistToCamSqr >= SQR(500.0f) )
+						{
+							RenderOneFlatHugeWaterPoly(fX, fY, fZ, color);
+						}
+						else
+						{
+#ifndef PC_WATER
+							if (m_bRenderSeaBed)
+								RenderOneSlopedUnderWaterPoly(fX, fY, fZ, colorUnderwater);
+#endif
+							// see RenderTransparentWater()
+							;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/*
+	 -----------      ----------------------       ----------------------
+	|    [N]    |    |       [ EndY ]       |     |       [  top ]       |
+	|           |    |                      |     |                      |
+	|[W] [0] [E]|    |[StartX]  []  [ EndX ]|     |[ left ]  []  [ right]|
+	|           |    |                      |     |                      |
+	|    [S]    |    |       [StartY]       |     |       [bottom]       |
+	 -----------      ----------------------       ----------------------
+	
+	
+	[S] [StartY]  [bottom]
+	[N] [EndY]    [top]
+	[W] [StartX]  [left]
+	[E] [EndX]    [right]
+	
+	[S]    -> [N] && [W]  -> [E]
+	bottom -> top && left -> right
+	*/
+
+	for ( int32 x = 0; x < 26; x++ )
+	{
+		for ( int32 y = 0; y < 5; y++ )
+		{
+			float fX = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f - 400.0f;
+			float fY = WATER_SIGN_Y(float(y) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
+			
+			if ( !bUseCamStartY )
+			{
+				CVector2D vecExtraHugeSectorCentre(fX + EXTRAHUGE_SECTOR_SIZE/2, fY + EXTRAHUGE_SECTOR_SIZE/2);
+				
+				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
+				
+				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
+				{
+					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
+					{
+						RenderOneFlatExtraHugeWaterPoly(
+							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
+							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
+							0.0f,
+							color);
+					}
+				}
+			}
+			
+			if ( !bUseCamEndY )
+			{
+				CVector2D vecExtraHugeSectorCentre(fX + EXTRAHUGE_SECTOR_SIZE/2, -(fY + EXTRAHUGE_SECTOR_SIZE/2));
+				
+				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
+				
+				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
+				{
+					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
+					{
+						RenderOneFlatExtraHugeWaterPoly(
+							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
+							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
+							0.0f,
+							color);
+					}
+				}
+			}
+		}
+	}
+	
+	for ( int32 y = 5; y < 21; y++ )
+	{
+		for ( int32 x = 0; x < 5; x++ )
+		{
+			float fX = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE)  - 1280.0f - WATER_X_OFFSET;
+			float fX2 = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f + WATER_X_OFFSET;
+			float fY = WATER_SIGN_Y(float(y) * EXTRAHUGE_SECTOR_SIZE)  - 1280.0f;
+			
+			if ( !bUseCamStartX )
+			{
+				CVector2D vecExtraHugeSectorCentre(fX + EXTRAHUGE_SECTOR_SIZE/2, fY + EXTRAHUGE_SECTOR_SIZE/2);
+				
+				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
+				
+				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
+				{
+					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
+					{
+						RenderOneFlatExtraHugeWaterPoly(
+							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
+							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
+							0.0f,
+							color);
+					}
+				}
+			}
+			
+			if ( !bUseCamEndX )
+			{
+				CVector2D vecExtraHugeSectorCentre(-(fX2 + EXTRAHUGE_SECTOR_SIZE/2), fY + EXTRAHUGE_SECTOR_SIZE/2);
+				
+				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
+				
+				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
+				{
+					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.x, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
+					{
+						RenderOneFlatExtraHugeWaterPoly(
+							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
+							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
+							0.0f,
+							color);
+					}
+				}
+			}
+		}
+	}
+	
+	RenderAndEmptyRenderBuffer();
+
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void *)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDINVSRCALPHA);
+	
+	if ( WavesCalculatedThisFrame )
+	{
+		RenderSeaBirds();
+		RenderShipsOnHorizon();
+		CParticle::HandleShipsAtHorizonStuff();
+		HandleBeachToysStuff();
+	}
+	
+	if ( _bSeaLife )
+		HandleSeaLifeForms();
+
+	DefinedState();
+}
+
+
+void
+CWaterLevel::RenderTransparentWater(void)
+{
+	bool bUseCamEndX  = false;
+	bool bUseCamStartY = false;
+	
+	bool bUseCamStartX = false;
+	bool bUseCamEndY   = false;
+	
+	_bSeaLife = false;
+	
+	if ( !CGame::CanSeeWaterFromCurrArea() )
+		return;
+	
+	float fWaterDrawDist      = _GetWavyDrawDist();
+	float fWaterDrawDistLarge = fWaterDrawDist + 90.0f;
+	float fWavySectorMaxRenderDistSqr   = SQR(fWaterDrawDist);
+	
+	_GetCamBounds(&bUseCamStartY, &bUseCamEndY, &bUseCamStartX, &bUseCamEndX);
+
+	float fHugeSectorMaxRenderDist    = _GetWaterDrawDist();
+	float fHugeSectorMaxRenderDistSqr = SQR(fHugeSectorMaxRenderDist);
+	
+	RenderBoatWakes();
+	
+	RwRGBA color;
+	
+	color.red   = CTimeCycle::GetWaterRed();
+	color.green = CTimeCycle::GetWaterGreen();
+	color.blue  = CTimeCycle::GetWaterBlue();
+	color.alpha = 255;
+	
+	RwRGBA colorTrans;
+	
+	colorTrans.red   = CTimeCycle::GetWaterRed();
+	colorTrans.green = CTimeCycle::GetWaterGreen();
+	colorTrans.blue  = CTimeCycle::GetWaterBlue();
+	colorTrans.alpha = CTimeCycle::GetWaterAlpha();
+	
+	TempBufferVerticesStored = 0;
+	TempBufferIndicesStored = 0;
+
+#ifndef PC_WATER
+	WavesCalculatedThisFrame = false;
+#endif
+	
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)gpWaterRaster);
+#ifndef PC_WATER
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void *)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDINVSRCALPHA);
+#endif
+	
+	CVector2D camPos(TheCamera.GetPosition().x, TheCamera.GetPosition().y);
+
+	int32 nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x - fHugeSectorMaxRenderDist + WATER_X_OFFSET);
+	int32 nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x + fHugeSectorMaxRenderDist + WATER_X_OFFSET) + 1;
+	int32 nStartY = WATER_TO_HUGE_SECTOR_Y(camPos.y - fHugeSectorMaxRenderDist         );
+	int32 nEndY   = WATER_TO_HUGE_SECTOR_Y(camPos.y + fHugeSectorMaxRenderDist         ) + 1;
+
+	if ( bUseCamStartX )
+		nStartX = WATER_TO_HUGE_SECTOR_X(camPos.x + WATER_X_OFFSET);
+	if ( bUseCamEndX )
+		nEndX   = WATER_TO_HUGE_SECTOR_X(camPos.x + WATER_X_OFFSET);
+	if ( bUseCamStartY )
+		nStartY = WATER_TO_HUGE_SECTOR_Y(camPos.y         );
+	if ( bUseCamEndY )                                      
+		nEndY   = WATER_TO_HUGE_SECTOR_Y(camPos.y         );
+	
+	nStartX = clamp(nStartX, 0, MAX_HUGE_SECTORS - 1);
+	nEndX   = clamp(nEndX,   0, MAX_HUGE_SECTORS - 1);
+	nStartY = clamp(nStartY, 0, MAX_HUGE_SECTORS - 1);
+	nEndY   = clamp(nEndY,   0, MAX_HUGE_SECTORS - 1);
+	
+	
+	for ( int32 x = nStartX; x <= nEndX; x++ )
+	{
+		for ( int32 y = nStartY; y <= nEndY; y++ )
+		{
+			if (   !(aWaterBlockList[2*x+0][2*y+0] & 0x80)
+				|| !(aWaterBlockList[2*x+1][2*y+0] & 0x80)
+				|| !(aWaterBlockList[2*x+0][2*y+1] & 0x80)
+				|| !(aWaterBlockList[2*x+1][2*y+1] & 0x80) )
 			{
-				float fX = WATER_FROM_HUGE_SECTOR_X(x);
+				float fX = WATER_FROM_HUGE_SECTOR_X(x) - WATER_X_OFFSET;
 				float fY = WATER_FROM_HUGE_SECTOR_Y(y);
 
 				CVector2D vecHugeSectorCentre
@@ -432,29 +979,15 @@ CWaterLevel::RenderWater()
 				);
 
 				float fHugeSectorDistToCamSqr = (camPos - vecHugeSectorCentre).MagnitudeSqr();
-
+				
 				if ( fHugeSectorMaxRenderDistSqr > fHugeSectorDistToCamSqr )
 				{
-					if ( TheCamera.IsSphereVisible(CVector(vecHugeSectorCentre.x, vecHugeSectorCentre.y, 0.0f), SectorRadius(HUGE_SECTOR_SIZE),
-							&TheCamera.GetCameraMatrix()) )
+					if ( TheCamera.IsSphereVisible(CVector(vecHugeSectorCentre.x, vecHugeSectorCentre.y, 0.0f), SectorRadius(HUGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
 					{
-						if ( fHugeSectorDistToCamSqr >= SQR(500.0f) /*fHugeSectorNearDist*/ )
+						if ( fHugeSectorDistToCamSqr >= SQR(500.0f) )
 						{
-							float fZ;
-	
-							if ( !(aWaterBlockList[2*x+0][2*y+0] & 128) )
-								fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+0] ];
-	
-							if ( !(aWaterBlockList[2*x+1][2*y+0] & 128) )
-								fZ = ms_aWaterZs[ aWaterBlockList[2*x+1][2*y+0] ];
-	
-							if ( !(aWaterBlockList[2*x+0][2*y+1] & 128) )
-								fZ = ms_aWaterZs[ aWaterBlockList[2*x+0][2*y+1] ];
-	
-							if ( !(aWaterBlockList[2*x+1][2*y+1] & 128) )
-								fZ = ms_aWaterZs[ aWaterBlockList[2*x+1][2*y+1] ];
-							
-							RenderOneFlatHugeWaterPoly(fX, fY, fZ, color);
+							// see RenderWater()
+							;
 						}
 						else
 						{
@@ -462,23 +995,18 @@ CWaterLevel::RenderWater()
 							{
 								for ( int32 y2 = 2*y; y2 <= 2*y+1; y2++ )
 								{
-									if ( !(aWaterBlockList[x2][y2] & 128) )
+									if ( !(aWaterBlockList[x2][y2] & 0x80) )
 									{
-										float fLargeX = WATER_FROM_LARGE_SECTOR_X(x2);
+										float fLargeX = WATER_FROM_LARGE_SECTOR_X(x2) - WATER_X_OFFSET;
 										float fLargeY = WATER_FROM_LARGE_SECTOR_Y(y2);
 						
-										CVector2D vecLargeSectorCentre
-										(
-											fLargeX + LARGE_SECTOR_SIZE/2,
-											fLargeY + LARGE_SECTOR_SIZE/2
-										);
+										CVector2D vecLargeSectorCentre(fLargeX + LARGE_SECTOR_SIZE/2, fLargeY + LARGE_SECTOR_SIZE/2);
 										
 										float fLargeSectorDistToCamSqr = (camPos - vecLargeSectorCentre).MagnitudeSqr();
 										
 										if ( fLargeSectorDistToCamSqr < fHugeSectorMaxRenderDistSqr )
 										{
-											if ( TheCamera.IsSphereVisible(CVector(vecLargeSectorCentre.x, vecLargeSectorCentre.y, 0.0f), SectorRadius(LARGE_SECTOR_SIZE), //90.879997f,
-												&TheCamera.GetCameraMatrix()) )
+											if ( TheCamera.IsSphereVisible(CVector(vecLargeSectorCentre.x, vecLargeSectorCentre.y, 0.0f), SectorRadius(LARGE_SECTOR_SIZE), &TheCamera.GetCameraMatrix()) )
 											{
 												// Render four small(32x32) sectors, or one large(64x64).
 
@@ -491,93 +1019,81 @@ CWaterLevel::RenderWater()
 												//	    ---------
 												//	       [S]
 												//	
-
-												if ( fLargeSectorDistToCamSqr < SQR(176.0f) )
-												{						
+												
+												float fLargeSectorDrawDistSqr = SQR((fWaterDrawDistLarge + 16.0f));
+												
+												if ( fLargeSectorDistToCamSqr < fLargeSectorDrawDistSqr )
+												{
+													_bSeaLife = true;
+													
 													float fZ;
 													
 													// WS
-													if ( !(aWaterFineBlockList[2*x2+0][2*y2+0] & 128) )
+													if ( !(aWaterFineBlockList[2*x2+0][2*y2+0] & 0x80) )
 													{
 														float fSmallX = fLargeX;
 														float fSmallY = fLargeY;
 														
-														CVector2D vecSmallSectorCentre
-														(
-															fSmallX + SMALL_SECTOR_SIZE/2,
-															fSmallY + SMALL_SECTOR_SIZE/2
-														);
+														CVector2D vecSmallSectorCentre(fSmallX + SMALL_SECTOR_SIZE/2, fSmallY + SMALL_SECTOR_SIZE/2);
 														
 														float fSmallSectorDistToCamSqr = (camPos - vecSmallSectorCentre).MagnitudeSqr();
 														fZ = ms_aWaterZs[ aWaterFineBlockList[2*x2+0][2*y2+0] ];
 														
 														if ( fSmallSectorDistToCamSqr < fWavySectorMaxRenderDistSqr )
-															RenderOneWavySector(fSmallX, fSmallY, fZ, color);
+															RenderOneWavySector(fSmallX, fSmallY, fZ, colorTrans);
 														else
-															RenderOneFlatSmallWaterPoly(fSmallX, fSmallY, fZ, color);
+															RenderOneFlatSmallWaterPolyBlended(fSmallX, fSmallY, fZ, camPos.x, camPos.y, color, colorTrans, fWaterDrawDist);
 													}
 													
 													// SE
-													if ( !(aWaterFineBlockList[2*x2+1][2*y2+0] & 128) )
+													if ( !(aWaterFineBlockList[2*x2+1][2*y2+0] & 0x80) )
 													{
 														float fSmallX = fLargeX + (LARGE_SECTOR_SIZE/2);
 														float fSmallY = fLargeY;
 														
-														CVector2D vecSmallSectorCentre
-														(
-															fSmallX + SMALL_SECTOR_SIZE/2,
-															fSmallY + SMALL_SECTOR_SIZE/2
-														);
+														CVector2D vecSmallSectorCentre(fSmallX + SMALL_SECTOR_SIZE/2, fSmallY + SMALL_SECTOR_SIZE/2);
 														
 														float fSmallSectorDistToCamSqr = (camPos - vecSmallSectorCentre).MagnitudeSqr();
 														fZ = ms_aWaterZs[ aWaterFineBlockList[2*x2+1][2*y2+0] ];
 														
 														if ( fSmallSectorDistToCamSqr < fWavySectorMaxRenderDistSqr )
-															RenderOneWavySector(fSmallX, fSmallY, fZ, color);
+															RenderOneWavySector(fSmallX, fSmallY, fZ, colorTrans);
 														else
-															RenderOneFlatSmallWaterPoly(fSmallX, fSmallY, fZ, color);
+															RenderOneFlatSmallWaterPolyBlended(fSmallX, fSmallY, fZ, camPos.x, camPos.y, color, colorTrans, fWaterDrawDist);
 													}
 													
 													// WN
-													if ( !(aWaterFineBlockList[2*x2+0][2*y2+1] & 128) )
+													if ( !(aWaterFineBlockList[2*x2+0][2*y2+1] & 0x80) )
 													{
 														float fSmallX = fLargeX;
 														float fSmallY = fLargeY + (LARGE_SECTOR_SIZE/2);
 														
-														CVector2D vecSmallSectorCentre
-														(
-															fSmallX + SMALL_SECTOR_SIZE/2,
-															fSmallY + SMALL_SECTOR_SIZE/2
-														);
+														CVector2D vecSmallSectorCentre(fSmallX + SMALL_SECTOR_SIZE/2,fSmallY + SMALL_SECTOR_SIZE/2);
 														
 														float fSmallSectorDistToCamSqr = (camPos - vecSmallSectorCentre).MagnitudeSqr();
 														fZ = ms_aWaterZs[ aWaterFineBlockList[2*x2+0][2*y2+1] ];
 														
 														if ( fSmallSectorDistToCamSqr < fWavySectorMaxRenderDistSqr )
-															RenderOneWavySector(fSmallX, fSmallY, fZ, color);
+															RenderOneWavySector(fSmallX, fSmallY, fZ, colorTrans);
 														else
-															RenderOneFlatSmallWaterPoly(fSmallX, fSmallY, fZ, color);
+															RenderOneFlatSmallWaterPolyBlended(fSmallX, fSmallY, fZ, camPos.x, camPos.y, color, colorTrans, fWaterDrawDist);
 													}
 													
 													//NE
-													if ( !(aWaterFineBlockList[2*x2+1][2*y2+1] & 128) )
+													if ( !(aWaterFineBlockList[2*x2+1][2*y2+1] & 0x80) )
 													{
 														float fSmallX = fLargeX + (LARGE_SECTOR_SIZE/2);
 														float fSmallY = fLargeY + (LARGE_SECTOR_SIZE/2);
 														
-														CVector2D vecSmallSectorCentre
-														(
-															fSmallX + SMALL_SECTOR_SIZE/2,
-															fSmallY + SMALL_SECTOR_SIZE/2
-														);
+														CVector2D vecSmallSectorCentre(fSmallX + SMALL_SECTOR_SIZE/2, fSmallY + SMALL_SECTOR_SIZE/2);
 														
 														float fSmallSectorDistToCamSqr = (camPos - vecSmallSectorCentre).MagnitudeSqr();
 														fZ = ms_aWaterZs[ aWaterFineBlockList[2*x2+1][2*y2+1] ];
 														
 														if ( fSmallSectorDistToCamSqr < fWavySectorMaxRenderDistSqr )
-															RenderOneWavySector(fSmallX, fSmallY, fZ, color);
+															RenderOneWavySector(fSmallX, fSmallY, fZ, colorTrans);
 														else
-															RenderOneFlatSmallWaterPoly(fSmallX, fSmallY, fZ, color);
+															RenderOneFlatSmallWaterPolyBlended(fSmallX, fSmallY, fZ, camPos.x, camPos.y, color, colorTrans, fWaterDrawDist);
 													}
 												}
 												else
@@ -588,13 +1104,11 @@ CWaterLevel::RenderWater()
                                                 
 													RenderOneFlatLargeWaterPoly(fLargeX, fLargeY, fZ, color);
 												}
-											}	//	if ( TheCamera.IsSphereVisible
-										}	//	if ( fLargeSectorDistToCamSqr < fHugeSectorMaxRenderDistSqr )
-									}	//	if ( !(aWaterBlockList[x2][y2] & 128) )
-								}	//	for ( int32 y2 = 2*y; y2 <= 2*y+1; y2++ )
-							}	//	for ( int32 x2 = 2*x; x2 <= 2*x+1; x2++ )
-							//
-							
+											}
+										}
+									}
+								}
+							}
 						}
 					}
 				}
@@ -602,195 +1116,100 @@ CWaterLevel::RenderWater()
 		}
 	}
 	
-	/*
-	 -----------      ----------------------       ----------------------
-	|    [N]    |    |       [ EndY ]       |     |       [  top ]       |
-	|           |    |                      |     |                      |
-	|[W] [0] [E]|    |[StartX]  []  [ EndX ]|     |[ left ]  []  [ right]|
-	|           |    |                      |     |                      |
-	|    [S]    |    |       [StartY]       |     |       [bottom]       |
-	 -----------      ----------------------       ----------------------
-	
-	
-	[S] [StartY]  [bottom]
-	[N] [EndY]    [top]
-	[W] [StartX]  [left]
-	[E] [EndX]    [right]
+	RenderAndEmptyRenderBuffer();
 	
-	[S]    -> [N] && [W]  -> [E]
-	bottom -> top && left -> right
-	*/
-
-	if ( !bUseCamStartY )
+#ifdef PC_WATER
+	if ( MaskCalculatedThisFrame
+		&& (m_nRenderWaterLayers == 0 || m_nRenderWaterLayers == 2 || m_nRenderWaterLayers == 3) )
 	{
-		for ( int32 x = 0; x < 26; x++ )
-		{
-			for ( int32 y = 0; y < 5; y++ )
-			{
-				float fX = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
-				float fY = WATER_SIGN_Y(float(y) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
-				
-				CVector2D vecExtraHugeSectorCentre
-				(
-					fX + EXTRAHUGE_SECTOR_SIZE/2,
-					fY + EXTRAHUGE_SECTOR_SIZE/2
-				);
-				
-				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
+		RwV3d pos = { 0.0f, 0.0f, 0.0f };
+
+		pos.x = PreCalculatedMaskPosn.x;
+		pos.y = PreCalculatedMaskPosn.y;
+		pos.z = PreCalculatedMaskPosn.z;
+
+		RpMatFXMaterialSetEnvMapFrame(RpGeometryGetMaterial(RpAtomicGetGeometry(ms_pMaskAtomic), 0),
+										RwCameraGetFrame(RwCameraGetCurrentCamera()));
+
+		RwFrameTranslate(RpAtomicGetFrame(ms_pMaskAtomic), &pos, rwCOMBINEREPLACE);
 				
-				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
-				{
-					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE),
-							&TheCamera.GetCameraMatrix()) )
-					{
-						RenderOneFlatExtraHugeWaterPoly(
-							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
-							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
-							0.0f,
-							color);
-					}
-				}
-			}
-		}
+		RpAtomicRender(ms_pMaskAtomic);
 	}
-	
-	for ( int32 y = 5; y < 21; y++ )
+#else
+	if (!CCullZones::WaterFudge())
 	{
-		for ( int32 x = 0; x < 5; x++ )
-		{
-			float fX = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
-			float fX2 = WATER_SIGN_X(float(x) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
-			float fY = WATER_SIGN_Y(float(y) * EXTRAHUGE_SECTOR_SIZE) - 1280.0f;
-			
-			if ( !bUseCamStartX )
-			{
-				CVector2D vecExtraHugeSectorCentre
-				(
-					fX + EXTRAHUGE_SECTOR_SIZE/2,
-					fY + EXTRAHUGE_SECTOR_SIZE/2
-				);
-				
-				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
-				
-				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
-				{
-					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE),
-							&TheCamera.GetCameraMatrix()) )
-					{
-						RenderOneFlatExtraHugeWaterPoly(
-							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
-							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
-							0.0f,
-							color);
-					}
-				}
-			}
-			
-			if ( !bUseCamEndX )
-			{
-				CVector2D vecExtraHugeSectorCentre
-				(
-					-(fX2 + EXTRAHUGE_SECTOR_SIZE/2),
-					fY + EXTRAHUGE_SECTOR_SIZE/2
-				);
-				
-				float fCamDistToSector = (vecExtraHugeSectorCentre - camPos).Magnitude();
-				
-				if ( fCamDistToSector < fHugeSectorMaxRenderDistSqr )
-				{
-					if ( TheCamera.IsSphereVisible(CVector(vecExtraHugeSectorCentre.x, vecExtraHugeSectorCentre.y, 0.0f), SectorRadius(EXTRAHUGE_SECTOR_SIZE),
-							&TheCamera.GetCameraMatrix()) )
-					{
-						RenderOneFlatExtraHugeWaterPoly(
-							vecExtraHugeSectorCentre.x - EXTRAHUGE_SECTOR_SIZE/2,
-							vecExtraHugeSectorCentre.y - EXTRAHUGE_SECTOR_SIZE/2,
-							0.0f,
-							color);
-					}
-				}
-			}
-		}
-	}
+		int32 signX = 0;
+		int32 signY = 0;
 
-	RenderAndEmptyRenderBuffer();
-	
-	CVector cur_pos = TheCamera.GetPosition();
-	
-	if ( !CCullZones::CamNoRain()
-		&& !CCullZones::PlayerNoRain()
-		&& CWeather::NewWeatherType == WEATHER_SUNNY
-		&& CClock::GetHours() > 6 && CClock::GetHours() < 20
-		&& WavesCalculatedThisFrame)
-	{
-		static CVector prev_pos(0.0f, 0.0f, 0.0f);
-		static CVector prev_front(0.0f, 0.0f, 0.0f);
-		static int32 timecounter;
+		float fCamX = camPos.x - SMALL_SECTOR_SIZE;
+		float fCamY = camPos.y - SMALL_SECTOR_SIZE;
 
-		if ( Abs(prev_pos.x - cur_pos.x) + Abs(prev_pos.y - cur_pos.y) + Abs(prev_pos.z - cur_pos.z) > 1.5f )
-		{
-			prev_pos = cur_pos;
-			timecounter = CTimer::GetTimeInMilliseconds();
-		}
-		else if ( CTimer::GetTimeInMilliseconds() - timecounter > 5000 )
+		if (TheCamera.GetForward().x > 0.3f)
+			signX = 1;
+		else if (TheCamera.GetForward().x < -0.3f)
+			signX = -1;
+
+		fCamX += 0.3f * (float)signX * float(SMALL_SECTOR_SIZE * 2.0f); // 19.2f
+
+		if (TheCamera.GetForward().y > 0.3f)
+			signY = 1;
+		else if (TheCamera.GetForward().y < -0.3f)
+			signY = -1;
+
+		fCamY += 0.3f * (float)signY * float(SMALL_SECTOR_SIZE * 2.0f); // 19.2f
+
+		int32 nBlock;
+
+		int32 BlockX = WATER_TO_SMALL_SECTOR_X(fCamX + 400.0f) + 1;
+		int32 BlockY = WATER_TO_SMALL_SECTOR_Y(fCamY) + 1;
+
+		if (_IsColideWithBlock(BlockX, BlockY, nBlock))
 		{
-			static int32 birdgenTime = 0;
-			
-			if ( CTimer::GetTimeInMilliseconds() - birdgenTime > 1000 )
+			if (m_nRenderWaterLayers != 1 && m_nRenderWaterLayers != 6)
 			{
-				birdgenTime = CTimer::GetTimeInMilliseconds();
-				
-				CVector vecPos = cur_pos;
-				
-				float fAngle = CGeneral::GetRandomNumberInRange(90.0f, 150.0f);
-				
-				int32 nRot = CGeneral::GetRandomNumber() % CParticle::SIN_COS_TABLE_SIZE-1;
-				
-				float fCos = CParticle::Cos(nRot);
-				float fSin = CParticle::Sin(nRot);
-
-				vecPos.x += (fCos - fSin) * fAngle;
-				vecPos.y += (fSin + fCos) * fAngle;
-				vecPos.z += CGeneral::GetRandomNumberInRange(10.0f, 30.0f);
-				
-				CVector vecDir(CGeneral::GetRandomNumberInRange(-1.0f, 1.0f),
-								CGeneral::GetRandomNumberInRange(-1.0f, 1.0f),
-								0.0f);
-				
-				CParticle::AddParticle(PARTICLE_BIRD_FRONT, vecPos, vecDir);
+				float fMaskX = floorf(fCamX / 2.0f) * 2.0f;
+				float fMaskY = floorf(fCamY / 2.0f) * 2.0f;
+				float fWaterZ = CWaterLevel::ms_aWaterZs[nBlock];
+				float fSectorX = WATER_FROM_SMALL_SECTOR_X(BlockX) - 400.0f;
+				float fSectorY = WATER_FROM_SMALL_SECTOR_Y(BlockY);
+
+				RenderWavyMask(fMaskX, fMaskY, fWaterZ,
+					fSectorX, fSectorY,
+					signX, signY, colorTrans);
 			}
 		}
 	}
-	
+
 	DefinedState();
+#endif
 }
 
-void
-CWaterLevel::RenderOneFlatSmallWaterPoly(float fX, float fY, float fZ, RwRGBA const &color)
+void CWaterLevel::RenderOneFlatSmallWaterPoly(float fX, float fY, float fZ, RwRGBA const &color)
 {
 	if ( TempBufferIndicesStored >= TEMPBUFFERINDEXSIZE-6 || TempBufferVerticesStored >= TEMPBUFFERVERTSIZE-4 )
 		RenderAndEmptyRenderBuffer();
 	
 	int32 vidx = TempBufferVerticesStored;
 	
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 0], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + SMALL_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + SMALL_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDV + 1.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 1], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + SMALL_SECTOR_SIZE, fY + SMALL_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + SMALL_SECTOR_SIZE, fY + SMALL_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDU + 1.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDV + 1.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 2], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + SMALL_SECTOR_SIZE, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + SMALL_SECTOR_SIZE, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDU + 1.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 3], color);
 	
 	
 	int32 iidx = TempBufferIndicesStored;
@@ -814,25 +1233,25 @@ CWaterLevel::RenderOneFlatLargeWaterPoly(float fX, float fY, float fZ, RwRGBA co
 	
 	int32 vidx = TempBufferVerticesStored;
 	
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 0], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + LARGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + LARGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDV + 2.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 1], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + LARGE_SECTOR_SIZE, fY + LARGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + LARGE_SECTOR_SIZE, fY + LARGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDU + 2.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDV + 2.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 2], color);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + LARGE_SECTOR_SIZE, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + LARGE_SECTOR_SIZE, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDU + 2.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue, color.alpha);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 3], color);
 
 
 	int32 iidx = TempBufferIndicesStored;
@@ -855,27 +1274,33 @@ CWaterLevel::RenderOneFlatHugeWaterPoly(float fX, float fY, float fZ, RwRGBA con
 		RenderAndEmptyRenderBuffer();
 	
 	int32 vidx = TempBufferVerticesStored;
-
 	
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - WATER_Z_OFFSET);
+	RwRGBA c;
+	
+	c.red = color.red;
+	c.green = color.green;
+	c.blue = color.blue;
+	c.alpha = 255;
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 0], c);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + HUGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + HUGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDV + 4.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 1], c);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + HUGE_SECTOR_SIZE, fY + HUGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + HUGE_SECTOR_SIZE, fY + HUGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDU + 4.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDV + 4.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 2], c);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + HUGE_SECTOR_SIZE, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + HUGE_SECTOR_SIZE, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDU + 4.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 3], c);
 
 
 	int32 iidx = TempBufferIndicesStored;
@@ -898,27 +1323,33 @@ CWaterLevel::RenderOneFlatExtraHugeWaterPoly(float fX, float fY, float fZ, RwRGB
 		RenderAndEmptyRenderBuffer();
 	
 	int32 vidx = TempBufferVerticesStored;
-
 	
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - WATER_Z_OFFSET);
+	RwRGBA c;
+	
+	c.red = color.red;
+	c.green = color.green;
+	c.blue = color.blue;
+	c.alpha = 255;
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 0], c);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + EXTRAHUGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + EXTRAHUGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDU);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDV + 8.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 1], c);
 
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + EXTRAHUGE_SECTOR_SIZE, fY + EXTRAHUGE_SECTOR_SIZE, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + EXTRAHUGE_SECTOR_SIZE, fY + EXTRAHUGE_SECTOR_SIZE, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDU + 8.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDV + 8.0f);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 2], c);
 	
-	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + EXTRAHUGE_SECTOR_SIZE, fY, fZ - WATER_Z_OFFSET);
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + EXTRAHUGE_SECTOR_SIZE, fY, fZ - _fWaterZOffset);
 	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDU + 8.0f);
 	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDV);
-	RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue, 255);
+	RwIm3DVertexSet_RGBA(&TempBufferRenderVertices[vidx + 3], c);
 
 
 	int32 iidx = TempBufferIndicesStored;
@@ -935,172 +1366,1218 @@ CWaterLevel::RenderOneFlatExtraHugeWaterPoly(float fX, float fY, float fZ, RwRGB
 }
 
 void
-CWaterLevel::RenderOneWavySector(float fX, float fY, float fZ, RwRGBA const &color, bool bUnk)
+CWaterLevel::RenderOneWavySector(float fX, float fY, float fZ, RwRGBA const &color, bool bDontRender)
 {
-	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);	
-	
-	if ( !WavesCalculatedThisFrame )
+	CVector vecSectorPos(fX + (SMALL_SECTOR_SIZE/2), fY + (SMALL_SECTOR_SIZE/2), fZ + 2.0f);
+
+	if ( COcclusion::IsAABoxOccluded(vecSectorPos, SMALL_SECTOR_SIZE, SMALL_SECTOR_SIZE, 4.0f) )
+		return;
+
+#ifdef PC_WATER
+	RequireWavySector = true;
+#else
+	if (!WavesCalculatedThisFrame)
 	{
-		nGeomUsed = 0;
-		
 		WavesCalculatedThisFrame = true;
+
+		float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
+
+		RpGeometry *wavyGeometry = RpAtomicGetGeometry(ms_pWavyAtomic);
+		RwTexCoords *wavyTexCoords = RpGeometryGetVertexTexCoords(wavyGeometry, rwTEXTURECOORDINATEINDEX0);
+		RpMorphTarget *wavyMorph = RpGeometryGetMorphTarget(wavyGeometry, 0);
+		RwRGBA *wavyPreLight = RpGeometryGetPreLightColors(wavyGeometry);
+		RwV3d *wavyMorphVerts = RpMorphTargetGetVertices(wavyMorph);
+		RwV3d *wavyMorphNormals = RpMorphTargetGetVertexNormals(wavyMorph);
+
+		RpGeometryLock(wavyGeometry, rpGEOMETRYLOCKVERTICES | rpGEOMETRYLOCKNORMALS | rpGEOMETRYLOCKPRELIGHT | rpGEOMETRYLOCKTEXCOORDS);
+
+		RwMatrix *camMat = RwFrameGetLTM(RwCameraGetFrame(RwCameraGetCurrentCamera())); //or curWorld
+
+		float randomDampInv2 = (1.0f - fRandomDamp) * 2.0f;
+
+		float move = 1.0f / 16.0f;
+		float randomMove = 1.0f / (16.0f * fRandomMoveDiv);
+
+		float vertMul = 0.5f;
+
+		float wind = CWeather::WindClipped * 0.4f + 0.2f;
+		float waveWind = CWeather::WindClipped * fWave2Ampl + 0.05f;
+
+		float waveA = (TWOPI / 16.0f)
+			* ((fNormalDirectionScalar1 * Abs(camMat->at.x + camMat->at.y) + fNormMult) * (CWeather::WindClipped * 0.4f + 0.2f));
+
+		float waveB = TWOPI / (16.0f * fWave2NormScale)
+			* ((fNormalDirectionScalar2 * Abs(camMat->at.y - camMat->at.x) + fNormMultB) * (CWeather::WindClipped * 0.2f + 0.1f));
+
+		CVector vA(1.0f, 0.0f, 0.0f);
+		CVector vB(0.0f, 1.0f, 0.0f);
+
+		for ( int32 i = 0; i < 17; i++ )
+		{
+			for ( int32 j = 0; j < 17; j++ )
+			{
+				wavyTexCoords->u = float(i) * move + TEXTURE_ADDV;
+				wavyTexCoords->v = float(j) * move + TEXTURE_ADDU;
+
+				RwRGBAAssign(wavyPreLight, &color);
+
+				if (i > 0 && i < 16 && j > 0 && j < 16)
+				{
+					wavyMorphVerts->x += CGeneral::GetRandomNumberInRange(-1.0f, 1.0f) * randomMove;
+					wavyMorphVerts->x *= fRandomDamp;
+					wavyMorphVerts->x += float(i) * randomDampInv2;
+
+					wavyMorphVerts->y += CGeneral::GetRandomNumberInRange(-1.0f, 1.0f) * randomMove;
+					wavyMorphVerts->y *= fRandomDamp;
+					wavyMorphVerts->y += float(j) * randomDampInv2;
+				}
+
+				float morphVertXHalf = (i == 16) ? 0.0f : vertMul * wavyMorphVerts->x;
+				float morphVertYHalf = (j == 16) ? 0.0f : vertMul * wavyMorphVerts->y;
+
+				float waveMulA = (morphVertYHalf + morphVertXHalf) * (TWOPI / 16.0f) + fAngle;
+				float waveMulB = (morphVertYHalf - morphVertXHalf) * (TWOPI / (16.0f * fWave2InvLength)) + fAngle;
+
+				wavyMorphVerts->z = wind * Sin(waveMulA) + waveWind * Sin(waveMulB);
+
+				vA.z = (waveA * Cos(waveMulA)) - (waveB * Cos(waveMulB));
+				vB.z = (waveA * Cos(waveMulA)) + (waveB * Cos(waveMulB));
+
+				CVector norm = CrossProduct(vA, vB);
+				norm.Normalise();
+
+				wavyMorphNormals->x = norm.x;
+				wavyMorphNormals->y = norm.y;
+				wavyMorphNormals->z = norm.z;
+
+				++wavyPreLight;
+				++wavyTexCoords;
+
+				++wavyMorphVerts;
+				++wavyMorphNormals;
+			}
+		}
+
+		RpGeometryUnlock(wavyGeometry);
+	}
+
+	float fCentreX = fX + (SMALL_SECTOR_SIZE / 2);
+	float fCentreY = fY + (SMALL_SECTOR_SIZE / 2);
+#endif
+	
+#ifdef PC_WATER
+	if ( WavesCalculatedThisFrame )
+#endif
+	{
+		if (bDontRender == false
+			&& m_nRenderWaterLayers != 2
+			&& m_nRenderWaterLayers != 4
+			&& m_nRenderWaterLayers != 6 )
+		{
+			RwV3d pos = { 0.0f, 0.0f, 0.0f };
+
+			pos.x = fX;
+			pos.y = fY;
+			pos.z = fZ;
+	
+			RwFrameTranslate(RpAtomicGetFrame(ms_pWavyAtomic), &pos, rwCOMBINEREPLACE);
 		
-		CBoat::FillBoatList();
+			RpAtomicRender(ms_pWavyAtomic);
+		}
+	}
+}
 		
-		ASSERT( ms_pWavyAtomic != NULL );
+int16
+_RoundValue(int32 v)
+{
+	int16 result = v;
+	
+	while ( result < 0 )  result += 16;
+	while ( result > 16 ) result -= 16;
+	
+	return result;
+}
 
-		RpGeometry *geometry = RpAtomicGetGeometry(ms_pWavyAtomic);
-		
-		ASSERT( geometry != NULL );
+void
+CWaterLevel::RenderWavyMask(float fX, float fY, float fZ,
+		float fSectorX, float fSectorY,
+#ifdef PC_WATER
+		float fCamPosX, float fCamPosY,
+		float fCamDirX, float fCamDirY, RwRGBA const&color)
+#else
+		int32 nCamDirX, int32 nCamDirY, RwRGBA const&color)
+#endif
+{
+#ifndef PC_WATER
+	bool bRender = true;
+	if (m_nRenderWaterLayers != 0 && m_nRenderWaterLayers != 2 && m_nRenderWaterLayers != 3)
+		bRender = false;
+#endif
+	CVector vecSectorPos(fX + (LARGE_SECTOR_SIZE/2), fY + (LARGE_SECTOR_SIZE/2), fZ + 2.0f);
 
-		RwRGBA      *wavyPreLights = RpGeometryGetPreLightColors(geometry);
-		RwTexCoords *wavyTexCoords = RpGeometryGetVertexTexCoords(geometry, rwTEXTURECOORDINATEINDEX0);
-		RwV3d       *wavyVertices  = RpMorphTargetGetVertices(RpGeometryGetMorphTarget(geometry, 0));
-		
-		ASSERT( wavyPreLights != NULL );
-		ASSERT( wavyTexCoords != NULL );
-		ASSERT( wavyVertices  != NULL );
+	if ( COcclusion::IsAABoxOccluded(vecSectorPos, LARGE_SECTOR_SIZE, LARGE_SECTOR_SIZE, 4.0f) )
+		return;
 
-		RpGeometryLock(geometry, rpGEOMETRYLOCKVERTICES
-								| rpGEOMETRYLOCKPRELIGHT
-								| rpGEOMETRYLOCKTEXCOORDS);
-		
-		for ( int32 i = 0; i < 9; i++ )
+#ifndef PC_WATER
+	float fUOffset = fX - (MAX_LARGE_SECTORS * (int32)floorf(fX / MAX_LARGE_SECTORS));
+	float fVOffset = fY - (MAX_LARGE_SECTORS * (int32)floorf(fY / MAX_LARGE_SECTORS));
+
+	int32 nSecsX = (int32)((fX - fSectorX) / 2.0f);
+	int32 nSecsY = (int32)((fY - fSectorY) / 2.0f);
+#endif
+	
+	RpGeometry    *wavyGeometry  = RpAtomicGetGeometry(ms_pWavyAtomic);
+	RpMorphTarget *wavyMorph     = RpGeometryGetMorphTarget(wavyGeometry, 0);
+	RwV3d *wavyMorphVerts        = RpMorphTargetGetVertices(wavyMorph);
+	RwV3d *wavyMorphNormals      = RpMorphTargetGetVertexNormals(wavyMorph);
+
+	RpGeometry    *maskGeometry  = RpAtomicGetGeometry(ms_pMaskAtomic);
+	RwTexCoords   *maskTexCoords = RpGeometryGetVertexTexCoords(maskGeometry, rwTEXTURECOORDINATEINDEX0);
+	RwRGBA        *maskPreLight  = RpGeometryGetPreLightColors(maskGeometry);
+	RpMorphTarget *maskMorph     = RpGeometryGetMorphTarget(maskGeometry, 0);
+	RwV3d *maskMorphVerts        = RpMorphTargetGetVertices(maskMorph);
+	RwV3d *maskMorphNormals      = RpMorphTargetGetVertexNormals(maskMorph);
+
+	RpGeometryLock(maskGeometry, rpGEOMETRYLOCKVERTICES|rpGEOMETRYLOCKNORMALS|rpGEOMETRYLOCKPRELIGHT|rpGEOMETRYLOCKTEXCOORDS);
+	
+#ifndef PC_WATER
+	RpMaterial *maskMat = RpGeometryGetMaterial(maskGeometry, 0);
+	RpMatFXMaterialSetEnvMapFrame(maskMat, RwCameraGetFrame(RwCameraGetCurrentCamera()));
+	RpMatFXMaterialSetEnvMapCoefficient(maskMat, fEnvScale);
+	RpMatFXMaterialSetEnvMapFrameBufferAlpha(maskMat, TRUE);
+#endif
+	
+#ifndef PC_WATER
+	float fMinSparkZ = (CWeather::WindClipped * fWave2Ampl + 0.05f +
+		CWeather::WindClipped * 0.4f + 0.2) * (1.0f - 0.04f * CWeather::SunGlare);
+
+	int32 randval = CGeneral::GetRandomNumber();
+
+	float fUVStep = 0.125f;
+	float f27 = 2.0f;
+
+	float fMinU = (fUOffset / 16.0f) + _TEXTURE_MASK_ADDU;
+	float fMinV = (fVOffset / 16.0f) + _TEXTURE_MASK_ADDV;
+
+	float fAlphaMul = ((float)color.alpha * 0.4f) / 16.0f;
+
+	float fXOffset = 16.0f;
+	if (nCamDirX > 0)
+		fXOffset = 6.4f;
+	else if (nCamDirX < 0)
+		fXOffset = 25.6f;
+
+	float fYOffset = 16.0f;
+	if (nCamDirY > 0)
+		fYOffset = 6.4f;
+	else if (nCamDirY < 0)
+		fYOffset = 25.6f;
+
+	int16 nX = _RoundValue(nSecsX - 1);
+	int16 nY = _RoundValue(nSecsY - 1);
+#else
+	float fMinSparkZ = (fWave2Ampl * CWeather::WindClipped + 0.05f + 
+			0.4f * CWeather::WindClipped + 0.2) * (1.0f - 0.02f * CWeather::SunGlare);
+
+	int32 randval = CGeneral::GetRandomNumber() & 255;
+
+	int16 nX = _RoundValue((int32)((fX - fSectorX) * 0.5f) - 1);
+	int16 nY = _RoundValue((int32)((fY - fSectorY) * 0.5f) - 1);
+#endif
+	int16 idxX = nX;
+	
+	for ( int32 i = 0; i < 17; i++ )
+	{
+		int16 idxY = nY;
+
+		if ( ++idxX > 16 )
+				idxX -= 16;
+			
+		for ( int32 j = 0; j < 17; j++ )
 		{
-			for ( int32 j = 0; j < 9; j++ )
+			if ( ++idxY > 16 )
+				idxY -= 16;
+			
+			const int32 a = (0*16);
+			const int32 b = (1*16);
+			const int32 c = (33*16);
+			const int32 d = (34*16);
+			
+			int32 base = (i*33+j);
+			
+#ifndef  PC_WATER
+			maskTexCoords[base + a].u = fMinU + ((float)i * fUVStep);
+			maskTexCoords[base + a].v = fMinV + ((float)j * fUVStep);
+
+			maskTexCoords[base + b].u = maskTexCoords[base + a].u;
+			maskTexCoords[base + b].v = maskTexCoords[base + a].v + (16.0f * fUVStep);
+
+			maskTexCoords[base + c].u = maskTexCoords[base + a].u + (16.0f * fUVStep);
+			maskTexCoords[base + c].v = maskTexCoords[base + a].v;
+
+			maskTexCoords[base + d].u = maskTexCoords[base + a].u + (16.0f * fUVStep);
+			maskTexCoords[base + d].v = maskTexCoords[base + a].v + (16.0f * fUVStep);
+#else
+			maskTexCoords[base+a].v = float(j) / SMALL_SECTOR_SIZE + ((fCamPosY - fY) / 64);
+			maskTexCoords[base+c].v = maskTexCoords[base+a].v;
+			maskTexCoords[base+d].v = maskTexCoords[base+a].v + 0.5f;
+			maskTexCoords[base+b].v = maskTexCoords[base+d].v;
+			
+			maskTexCoords[base+a].u = float(i) / SMALL_SECTOR_SIZE + ((fCamPosX - fX) / 64);
+			maskTexCoords[base+b].u = maskTexCoords[base+a].u;
+			maskTexCoords[base+d].u = maskTexCoords[base+a].u + 0.5f;
+			maskTexCoords[base+c].u = maskTexCoords[base+d].u;
+#endif
+			
+			maskMorphVerts[base+a].x = (wavyMorphVerts[idxY + (17 * idxX)].x - (float)idxX * 2.0f) + (float(i) * 2.0f);
+			maskMorphVerts[base+b].x = maskMorphVerts[base+a].x;
+			maskMorphVerts[base+c].x = maskMorphVerts[base+a].x + SMALL_SECTOR_SIZE;
+			maskMorphVerts[base+d].x = maskMorphVerts[base+c].x;
+			
+			maskMorphVerts[base+a].y = (wavyMorphVerts[idxY + (17 * idxX)].y - (float)idxY * 2.0f) + (float(j) * 2.0f);
+			maskMorphVerts[base+c].y = maskMorphVerts[base+a].y;
+			maskMorphVerts[base+b].y = maskMorphVerts[base+a].y + SMALL_SECTOR_SIZE;
+			maskMorphVerts[base+d].y = maskMorphVerts[base+b].y;
+			
+			maskMorphVerts[base+a].z = wavyMorphVerts[idxY + (17 * idxX)].z;
+			maskMorphVerts[base+d].z = maskMorphVerts[base+a].z;
+			maskMorphVerts[base+c].z = maskMorphVerts[base+d].z;
+			maskMorphVerts[base+b].z = maskMorphVerts[base+c].z;
+			
+#ifndef PC_WATER
+			if (maskMorphVerts[base].z >= fMinSparkZ)
+#else
+			if ( maskMorphVerts[base].z > fMinSparkZ )
+#endif
 			{
-				wavyTexCoords[9*i+j].u = float(i) / 8 + TEXTURE_ADDV;
-				wavyTexCoords[9*i+j].v = float(j) / 8 + TEXTURE_ADDU;
-				RwRGBAAssign(&wavyPreLights[9*i+j], &color);
+				switch ( (i + j + randval) & 3 )
+				{
+					case 0:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+a].x,
+								fY + maskMorphVerts[base+a].y,
+								fZ + maskMorphVerts[base+a].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
 
-				wavyVertices[9*i+j].z = ( CWeather::Wind * 0.7f + 0.3f )
-										* ( Sin(float(i + j) * DEGTORAD(45.0f) + fAngle) )
-										+ ( CWeather::Wind * 0.2f * Sin(float(j - i) * PI + (2.0f * fAngle)) );
+					case 1:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+c].x,
+								fY + maskMorphVerts[base+c].y,
+								fZ + maskMorphVerts[base+c].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
+
+					case 2:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+b].x,
+								fY + maskMorphVerts[base+b].y,
+								fZ + maskMorphVerts[base+b].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
+
+					case 3:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+d].x,
+								fY + maskMorphVerts[base+d].y,
+								fZ + maskMorphVerts[base+d].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
+				}
 			}
+
+			maskMorphNormals[base+a].x = wavyMorphNormals[idxY + (17 * idxX)].x;
+			maskMorphNormals[base+a].y = wavyMorphNormals[idxY + (17 * idxX)].y;
+			maskMorphNormals[base+a].z = wavyMorphNormals[idxY + (17 * idxX)].z;
+			
+			maskMorphNormals[base+d].x = maskMorphNormals[base+a].x;
+			maskMorphNormals[base+d].y = maskMorphNormals[base+a].y;
+			maskMorphNormals[base+d].z = maskMorphNormals[base+a].z;
+			
+			maskMorphNormals[base+c].x = maskMorphNormals[base+d].x;
+			maskMorphNormals[base+c].y = maskMorphNormals[base+d].y;
+			maskMorphNormals[base+c].z = maskMorphNormals[base+d].z;
+			
+			maskMorphNormals[base+b].x = maskMorphNormals[base+c].x;
+			maskMorphNormals[base+b].y = maskMorphNormals[base+c].y;
+			maskMorphNormals[base+b].z = maskMorphNormals[base+c].z;
+	  
+			maskPreLight[base+a].red   = color.red;
+			maskPreLight[base+a].green = color.green;
+			maskPreLight[base+a].blue  = color.blue;
+			maskPreLight[base+a].alpha = color.alpha;
+			
+			maskPreLight[base+d].red   = maskPreLight[base+a].red;
+			maskPreLight[base+d].green = maskPreLight[base+a].green;
+			maskPreLight[base+d].blue  = maskPreLight[base+a].blue;
+			maskPreLight[base+d].alpha = maskPreLight[base+a].alpha;
+			
+			maskPreLight[base+c].red   = maskPreLight[base+d].red;
+			maskPreLight[base+c].green = maskPreLight[base+d].green;
+			maskPreLight[base+c].blue  = maskPreLight[base+d].blue;
+			maskPreLight[base+c].alpha = maskPreLight[base+d].alpha;
+			
+			maskPreLight[base+b].red   = maskPreLight[base+c].red;
+			maskPreLight[base+b].green = maskPreLight[base+c].green;
+			maskPreLight[base+b].blue  = maskPreLight[base+c].blue;
+			maskPreLight[base+b].alpha = maskPreLight[base+c].alpha;
+
+#ifndef PC_WATER
+			maskPreLight[base + a].alpha = Max(0, (int32)((float)color.alpha - (fAlphaMul * (Abs((float)i - fXOffset) + Abs((float)j - fYOffset)))));
+			maskPreLight[base + b].alpha = Max(0, (int32)((float)color.alpha - (fAlphaMul * (Abs((float)i - fXOffset) + Abs(16.0f + (float)j - fYOffset)))));
+			maskPreLight[base + c].alpha = Max(0, (int32)((float)color.alpha - (fAlphaMul * (Abs(16.0f + (float)i - fXOffset) + Abs((float)j - fYOffset)))));
+			maskPreLight[base + d].alpha = Max(0, (int32)((float)color.alpha - (fAlphaMul * (Abs(16.0f + (float)i - fXOffset) + Abs(16.0f + (float)j - fYOffset)))));
+#endif
 		}
-		
-		RpGeometryUnlock(geometry);
 	}
 	
-	static CBoat *apBoatList[4] = { NULL };
+	RpGeometryUnlock(maskGeometry);
+
+#ifndef PC_WATER
+	{
+		RwV3d pos = { 0.0f, 0.0f, 0.0f };
+
+		pos.x = fX;
+		pos.y = fY;
+		pos.z = fZ + 0.05f;
+
+		RwFrameTranslate(RpAtomicGetFrame(ms_pMaskAtomic), &pos, rwCOMBINEREPLACE);
+
+		if (bRender)
+		{
+#ifdef PS2
+			RpSkyTexCacheFlush();
+#endif
+			RpAtomicRender(ms_pMaskAtomic);
+		}
+	}
+#endif
+}
+
+#ifdef PC_WATER
+void
+CWaterLevel::PreCalcWaterGeometry(void)
+{
+	if ( !RequireWavySector )
+	{
+		WavesCalculatedThisFrame = false;
+		MaskCalculatedThisFrame = false;
+		return;
+	}
+	
+	RequireWavySector = false;
+	WavesCalculatedThisFrame = true;
 	
-	if ( apGeomArray[0]
-		&& nGeomUsed < MAX_BOAT_WAKES
-		&& CBoat::IsSectorAffectedByWake(
-			CVector2D(fX + (SMALL_SECTOR_SIZE / 2), fY + (SMALL_SECTOR_SIZE / 2)),
-			SMALL_SECTOR_SIZE / 2,
-			apBoatList) )
+	RwRGBA color;
+	
+	color.red   = CTimeCycle::GetWaterRed();
+	color.green = CTimeCycle::GetWaterGreen();
+	color.blue  = CTimeCycle::GetWaterBlue();
+	color.alpha = CTimeCycle::GetWaterAlpha();
+	
+	PreCalcWavySector(color);
+	
+	if ( CCullZones::WaterFudge() )
 	{
-		float fWakeColor = fAdd1 - Max(255.0f - float(color.blue + color.red + color.green) / 3, fAdd2);
-		
-		RpGeometry *wavyGeometry = RpAtomicGetGeometry(ms_pWavyAtomic);	
-		RpGeometry *geom  = apGeomArray[nGeomUsed++];
-		
-		ASSERT( wavyGeometry != NULL );
-		ASSERT( geom != NULL );
-		
-		RpAtomic *atomic = RpAtomicCreate();
-		ASSERT( atomic != NULL );
-		
-		RpAtomicSetGeometry(atomic, geom, 0);
-		
-		RwFrame *frame = RwFrameCreate();
-		ASSERT( frame != NULL );
-		
-		RwMatrixCopy(RwFrameGetMatrix(frame), RwFrameGetMatrix(RpAtomicGetFrame(ms_pWavyAtomic)));
-		RpAtomicSetFrame(atomic, frame);
+		MaskCalculatedThisFrame = false;
+		return;
+	}
+	
+	CVector CamFwdDir = TheCamera.GetForward();
+	CamFwdDir.z = 0.0f;
+	CamFwdDir.Normalise();
+	
+	float fCamX = TheCamera.GetPosition().x - SMALL_SECTOR_SIZE;
+	float fCamY = TheCamera.GetPosition().y - SMALL_SECTOR_SIZE;
+	
+	//1.4144272f; 1.4144f;
+	float signX = CamFwdDir.x * 1.4144272f;
+	float signY = CamFwdDir.y * 1.4144272f;
+	
+	signX = clamp(signX, -1.0f, 1.0f);
+	fCamX += 0.4f * signX * float(SMALL_SECTOR_SIZE * 2.0f);
+
+	signY = clamp(signY, -1.0f, 1.0f);
+	fCamY += 0.4f * signY * float(SMALL_SECTOR_SIZE * 2.0f);
+	
+	int32 nBlock;
+	
+	int32 BlockX = WATER_TO_SMALL_SECTOR_X(fCamX + WATER_X_OFFSET) + 1;
+	int32 BlockY = WATER_TO_SMALL_SECTOR_Y(fCamY                 ) + 1;
+	
+	ASSERT( BlockX >= 0 && BlockX < MAX_SMALL_SECTORS );
+	ASSERT( BlockY >= 0 && BlockY < MAX_SMALL_SECTORS );
+	
+	if ( _IsColideWithBlock(BlockX, BlockY, nBlock) )
+	{
+		float fMaskX = floorf(fCamX / 2.0f) * 2.0f;
+		float fMaskY = floorf(fCamY / 2.0f) * 2.0f;
+
+		float fSectorX = WATER_FROM_SMALL_SECTOR_X(BlockX) - WATER_X_OFFSET;
+		float fSectorY = WATER_FROM_SMALL_SECTOR_Y(BlockY);
 		
-		RwTexCoords *geomTexCoords  = RpGeometryGetVertexTexCoords(geom, rwTEXTURECOORDINATEINDEX0);
-		RwTexCoords *wavyTexCoord   = RpGeometryGetVertexTexCoords(wavyGeometry, rwTEXTURECOORDINATEINDEX0);
-		RwRGBA *geomPreLights       = RpGeometryGetPreLightColors(geom);
-		RwV3d  *geomVertices        = RpMorphTargetGetVertices(RpGeometryGetMorphTarget(geom, 0));
-		RwV3d  *wavyVertices        = RpMorphTargetGetVertices(RpGeometryGetMorphTarget(wavyGeometry, 0));
+		if ( PreCalcWavyMask( fMaskX, fMaskY, ms_aWaterZs[nBlock],
+				fSectorX, fSectorY, fCamX, fCamY, CamFwdDir.x, CamFwdDir.y, color ) )
+        {
+			PreCalculatedMaskPosn.x = fMaskX;
+			PreCalculatedMaskPosn.y = fMaskY;
+			PreCalculatedMaskPosn.z = ms_aWaterZs[nBlock] + 0.05f;
+			
+			MaskCalculatedThisFrame = true;
+		}
+		else
+			MaskCalculatedThisFrame = false;
+	}
+	else
+		MaskCalculatedThisFrame = false;
+}
+
+bool
+CWaterLevel::PreCalcWavySector(RwRGBA const &color)
+{	
+	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);
+	
+	RpGeometry *wavyGeometry   = RpAtomicGetGeometry(ms_pWavyAtomic);
+
+	RwTexCoords *wavyTexCoords = RpGeometryGetVertexTexCoords(wavyGeometry, rwTEXTURECOORDINATEINDEX0);
+	RpMorphTarget *wavyMorph   = RpGeometryGetMorphTarget(wavyGeometry, 0);
+	
+	RwRGBA *wavyPreLight       = RpGeometryGetPreLightColors(wavyGeometry);
+	RwV3d *wavyMorphVerts      = RpMorphTargetGetVertices(wavyMorph);
+	RwV3d *wavyMorphNormals    = RpMorphTargetGetVertexNormals(wavyMorph);
+	
+	if ( !m_bRenderSeaBed )
+		RpGeometryLock(wavyGeometry, rpGEOMETRYLOCKVERTICES
+									|rpGEOMETRYLOCKNORMALS
+									|rpGEOMETRYLOCKPRELIGHT
+									|rpGEOMETRYLOCKTEXCOORDS);
+	
+	CVector camPosUp = TheCamera.GetForward();
 		
-		ASSERT( geomTexCoords != NULL );
-		ASSERT( wavyTexCoord  != NULL );
-		ASSERT( geomPreLights != NULL );
-		ASSERT( geomVertices  != NULL );
-		ASSERT( wavyVertices  != NULL );
+	float randomDampInv2 = (1.0f - fRandomDamp) * 2.0f;
+	
+	float randomMove = 1.0f / (16.0f * fRandomMoveDiv);
+	
+	float wind     = CWeather::WindClipped * 0.4f + 0.2f;
+	float waveWind = CWeather::WindClipped * fWave2Ampl + 0.05f;
 
-		RpGeometryLock(geom, rpGEOMETRYLOCKVERTICES | rpGEOMETRYLOCKPRELIGHT | rpGEOMETRYLOCKTEXCOORDS);
+	float waveA = (TWOPI / 16.0f)
+		* ((CWeather::WindClipped * 0.4f + 0.2f) * (fNormalDirectionScalar1 * Abs(camPosUp.x + camPosUp.y) + fNormMult));
 		
-		for ( int32 i = 0; i < 9; i++ )
+	float waveB = TWOPI / (16.0f * fWave2NormScale)
+		* ((CWeather::WindClipped * 0.2f + 0.1f) * (fNormalDirectionScalar2 * Abs(camPosUp.y - camPosUp.x) + fNormMultB));
+
+	
+	CVector vA(1.0f, 0.0f, 0.0f);
+	CVector vB(0.0f, 1.0f, 0.0f);
+			
+	for ( int32 i = 0; i < 17; i++ )
+	{
+		for ( int32 j = 0; j < 17; j++ )
 		{
-			for ( int32 j = 0; j < 9; j++ )
+			wavyTexCoords->u = (float(i) / 16.0f) + TEXTURE_ADDV;
+			wavyTexCoords->v = (float(j) / 16.0f) + TEXTURE_ADDU;
+
+			RwRGBAAssign(wavyPreLight, &color);
+			
+			if ( i > 0 && i < 16 && j > 0 && j < 16 )
 			{
-				geomTexCoords[9*i+j] = wavyTexCoord[9*i+j];
+				wavyMorphVerts->x += CGeneral::GetRandomNumberInRange(-1.0f, 1.0f) * randomMove;
+				wavyMorphVerts->x *= fRandomDamp;
+				wavyMorphVerts->x += float(i) * randomDampInv2;
+				
+				wavyMorphVerts->y += CGeneral::GetRandomNumberInRange(-1.0f, 1.0f) * randomMove;
+				wavyMorphVerts->y *= fRandomDamp;
+				wavyMorphVerts->y += float(j) * randomDampInv2;
+			}
+			
+			float morphVertXHalf = ( i == 16 ) ? 0.0f : 0.5f * wavyMorphVerts->x;
+			float morphVertYHalf = ( j == 16 ) ? 0.0f : 0.5f * wavyMorphVerts->y;
+			
+			float waveMulA = (morphVertYHalf + morphVertXHalf) * (TWOPI / 16.0f) + fAngle;	  
+			float waveMulB = (morphVertYHalf - morphVertXHalf) * (TWOPI / (16.0f * fWave2InvLength)) + fAngle;		
+	
+			wavyMorphVerts->z = wind * Sin(waveMulA) + waveWind * Sin(waveMulB);
+			
+			vA.z = (waveA * Cos(waveMulA)) - (waveB * Cos(waveMulB));
+			vB.z = (waveA * Cos(waveMulA)) + (waveB * Cos(waveMulB));
 
-				float fVertexX = (float)i * 4.0f + fX;
-				float fVertexY = (float)j * 4.0f + fY;
+			CVector norm = CrossProduct(vA, vB);
+			norm.Normalise();
 
-				float fDistMult = 0.0f;
-		
-				for ( int32 k = 0; k < 4; k++ )
-				{
-					if ( apBoatList[k] != NULL )
-						fDistMult += CBoat::IsVertexAffectedByWake(CVector(fVertexX, fVertexY, 0.0f), apBoatList[k]);
-				}
-				
-				if ( fDistMult > 0.0f )
+			wavyMorphNormals->x = norm.x;
+			wavyMorphNormals->y = norm.y;
+			wavyMorphNormals->z = norm.z;
+
+			++wavyPreLight;
+			++wavyTexCoords;
+
+			++wavyMorphVerts;
+			++wavyMorphNormals;
+		}
+	}
+
+	RpGeometryUnlock(wavyGeometry);
+	
+	return true;
+}
+
+bool
+CWaterLevel::PreCalcWavyMask(float fX, float fY, float fZ,
+		float fSectorX, float fSectorY,
+		float fCamPosX, float fCamPosY,
+		float fCamDirX, float fCamDirY,
+		RwRGBA const&color)
+{
+	CVector vecSectorPos(fX + (MAX_LARGE_SECTORS/2), fY + (MAX_LARGE_SECTORS/2), fZ + 2.0f);
+	
+	if ( COcclusion::IsAABoxOccluded(vecSectorPos, MAX_LARGE_SECTORS, MAX_LARGE_SECTORS, 4.0f) )
+		return false;
+	
+	floorf(fX / MAX_LARGE_SECTORS);
+	floorf(fY / MAX_LARGE_SECTORS);
+	
+	RpGeometry    *wavyGeometry  = RpAtomicGetGeometry(ms_pWavyAtomic);
+	RpMorphTarget *wavyMorph     = RpGeometryGetMorphTarget(wavyGeometry, 0);
+	RwV3d *wavyMorphVerts        = RpMorphTargetGetVertices(wavyMorph);
+	RwV3d *wavyMorphNormals      = RpMorphTargetGetVertexNormals(wavyMorph);
+	
+	RpGeometry    *maskGeometry  = RpAtomicGetGeometry(ms_pMaskAtomic);
+	RwTexCoords   *maskTexCoords = RpGeometryGetVertexTexCoords(maskGeometry, rwTEXTURECOORDINATEINDEX0);
+	RwRGBA        *maskPreLight  = RpGeometryGetPreLightColors(maskGeometry);
+	RpMorphTarget *maskMorph     = RpGeometryGetMorphTarget(maskGeometry, 0);
+	RwV3d *maskMorphVerts        = RpMorphTargetGetVertices(maskMorph);
+	RwV3d *maskMorphNormals      = RpMorphTargetGetVertexNormals(maskMorph);
+
+	if ( !m_bRenderSeaBed )
+		RpGeometryLock(maskGeometry, rpGEOMETRYLOCKVERTICES | rpGEOMETRYLOCKNORMALS | rpGEOMETRYLOCKPRELIGHT | rpGEOMETRYLOCKTEXCOORDS);
+	
+	
+	float fMinSparkZ = (fWave2Ampl * CWeather::WindClipped + 0.05f + 
+			0.4f * CWeather::WindClipped + 0.2) * (1.0f - 0.02f * CWeather::SunGlare);
+	
+	int32 randval = CGeneral::GetRandomNumber() & 255;
+
+	int16 nX = _RoundValue((int32)((fX - fSectorX) * 0.5f) - 1);
+	int16 nY = _RoundValue((int32)((fY - fSectorY) * 0.5f) - 1);
+	
+	int16 idxX = nX;
+
+	for ( int32 i = 0; i < 17; i++ )
+	{		
+		int16 idxY = nY;
+
+		if ( ++idxX > 16 )
+				idxX -= 16;
+			
+		for ( int32 j = 0; j < 17; j++ )
+		{
+			if ( ++idxY > 16 )
+				idxY -= 16;
+			
+			const int32 a = (0*16);
+			const int32 b = (1*16);
+			const int32 c = (33*16);
+			const int32 d = (34*16);
+			
+			int32 base = (i*33+j);
+			
+			maskTexCoords[base+a].v = float(j) / 32 + ((fCamPosY - fY) / 64);
+			maskTexCoords[base+c].v = maskTexCoords[base+a].v;
+			maskTexCoords[base+d].v = maskTexCoords[base+a].v + 0.5f;
+			maskTexCoords[base+b].v = maskTexCoords[base+d].v;
+			
+			maskTexCoords[base+a].u = float(i) / 32 + ((fCamPosX - fX) / 64);
+			maskTexCoords[base+b].u = maskTexCoords[base+a].u;
+			maskTexCoords[base+d].u = maskTexCoords[base+a].u + 0.5f;
+			maskTexCoords[base+c].u = maskTexCoords[base+d].u;
+			
+			maskMorphVerts[base+a].x = (wavyMorphVerts[idxY + (17 * idxX)].x - (float)idxX * 2.0f) + (float(i) * 2.0f);
+			maskMorphVerts[base+b].x = maskMorphVerts[base+a].x;
+			maskMorphVerts[base+c].x = maskMorphVerts[base+a].x + SMALL_SECTOR_SIZE;
+			maskMorphVerts[base+d].x = maskMorphVerts[base+c].x;
+			
+			maskMorphVerts[base+a].y = (wavyMorphVerts[idxY + (17 * idxX)].y - (float)idxY * 2.0f) + (float(j) * 2.0f);
+			maskMorphVerts[base+c].y = maskMorphVerts[base+a].y;
+			maskMorphVerts[base+b].y = maskMorphVerts[base+a].y + SMALL_SECTOR_SIZE;
+			maskMorphVerts[base+d].y = maskMorphVerts[base+b].y;
+			
+			maskMorphVerts[base+a].z = wavyMorphVerts[idxY + (17 * idxX)].z;
+			maskMorphVerts[base+d].z = maskMorphVerts[base+a].z;
+			maskMorphVerts[base+c].z = maskMorphVerts[base+d].z;
+			maskMorphVerts[base+b].z = maskMorphVerts[base+c].z;
+			
+			if ( maskMorphVerts[base].z > fMinSparkZ )
+			{
+				switch ( (i + j + randval) & 3 )
 				{
-					RwRGBA wakeColor;
-					
-					RwRGBAAssign(&wakeColor, &color);
+					case 0:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+a].x,
+								fY + maskMorphVerts[base+a].y,
+								fZ + maskMorphVerts[base+a].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
 
-					wakeColor.red   = Min(color.red   + int32(fWakeColor * fRedMult   * fDistMult), 255);
-					wakeColor.green = Min(color.green + int32(fWakeColor * fGreenMult * fDistMult), 255);
-					wakeColor.blue  = Min(color.blue  + int32(fWakeColor * fBlueMult  * fDistMult), 255);
-					
-					RwRGBAAssign(&geomPreLights[9*i+j], &wakeColor);
+					case 1:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+c].x,
+								fY + maskMorphVerts[base+c].y,
+								fZ + maskMorphVerts[base+c].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
+
+					case 2:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+b].x,
+								fY + maskMorphVerts[base+b].y,
+								fZ + maskMorphVerts[base+b].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
 
+					case 3:
+						{
+							CVector vecPos
+							(
+								fX + maskMorphVerts[base+d].x,
+								fY + maskMorphVerts[base+d].y,
+								fZ + maskMorphVerts[base+d].z + 0.12f
+							);
+
+							vecPos -= 0.05f * TheCamera.GetForward();
+							
+							CParticle::AddParticle(PARTICLE_WATER_SPARK,
+								vecPos,
+								CVector(0.0f, 0.0f, 0.0f),
+								nil,
+								0.0f,
+								15,
+								CGeneral::GetRandomNumberInRange(-90, 90),
+								0,
+								0);
+						}
+						break;
 				}
-				else
-					RwRGBAAssign(&geomPreLights[9*i+j], &color);
-				
-				
-				geomVertices[9*i+j].z = wavyVertices[9*i+j].z;
 			}
+
+			maskMorphNormals[base+a].x = wavyMorphNormals[idxY + (17 * idxX)].x;
+			maskMorphNormals[base+a].y = wavyMorphNormals[idxY + (17 * idxX)].y;
+			maskMorphNormals[base+a].z = wavyMorphNormals[idxY + (17 * idxX)].z;
+			
+			maskMorphNormals[base+d].x = maskMorphNormals[base+a].x;
+			maskMorphNormals[base+d].y = maskMorphNormals[base+a].y;
+			maskMorphNormals[base+d].z = maskMorphNormals[base+a].z;
+			
+			maskMorphNormals[base+c].x = maskMorphNormals[base+d].x;
+			maskMorphNormals[base+c].y = maskMorphNormals[base+d].y;
+			maskMorphNormals[base+c].z = maskMorphNormals[base+d].z;
+			
+			maskMorphNormals[base+b].x = maskMorphNormals[base+c].x;
+			maskMorphNormals[base+b].y = maskMorphNormals[base+c].y;
+			maskMorphNormals[base+b].z = maskMorphNormals[base+c].z;
+	  
+			maskPreLight[base+a].red   = color.red;
+			maskPreLight[base+a].green = color.green;
+			maskPreLight[base+a].blue  = color.blue;
+			maskPreLight[base+a].alpha = color.alpha;
+			
+			maskPreLight[base+d].red   = maskPreLight[base+a].red;
+			maskPreLight[base+d].green = maskPreLight[base+a].green;
+			maskPreLight[base+d].blue  = maskPreLight[base+a].blue;
+			maskPreLight[base+d].alpha = maskPreLight[base+a].alpha;
+			
+			maskPreLight[base+c].red   = maskPreLight[base+d].red;
+			maskPreLight[base+c].green = maskPreLight[base+d].green;
+			maskPreLight[base+c].blue  = maskPreLight[base+d].blue;
+			maskPreLight[base+c].alpha = maskPreLight[base+d].alpha;
+			
+			maskPreLight[base+b].red   = maskPreLight[base+c].red;
+			maskPreLight[base+b].green = maskPreLight[base+c].green;
+			maskPreLight[base+b].blue  = maskPreLight[base+c].blue;
+			maskPreLight[base+b].alpha = maskPreLight[base+c].alpha;
 		}
+	}
+	
+	RpGeometryUnlock(maskGeometry);
+	return true;
+}
+#endif
+
+void
+CWaterLevel::RenderBoatWakes(void)
+{
+	RwRenderStateSet(rwRENDERSTATETEXTURERASTER, (void *)gpWaterWakeRaster);
+#ifndef PC_WATER
+	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void *)TRUE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void *)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDINVSRCALPHA);
+#endif
+
+#ifdef _XBOX
+	// TODO save and restore rwRENDERSTATESRCBLEND rwRENDERSTATEDESTBLEND
+#endif
+
+	CBoat::FillBoatList();
+	
+	float fWakeZ = 5.97f;
+	float fWakeLifeTimeMult = 0.01f / CBoat::WAKE_LIFETIME;
+	
+	for ( int32 idx = 0; idx < ARRAY_SIZE(CBoat::apFrameWakeGeneratingBoats); idx++ )
+	{
+		CBoat *pBoat = CBoat::apFrameWakeGeneratingBoats[idx];
+
+		if ( pBoat == nil )
+			break;
+
+		CVector2D vecDistA(pBoat->GetForward().x, pBoat->GetForward().y);
+
+
+		float fSize = pBoat->GetColModel()->boundingBox.max.z
+				* 0.65f;
 		
-		RpGeometryUnlock(geom);
+		if ( pBoat->GetModelIndex() == MI_SKIMMER)
+			fSize *= 0.4f;
 		
+		float fAplhaA = 255.0f;
+		float fSizeA = fSize;
+		float fAplhaB;
+		float fSizeB;
 		
-		RwV3d pos = {0.0f, 0.0f, 0.0f};
+		for ( int32 wake = 1; wake < pBoat->m_nNumWakePoints; wake++ )
+		{
+			bool bRender = true;
+			
+			float fTimeleft = CBoat::WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[wake];
 
-		pos.x = fX;
-		pos.z = fZ;
-		pos.y = fY;
+			float fWakeSizeB = ((float)wake * 0.19f) + fSize - fWakeLifeTimeMult * Max(fTimeleft, 0.0f);
+			
+			fSizeB = fWakeSizeB / CBoat::MIN_WAKE_INTERVAL;
+			if ( fSizeB < 0.0f )
+				fSizeB = 1.0f;
+			
+			if ( wake == pBoat->m_nNumWakePoints - 1 )
+			{
+				// set alpha to 0 if it's last point
+				fAplhaB = 0.0f;
+			}
+			else
+			{
+				// clip (-100, 500), less lifetime - less val
+				float val = 500.0f - (CBoat::WAKE_LIFETIME - pBoat->m_afWakePointLifeTime[wake])
+						* 600.0f / CBoat::WAKE_LIFETIME;
+						
+				fAplhaB = clamp(val, 0.0f, 255.0f);
+			}
 
-		RwFrameTranslate(RpAtomicGetFrame(atomic), &pos, rwCOMBINEREPLACE);
+			CVector2D vecDistB = pBoat->m_avec2dWakePoints[wake - 1] - pBoat->m_avec2dWakePoints[wake];
 
-		RpAtomicRender(atomic);
-		
-		RpAtomicDestroy(atomic);
-		RwFrameDestroy(frame);
+			float fScal = vecDistB.MagnitudeSqr();
+			
+			// normalize if distance between points is greater than 3
+
+			if ( fScal > SQR(3.0f) )
+			{				
+				float fNorm = 1.0f / sqrt(fScal);
+				
+				vecDistB.x *= fNorm;
+				vecDistB.y *= fNorm;
+				
+				// disable render if distance between points too big
+				
+				if ( sqrt(fScal) > 13.0f )
+					bRender = false;
+			}
+			
+			CVector2D vecAA
+			(
+				pBoat->m_avec2dWakePoints[wake - 1].x - (fSizeA * vecDistA.y),
+				pBoat->m_avec2dWakePoints[wake - 1].y + (fSizeA * vecDistA.x)
+			);
+			CVector2D vecAB
+			(
+				pBoat->m_avec2dWakePoints[wake - 1].x + (fSizeA * vecDistA.y),
+				pBoat->m_avec2dWakePoints[wake - 1].y - (fSizeA * vecDistA.x)
+			);
+			CVector2D vecBA
+			(
+				pBoat->m_avec2dWakePoints[wake].x     + (fSizeB * vecDistB.y),
+				pBoat->m_avec2dWakePoints[wake].y     - (fSizeB * vecDistB.x)
+			);                                                                            
+			CVector2D vecBB                         
+			(                                       
+				pBoat->m_avec2dWakePoints[wake].x     - (fSizeB * vecDistB.y),
+				pBoat->m_avec2dWakePoints[wake].y     + (fSizeB * vecDistB.x)
+			);
+			
+			if ( bRender )
+				RenderWakeSegment(vecAA, vecAB, vecBA, vecBB, fSizeA, fSizeB, fAplhaA, fAplhaB, fWakeZ);
+			
+			vecDistA = vecDistB;
+			fSizeA = fSizeB;
+			
+			fAplhaB = fAplhaA;
+		}
 	}
-	else
+	
+	RenderAndEmptyRenderBuffer();
+}
+
+inline float
+_GetWindedWave(float fX, float fY)
+{
+	float fAngle = (CTimer::GetTimeInMilliseconds() & 4095) * (TWOPI / 4096.0f);	
+	float x = WATER_HUGE_X(fX + WATER_X_OFFSET);
+	float y = WATER_HUGE_Y(fY);
+	
+	float fWindFactor (CWeather::WindClipped * 0.4f + 0.2f);
+	float fWave = Sin(( (x - floorf(x)) + (y - floorf(y)) ) * TWOPI + fAngle);
+
+	return fWindFactor * fWave;
+}
+
+void
+CWaterLevel::RenderWakeSegment(CVector2D &vecA, CVector2D &vecB, CVector2D &vecC, CVector2D &vecD,
+		float &fSizeA, float &fSizeB, 
+		float &fAlphaA, float &fAlphaB, 
+		float &fWakeZ)
+{
+	for ( int32 i = 0; i < 4; i++ )
 	{
-		RwV3d pos = { 0.0f, 0.0f, 0.0f };
+		if ( TempBufferIndicesStored >= TEMPBUFFERINDEXSIZE-6 || TempBufferVerticesStored >= TEMPBUFFERVERTSIZE-4 )
+			RenderAndEmptyRenderBuffer();
+		
+		float fCurStep = (float)i       / 4;
+		float fNxtStep = (float)(i + 1) / 4;
+		
+		float fLeftCurStep = 1.0f - fCurStep;
+		float fLeftNxtStep = 1.0f - fNxtStep;
 
-		pos.x = fX;
-		pos.y = fY;
-		pos.z = fZ;
+		uint8 AlphaA = (uint32)(fAlphaA * aAlphaFade[i]    );
+		uint8 AlphaB = (uint32)(fAlphaA * aAlphaFade[i + 1]);
+		uint8 AlphaC = (uint32)(fAlphaB * aAlphaFade[i + 1]);
+		uint8 AlphaD = (uint32)(fAlphaB * aAlphaFade[i]    );
+
+		CVector2D PosA = vecB*fCurStep + vecA*fLeftCurStep;
+		CVector2D PosB = vecB*fNxtStep + vecA*fLeftNxtStep;
+		CVector2D PosC = vecC*fNxtStep + vecD*fLeftNxtStep;
+		CVector2D PosD = vecC*fCurStep + vecD*fLeftCurStep;
+
+		float fUA = (PosA.x / 4) + _TEXTURE_WAKE_ADDU;
+		float fVA = (PosA.y / 4) + _TEXTURE_WAKE_ADDV;
+
+		float fUB = (PosB.x / 4) + _TEXTURE_WAKE_ADDU;
+		float fVB = (PosB.y / 4) + _TEXTURE_WAKE_ADDV;
+
+		float fUC = (PosC.x / 4) + _TEXTURE_WAKE_ADDU;
+		float fVC = (PosC.y / 4) + _TEXTURE_WAKE_ADDV;
+
+		float fUD = (PosD.x / 4) + _TEXTURE_WAKE_ADDU;
+		float fVD = (PosD.y / 4) + _TEXTURE_WAKE_ADDV;
 		
-		ASSERT( ms_pWavyAtomic != NULL );
+#define MIN4(a, b, c, d) (Min((a), Min((b), Min((c), (d)))))
+		float fMinU = floorf(MIN4(fUA, fUB, fUC, fUD));
+		float fMinV = floorf(MIN4(fVA, fVB, fVC, fVD));
+#undef MIN4
+
+		float fZA = _GetWindedWave(PosA.x, PosA.y) + fWakeZ;
+		float fZB = _GetWindedWave(PosB.x, PosB.y) + fWakeZ;
+		float fZC = _GetWindedWave(PosC.x, PosC.y) + fWakeZ;
+		float fZD = _GetWindedWave(PosD.x, PosD.y) + fWakeZ;
+	
+		int32 vidx = TempBufferVerticesStored;
+	
+		RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], PosA.x, PosA.y, fZA);
+		RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], fUA - fMinU);
+		RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], fVA - fMinV);
+		RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 0], 255, 255, 255, AlphaA);
+
+		RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], PosB.x, PosB.y, fZB);
+		RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], fUB - fMinU);
+		RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], fVB - fMinV);
+		RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 1], 255, 255, 255, AlphaB);
+
+		RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], PosC.x, PosC.y, fZC);
+		RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], fUC - fMinU);
+		RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], fVC - fMinV);
+		RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 2], 255, 255, 255, AlphaC);
+
+		RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], PosD.x, PosD.y, fZD);
+		RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], fUD - fMinU);
+		RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], fVD - fMinV);
+		RwIm3DVertexSetRGBA (&TempBufferRenderVertices[vidx + 3], 255, 255, 255, AlphaD);
 		
-		RwFrameTranslate(RpAtomicGetFrame(ms_pWavyAtomic), &pos, rwCOMBINEREPLACE);
+		int32 iidx = TempBufferIndicesStored;
+	
+		TempBufferRenderIndexList[iidx + 0] = TempBufferVerticesStored + 0;
+		TempBufferRenderIndexList[iidx + 1] = TempBufferVerticesStored + 2;
+		TempBufferRenderIndexList[iidx + 2] = TempBufferVerticesStored + 1;
+		TempBufferRenderIndexList[iidx + 3] = TempBufferVerticesStored + 0;
+		TempBufferRenderIndexList[iidx + 4] = TempBufferVerticesStored + 3;
+		TempBufferRenderIndexList[iidx + 5] = TempBufferVerticesStored + 2;
 		
-		RpAtomicRender(ms_pWavyAtomic);
+		TempBufferVerticesStored += 4;
+	
+		TempBufferIndicesStored += 6;
 	}
 }
 
+void
+CWaterLevel::RenderOneSlopedUnderWaterPoly(float fX, float fY, float fZ, RwRGBA const&color)
+{
+	CVector2D camPos(TheCamera.GetPosition().x, TheCamera.GetPosition().y);
+	
+	float fDistA = (CVector2D(fX, fY) - camPos).Magnitude()                                       + -140.0f;
+	float fDistB = (CVector2D(fX, fY + HUGE_SECTOR_SIZE) - camPos).Magnitude()                    + -140.0f;
+	float fDistC = (CVector2D(fX + HUGE_SECTOR_SIZE, fY + HUGE_SECTOR_SIZE) - camPos).Magnitude() + -140.0f;
+	float fDistD = (CVector2D(fX + HUGE_SECTOR_SIZE, fY) - camPos).Magnitude()                    + -140.0f;
+	
+#ifndef PC_WATER
+#define CALCSEABED(v, d) \
+		{ \
+			if ( d < 0.0f ) \
+				v = 0.1f + fSeaBedZ; \
+			else if ( d > 240.0f ) \
+				v = 0.1f; \
+			else \
+				v = 0.1f + ((fSeaBedZ * (240.0f - d)) / 240.0f); \
+		}
+#else
+	#define CALCSEABED(v, d)	\
+		{	\
+		v = 0.1f;	\
+		if ( d < 0.0f )	\
+			v += fSeaBedZ;	\
+		else if ( d <= 240.0f )	\
+			v += (fSeaBedZ / 240.0f) * (240.0f - d);	\
+		}
+#endif
+	float fSeaBedA, fSeaBedB, fSeaBedC, fSeaBedD;
+	
+	CALCSEABED(fSeaBedA, fDistA);
+	CALCSEABED(fSeaBedB, fDistB);
+	CALCSEABED(fSeaBedC, fDistC);
+	CALCSEABED(fSeaBedD, fDistD);
+	
+	#undef CALCSEABED
+	
+	if ( TempBufferIndicesStored >= TEMPBUFFERINDEXSIZE-6 || TempBufferVerticesStored >= TEMPBUFFERVERTSIZE-4 )
+		RenderAndEmptyRenderBuffer();
+	
+	int32 vidx = TempBufferVerticesStored;
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset - fSeaBedA);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], 0.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], 0.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue, 255);
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + HUGE_SECTOR_SIZE, fZ - _fWaterZOffset - fSeaBedB);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], 0.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], 4.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue, 255);
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + HUGE_SECTOR_SIZE, fY + HUGE_SECTOR_SIZE, fZ - _fWaterZOffset - fSeaBedC);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], 4.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], 4.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue, 255);
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + HUGE_SECTOR_SIZE, fY, fZ - _fWaterZOffset - fSeaBedD);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], 4.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], 0.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue, 255);
+	
+	int32 iidx = TempBufferIndicesStored;
+
+	TempBufferRenderIndexList[iidx + 0] = TempBufferVerticesStored + 0;
+	TempBufferRenderIndexList[iidx + 1] = TempBufferVerticesStored + 2;
+	TempBufferRenderIndexList[iidx + 2] = TempBufferVerticesStored + 1;
+	TempBufferRenderIndexList[iidx + 3] = TempBufferVerticesStored + 0;
+	TempBufferRenderIndexList[iidx + 4] = TempBufferVerticesStored + 3;
+	TempBufferRenderIndexList[iidx + 5] = TempBufferVerticesStored + 2;
+	
+	TempBufferVerticesStored += 4;
+
+	TempBufferIndicesStored += 6;
+}
+
+void
+CWaterLevel::RenderOneFlatSmallWaterPolyBlended(float fX, float fY, float fZ, float fCamX, float fCamY,
+		RwRGBA const &color, RwRGBA const &colorTrans,
+		float fDrawDist)
+{
+	if ( TempBufferIndicesStored >= TEMPBUFFERINDEXSIZE-6 || TempBufferVerticesStored >= TEMPBUFFERVERTSIZE-4 )
+		RenderAndEmptyRenderBuffer();
+	
+	int32 vidx = TempBufferVerticesStored;
+	
+	float fBlendDrawDist = fDrawDist + fStartBlendDistanceAdd;
+	
+	float fDistStartX = SQR(fX                       - fCamX);
+	float fDistStartY = SQR(fY                       - fCamY);
+	float fDistEndX   = SQR((fX + SMALL_SECTOR_SIZE) - fCamX);
+	float fDistEndY   = SQR((fY + SMALL_SECTOR_SIZE) - fCamY);
+	
+	
+	float fAlphaBlendMulA 
+			= Min(fFlatWaterBlendRange * Max(sqrt(fDistStartX + fDistStartY) - fBlendDrawDist, fMinWaterAlphaMult), 1.0f);
+	float fAlphaBlendMulB
+			= Min(fFlatWaterBlendRange * Max(sqrt(fDistStartX + fDistEndY  ) - fBlendDrawDist, fMinWaterAlphaMult), 1.0f);
+	float fAlphaBlendMulC
+			= Min(fFlatWaterBlendRange * Max(sqrt(fDistEndX   + fDistEndY  ) - fBlendDrawDist, fMinWaterAlphaMult), 1.0f);
+	float fAlphaBlendMulD
+			= Min(fFlatWaterBlendRange * Max(sqrt(fDistEndX   + fDistStartY) - fBlendDrawDist, fMinWaterAlphaMult), 1.0f);
+
+
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 0], fX, fY, fZ - _fWaterZOffset);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDU);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 0], TEXTURE_ADDV);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 0], color.red, color.green, color.blue,
+		(colorTrans.alpha + (color.alpha - colorTrans.alpha) * (uint8)(int32)fAlphaBlendMulA));
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 1], fX, fY + SMALL_SECTOR_SIZE, fZ - _fWaterZOffset);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDU);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 1], TEXTURE_ADDV + 1.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 1], color.red, color.green, color.blue,
+		(colorTrans.alpha + (color.alpha - colorTrans.alpha) * (uint8)(int32)fAlphaBlendMulB));
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 2], fX + SMALL_SECTOR_SIZE, fY + SMALL_SECTOR_SIZE, fZ - _fWaterZOffset);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDU + 1.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 2], TEXTURE_ADDV + 1.0f);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 2], color.red, color.green, color.blue,
+		(colorTrans.alpha + (color.alpha - colorTrans.alpha) * (uint8)(int32)fAlphaBlendMulC));
+	
+	RwIm3DVertexSetPos  (&TempBufferRenderVertices[vidx + 3], fX + SMALL_SECTOR_SIZE, fY, fZ - _fWaterZOffset);
+	RwIm3DVertexSetU    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDU + 1.0f);
+	RwIm3DVertexSetV    (&TempBufferRenderVertices[vidx + 3], TEXTURE_ADDV);
+	RwIm3DVertexSetRGBA(&TempBufferRenderVertices[vidx + 3], color.red, color.green, color.blue,
+		(colorTrans.alpha + (color.alpha - colorTrans.alpha) * (uint8)(int32)fAlphaBlendMulD));
+
+
+	int32 iidx = TempBufferIndicesStored;
+
+	TempBufferRenderIndexList[iidx + 0] = TempBufferVerticesStored + 0;
+	TempBufferRenderIndexList[iidx + 1] = TempBufferVerticesStored + 2;
+	TempBufferRenderIndexList[iidx + 2] = TempBufferVerticesStored + 1;
+	TempBufferRenderIndexList[iidx + 3] = TempBufferVerticesStored + 0;
+	TempBufferRenderIndexList[iidx + 4] = TempBufferVerticesStored + 3;
+	TempBufferRenderIndexList[iidx + 5] = TempBufferVerticesStored + 2;
+	
+	TempBufferVerticesStored += 4;
+
+	TempBufferIndicesStored += 6;
+}
+
 float
 CWaterLevel::CalcDistanceToWater(float fX, float fY)
 {
-	const float fSectorMaxRenderDist = 75.0f;
+	const float fSectorMaxRenderDist = 250.0f;
 	
-	int32 nStartX = WATER_TO_SMALL_SECTOR_X(fX - fSectorMaxRenderDist) - 1;
-	int32 nEndX   = WATER_TO_SMALL_SECTOR_X(fX + fSectorMaxRenderDist) + 1;
+	int32 nStartX = WATER_TO_SMALL_SECTOR_X(fX - fSectorMaxRenderDist + WATER_X_OFFSET) - 1;
+	int32 nEndX   = WATER_TO_SMALL_SECTOR_X(fX + fSectorMaxRenderDist + WATER_X_OFFSET) + 1;
 	int32 nStartY = WATER_TO_SMALL_SECTOR_Y(fY - fSectorMaxRenderDist) - 1;
 	int32 nEndY   = WATER_TO_SMALL_SECTOR_Y(fY + fSectorMaxRenderDist) + 1;
 	
@@ -1115,9 +2592,9 @@ CWaterLevel::CalcDistanceToWater(float fX, float fY)
 	{
 		for ( int32 y = nStartY; y <= nEndY; y++ )
 		{
-			if ( !(aWaterFineBlockList[x][y] & 128) )
+			if ( !(aWaterFineBlockList[x][y] & 0x80) )
 			{				
-				float fSectorX = WATER_FROM_SMALL_SECTOR_X(x);
+				float fSectorX = WATER_FROM_SMALL_SECTOR_X(x) - WATER_X_OFFSET;
 				float fSectorY = WATER_FROM_SMALL_SECTOR_Y(y);
 				
 				CVector2D vecDist
@@ -1141,7 +2618,7 @@ CWaterLevel::RenderAndEmptyRenderBuffer()
 	{
 		LittleTest();
 
-		if ( RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStored, NULL, rwIM3D_VERTEXUV) )
+		if ( RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStored, nil, rwIM3D_VERTEXUV) )
 		{
 			RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, TempBufferRenderIndexList, TempBufferIndicesStored);
 			RwIm3DEnd();
@@ -1152,97 +2629,339 @@ CWaterLevel::RenderAndEmptyRenderBuffer()
 	TempBufferVerticesStored = 0;
 }
 
-void
-CWaterLevel::AllocateBoatWakeArray()
+bool
+CWaterLevel::GetGroundLevel(CVector const &vecPosn, float *pfOutLevel, ColData *pData, float fDistance)
+{
+	CColPoint point;
+	CEntity *entity;
+	
+	if ( !CWorld::ProcessVerticalLine(vecPosn + CVector(0.0f, 0.0f, fDistance),
+			-fDistance, point, entity, true, false, false, false, true, false, nil) )
+		return false;
+		
+	*pfOutLevel = point.point.z;
+	
+	if ( pData != nil )
+	{
+		pData->SurfaceType = point.surfaceB;
+		pData->PieceType   = point.pieceB;
+	}
+	
+	return true;
+}
+
+bool
+CWaterLevel::IsLocationOutOfWorldBounds_WS(CVector const &vecPosn, int nOffset)
+{
+	int32 x = int32((vecPosn.x / 50.0f) + 48.0f);
+	int32 y = int32((vecPosn.y / 50.0f) + 40.0f);
+	
+	return x < nOffset || x >= 80 - nOffset || y < nOffset || y >= 80 - nOffset;
+}
+
+bool
+CWaterLevel::GetGroundLevel_WS(CVector const &vecPosn, float *pfOutLevel, ColData *pData, float fDistance)
 {
-	CStreaming::MakeSpaceFor(14 * CDSTREAM_SECTOR_SIZE); 
+	if ( IsLocationOutOfWorldBounds_WS(vecPosn, 0) )
+		return false;
+	else
+		return GetGroundLevel(vecPosn, pfOutLevel, pData, fDistance);
+}
 
-	ASSERT(ms_pWavyAtomic != NULL );
+bool
+CWaterLevel::GetWaterDepth(CVector const &vecPosn, float *pfDepth, float *pfLevelNoWaves, float *pfGroundLevel)
+{
+	float fLevelNoWaves;
+	float fGroundLevel;
 	
-	RpGeometry    *wavyGeometry    = RpAtomicGetGeometry(ms_pWavyAtomic);
-	ASSERT(wavyGeometry    != NULL );
-	RpMorphTarget *wavyMorphTarget = RpGeometryGetMorphTarget(wavyGeometry, 0);
-	RpMaterial    *wavyMaterial    = RpGeometryGetMaterial(wavyGeometry, 0);
+	if ( !GetWaterLevelNoWaves(vecPosn.x, vecPosn.y, vecPosn.z, &fLevelNoWaves) )
+		return false;
+	
+	if ( !GetGroundLevel(vecPosn, &fGroundLevel, nil, 30.0f) )
+		fGroundLevel = -100.0;
+	
+	if ( pfDepth != nil )
+		*pfDepth = fLevelNoWaves - fGroundLevel;
 
-	ASSERT(wavyMorphTarget != NULL );
-	ASSERT(wavyMaterial    != NULL );
+	if ( pfLevelNoWaves != nil )
+		*pfLevelNoWaves = fLevelNoWaves;
 
-	for ( int32 geom = 0; geom < MAX_BOAT_WAKES; geom++ )
+	if ( pfGroundLevel != nil )
+		*pfGroundLevel = fGroundLevel;
+	
+	return true;
+}
+
+void
+CWaterLevel::RenderSeaBirds()
+{
+	CVector cur_pos = TheCamera.GetPosition();
+	
+	if ( !CCullZones::CamNoRain()
+		&& !CCullZones::PlayerNoRain()
+		&& (CWeather::NewWeatherType == WEATHER_SUNNY || CWeather::NewWeatherType == WEATHER_EXTRA_SUNNY)
+		&& CClock::ms_nGameClockHours > 6 && CClock::ms_nGameClockHours < 20 )
 	{
-		if ( apGeomArray[geom] == NULL )
+		static CVector prev_pos(0.0f, 0.0f, 0.0f);
+		static CVector prev_front(0.0f, 0.0f, 0.0f);
+		static int32 timecounter;
+
+		if ( Abs(prev_pos.x - cur_pos.x) + Abs(prev_pos.y - cur_pos.y) + Abs(prev_pos.z - cur_pos.z) > 1.5f )
 		{
-			apGeomArray[geom] = RpGeometryCreate(9*9, 8*8*2, rpGEOMETRYTRISTRIP
-															| rpGEOMETRYPRELIT
-															| rpGEOMETRYMODULATEMATERIALCOLOR
-															| rpGEOMETRYTEXTURED);
-			ASSERT(apGeomArray[geom] != NULL);
+			prev_pos = cur_pos;
+			timecounter = CTimer::GetTimeInMilliseconds();
+		}
+		else if ( (CTimer::GetTimeInMilliseconds() - timecounter) > 5000 )
+		{
+			static int32 birdgenTime = 0;
+			
+			if ( (CTimer::GetTimeInMilliseconds() - birdgenTime) > 1000 )
+			{
+				birdgenTime = CTimer::GetTimeInMilliseconds();
+				
+				CVector vecPos = cur_pos;
+				
+				float fAngle = CGeneral::GetRandomNumberInRange(90.0f, 150.0f);
+				
+				uint16 nSinCosIdx = CGeneral::GetRandomNumber() % (CParticle::SIN_COS_TABLE_SIZE-1);
+				
+				float fCos = CParticle::Cos(nSinCosIdx);
+				float fSin = CParticle::Sin(nSinCosIdx);
 
-			RpTriangle *geomTriangles = RpGeometryGetTriangles(apGeomArray[geom]);
+				vecPos.x += (fCos - fSin) * fAngle;
+				vecPos.y += (fSin + fCos) * fAngle;
+				vecPos.z += CGeneral::GetRandomNumberInRange(10.0f, 30.0f);
+				
+				CVector vecDir(CGeneral::GetRandomNumberInRange(-1.0f, 1.0f),
+								CGeneral::GetRandomNumberInRange(-1.0f, 1.0f),
+								0.0f);
+				
+				CParticle::AddParticle(PARTICLE_BIRD_FRONT, vecPos, vecDir, nil, 0.0f, 0, 0, 0, 0);
+			}
+		}
+	}
+}
+
+void
+CWaterLevel::RenderShipsOnHorizon()
+{
+	CVector cur_pos = FindPlayerPed()->GetPosition();
+
+	static CVector prev_pos(0.0f, 0.0f, 0.0f);
+	static CVector prev_front(0.0f, 0.0f, 0.0f);
+	static int32 timecounter;
+
+	if ( Abs(prev_pos.x - cur_pos.x) + Abs(prev_pos.y - cur_pos.y) + Abs(prev_pos.z - cur_pos.z) > 1.5f )
+	{
+		prev_pos = cur_pos;
+		timecounter = CTimer::GetTimeInMilliseconds();
+	}
+	else if ( (CTimer::GetTimeInMilliseconds() - timecounter) > 5000 )
+	{
+		static int32 shipgenTime = 0;
+		
+		if ( (CTimer::GetTimeInMilliseconds() - shipgenTime) > 4000 )
+		{
+			shipgenTime = CTimer::GetTimeInMilliseconds();
+			
+			CVector vecPos = cur_pos;
+			
+			float fAngle = CGeneral::GetRandomNumberInRange(450.0f, 750.0f);
+			
+			uint16 nSinCosIdx = CGeneral::GetRandomNumber() % (CParticle::SIN_COS_TABLE_SIZE-1);
 			
-			ASSERT( geomTriangles != NULL );
+			float fCos = CParticle::Cos(nSinCosIdx);
+			float fSin = CParticle::Sin(nSinCosIdx);
 
-			for ( int32 i = 0; i < 8; i++ )
+			vecPos.x += (fCos - fSin) * fAngle;
+			vecPos.y += (fSin + fCos) * fAngle;
+			
+			float fLevelNoWaves;
+			
+			if ( GetWaterLevelNoWaves(vecPos.x, vecPos.y, vecPos.z, &fLevelNoWaves) )
 			{
-				for ( int32 j = 0; j < 8; j++ )
+				if ( IsLocationOutOfWorldBounds_WS(vecPos, 1) )
 				{
+					vecPos.z  = fLevelNoWaves + 9.5f;
 					
-					/*  
-						[B]       [C]
-						 ***********
-						 *       * *
-						 *     *   *
-						 *   *     *
-						 * *       *
-						 ***********
-						[A]       [D]
-					*/
-					
-					
-					RpGeometryTriangleSetVertexIndices(apGeomArray[geom],
-						&geomTriangles[2 * 8*i + 2*j + 0], /*A*/i*9+j+0, /*B*/i*9+j+1,   /*C*/i*9+j+9+1);
+					CVector vecDir
+					(
+						CGeneral::GetRandomNumberInRange(-0.1f, 0.1f),
+						0.0f,
+						0.0f
+					);
 					
-					RpGeometryTriangleSetVertexIndices(apGeomArray[geom],
-						&geomTriangles[2 * 8*i + 2*j + 1], /*A*/i*9+j+0, /*C*/i*9+j+9+1, /*D*/i*9+j+9  );
-
-					RpGeometryTriangleSetMaterial(apGeomArray[geom], &geomTriangles[2 * 8*i + 2*j + 0], wavyMaterial);
-					
-					RpGeometryTriangleSetMaterial(apGeomArray[geom], &geomTriangles[2 * 8*i + 2*j + 1], wavyMaterial);
+					CParticle::AddParticle(PARTICLE_SHIP_SIDE, vecPos, vecDir,
+						nil, 0.0f, 0, 0, CGeneral::GetRandomNumber() & 7, 0);
 				}
 			}
+		}
+	}
+}
 
-			RpMorphTarget *geomMorphTarget = RpGeometryGetMorphTarget(apGeomArray[geom], 0);
-			RwV3d         *geomVertices    = RpMorphTargetGetVertices(geomMorphTarget);
-			
-			ASSERT( geomMorphTarget != NULL );
-			ASSERT( geomVertices != NULL );
+void
+CWaterLevel::HandleSeaLifeForms()
+{
+	if ( CReplay::IsPlayingBack() )
+		return;
+	
+	CVector cur_pos = FindPlayerPed()->GetPosition();
 
-			for ( int32 i = 0; i < 9; i++ )
+	static CVector prev_pos(0.0f, 0.0f, 0.0f);
+	static int32 timecounter;
+	
+	if ( Abs(prev_pos.x - cur_pos.x) + Abs(prev_pos.y - cur_pos.y) + Abs(prev_pos.z - cur_pos.z) > 1.5f )
+	{
+		prev_pos = cur_pos;
+		timecounter = CTimer::GetTimeInMilliseconds();
+	}
+	else if ( (CTimer::GetTimeInMilliseconds() - timecounter) > 5000 )
+	{
+//TODO(MIAMI)
+//		if ( CWaterCreatures::IsSpaceForMoreWaterCreatures() )
+		{
+			for ( int32 i = 0; i < 3; i++ )
 			{
-				for ( int32 j = 0; j < 9; j++ )
-				{
-					geomVertices[9*i+j].x = (float)i * 4.0f;
-					geomVertices[9*i+j].y = (float)j * 4.0f;
-					geomVertices[9*i+j].z = 0.0f;
-				}
+				CVector vecPos = cur_pos;
+				
+				float fAngle = CGeneral::GetRandomNumberInRange(15.0f, 30.0f);
+				
+				uint16 nSinCosIdx = CGeneral::GetRandomNumber() % (CParticle::SIN_COS_TABLE_SIZE-1);
+				
+				float fCos = CParticle::Cos(nSinCosIdx);
+				float fSin = CParticle::Sin(nSinCosIdx);
+				
+				vecPos.x += (fCos - fSin) * fAngle;
+				vecPos.y += (fSin + fCos) * fAngle;
+				
+				//TODO(MIAMI)
+				//CWaterCreatures::CreateOne(vecPos, 0xFFFFFFFF);
 			}
-
-			RpMorphTargetSetBoundingSphere(geomMorphTarget, RpMorphTargetGetBoundingSphere(wavyMorphTarget));			
-			RpGeometryUnlock(apGeomArray[geom]);
 		}
 	}
+	
+	//TODO(MIAMI)
+	//CWaterCreatures::UpdateAll();
 }
 
 void
-CWaterLevel::FreeBoatWakeArray()
+CWaterLevel::HandleBeachToysStuff(void)
 {
-	for ( int32 i = 0; i < MAX_BOAT_WAKES; i++ )
+	CVector cur_pos = FindPlayerPed()->GetPosition();
+	
+	static bool bBeachBallInit = true;
+	static CVector FirstBeachBallPos = cur_pos;
+	static bool bLoungeInit = true;
+	static CVector FirstLoungePos = cur_pos;
+	static CVector prev_pos(0.0f, 0.0f, 0.0f);
+	static int32 timecounter;
+
+	if ( Abs(prev_pos.x - cur_pos.x) + Abs(prev_pos.y - cur_pos.y) + Abs(prev_pos.z - cur_pos.z) > 1.5f )
 	{
-		if ( apGeomArray[i] != NULL )
+		prev_pos = cur_pos;
+		timecounter = CTimer::GetTimeInMilliseconds();
+	}
+	else if ( (CTimer::GetTimeInMilliseconds() - timecounter) > 5000 )
+	{
+		static int32 toygenTime = CTimer::GetTimeInMilliseconds();
+		
+		if ( (CTimer::GetTimeInMilliseconds() - toygenTime) > 20000 )
 		{
-			RpGeometryDestroy(apGeomArray[i]);
-			apGeomArray[i] = NULL;
+			toygenTime = CTimer::GetTimeInMilliseconds();
+			
+			if ( bBeachBallInit ||  (cur_pos - FirstBeachBallPos).MagnitudeSqr() > 6400.0f )
+			{
+				for ( int32 i = 0; i < 3; i++ )
+				{
+					CVector vecPos = cur_pos;
+					
+					float fAngle = CGeneral::GetRandomNumberInRange(20.0f, 35.0f);
+					
+					uint16 nSinCosIdx = CGeneral::GetRandomNumber() % (CParticle::SIN_COS_TABLE_SIZE-1);
+					
+					float fCos = CParticle::Cos(nSinCosIdx);
+					float fSin = CParticle::Sin(nSinCosIdx);
+					
+					vecPos.x += (fCos - fSin) * fAngle;
+					vecPos.y += (fSin + fCos) * fAngle;
+					
+					if ( TheCamera.IsSphereVisible(vecPos, 1.0f, &TheCamera.GetCameraMatrix()) )
+					{
+						float fWaterLevel;
+						
+						if ( !GetWaterLevel(vecPos.x, vecPos.y, vecPos.z, &fWaterLevel, false) )
+						{
+							float fGroundLevel;
+							ColData coldata;
+							
+							if ( GetGroundLevel(vecPos, &fGroundLevel, &coldata, 30.0f) )
+							{
+								if ( coldata.SurfaceType == SURFACE_SAND )
+								{
+									CEntity *toy = CreateBeachToy(vecPos, BEACHTOY_BALL);
+									
+									if ( toy )
+									{
+										FirstBeachBallPos = cur_pos;
+										bBeachBallInit = false;
+										i = 10;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			if ( bLoungeInit ||  (cur_pos - FirstLoungePos).MagnitudeSqr() > 6400.0f )
+			{
+				for ( int32 i = 0; i < 5; i++ )
+				{
+					CVector vecPos = cur_pos;
+					
+					float fAngle = CGeneral::GetRandomNumberInRange(20.0f, 35.0f);
+					
+					uint16 nSinCosIdx = CGeneral::GetRandomNumber() % (CParticle::SIN_COS_TABLE_SIZE-1);
+					
+					float fCos = CParticle::Cos(nSinCosIdx);
+					float fSin = CParticle::Sin(nSinCosIdx);
+					
+					vecPos.x += (fCos - fSin) * fAngle;
+					vecPos.y += (fSin + fCos) * fAngle;
+					
+					if ( TheCamera.IsSphereVisible(vecPos, 2.0f, &TheCamera.GetCameraMatrix()) )
+					{
+						float fWaterLevel;
+						
+						if ( !GetWaterLevel(vecPos.x, vecPos.y, vecPos.z, &fWaterLevel, false) )
+						{
+							float fGroundLevel;
+							ColData coldata;
+							
+							if ( GetGroundLevel(vecPos, &fGroundLevel, &coldata, 30.0f) )
+							{
+								if ( coldata.SurfaceType == SURFACE_SAND )
+								{
+									CEntity *toy = CreateBeachToy(vecPos, BEACHTOY_LOUNGE);
+									if ( toy )
+									{
+										toy->SetHeading(DEGTORAD(CGeneral::GetRandomNumberInRange(0.0f, 359.0f)));
+										FirstLoungePos = cur_pos;
+										bLoungeInit = false;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
-	
-	nGeomUsed = 0;  
 }
+
+CEntity *
+CWaterLevel::CreateBeachToy(CVector const &vec, eBeachToy beachtoy)
+{
+	//TODO(MIAMI)
+	return nil;
+}
\ No newline at end of file
diff --git a/src/render/WaterLevel.h b/src/render/WaterLevel.h
index 269d6091..5b02d54f 100644
--- a/src/render/WaterLevel.h
+++ b/src/render/WaterLevel.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#define WATER_BLOCK_SIZE     LARGE_SECTOR_SIZE
-#define WATER_FINEBLOCK_SIZE HUGE_SECTOR_SIZE
-#define WATER_Z_OFFSET (1.5f)
+#define WATER_X_OFFSET (400.0f)
+
+#define WATER_BLOCK_SECTORS     MAX_LARGE_SECTORS
+#define WATER_FINEBLOCK_SECTORS MAX_SMALL_SECTORS
+#define WATER_Z_OFFSET (0.5f)
 
 #define MAX_SMALL_SECTORS      128
 #define MAX_LARGE_SECTORS      64
@@ -29,6 +31,14 @@
 #define WATER_SIGN_X(x)                     ( (x) - (WATER_WIDTH /2) )
 #define WATER_SIGN_Y(y)                     ( (y) - (WATER_HEIGHT/2) )
 
+// 64x64 Large blocks 64x64 each
+#define WATER_TO_BLOCK_X(x)             ( WATER_UNSIGN_X(x) / WATER_BLOCK_SECTORS )
+#define WATER_TO_BLOCK_Y(x)             ( WATER_UNSIGN_Y(x) / WATER_BLOCK_SECTORS ) 
+
+// 128x128 Small blocks 32x32 each
+#define WATER_TO_FINEBLOCK_X(x)         ( WATER_UNSIGN_X(x) / WATER_FINEBLOCK_SECTORS )
+#define WATER_TO_FINEBLOCK_Y(x)         ( WATER_UNSIGN_Y(x) / WATER_FINEBLOCK_SECTORS ) 
+ 
 // 32
 #define WATER_SMALL_X(x)                    ( WATER_UNSIGN_X(x)					/ MAX_SMALL_SECTORS     )
 #define WATER_SMALL_Y(y)                    ( WATER_UNSIGN_Y(y)					/ MAX_SMALL_SECTORS     )
@@ -61,40 +71,106 @@
 #define WATER_TO_EXTRAHUGE_SECTOR_X(x)      ( WATER_UNSIGN_X(x)					/ EXTRAHUGE_SECTOR_SIZE )
 #define WATER_TO_EXTRAHUGE_SECTOR_Y(y)      ( WATER_UNSIGN_Y(y)					/ EXTRAHUGE_SECTOR_SIZE )
 
+struct ColData
+{
+	uint8 SurfaceType;
+	uint8 PieceType;
+};
 
-#define MAX_BOAT_WAKES 8
+enum eBeachToy
+{
+	BEACHTOY_0 = 0,
+	BEACHTOY_BALL,
+	BEACHTOY_2,
+	BEACHTOY_3,
+	BEACHTOY_4,
+	BEACHTOY_LOUNGE = 5
+};
 
 extern RwRaster* gpWaterRaster;
 extern bool gbDontRenderWater;
 
+class CEntity;
+
 class CWaterLevel
 {
+public:
 	static int32       ms_nNoOfWaterLevels;
 	static float       ms_aWaterZs[48];
 	static CRect       ms_aWaterRects[48];
-	static uint8       aWaterBlockList[WATER_BLOCK_SIZE][WATER_BLOCK_SIZE];
-	static uint8       aWaterFineBlockList[WATER_FINEBLOCK_SIZE][WATER_FINEBLOCK_SIZE];
+	static uint8       aWaterBlockList[WATER_BLOCK_SECTORS][WATER_BLOCK_SECTORS];				// 64x64 Large blocks 64x64 each
+	static uint8       aWaterFineBlockList[WATER_FINEBLOCK_SECTORS][WATER_FINEBLOCK_SECTORS];  // 128x128 Small blocks 32x32 each
 	static bool        WavesCalculatedThisFrame;
-	static RpAtomic   *ms_pWavyAtomic;
-	static RpGeometry *apGeomArray[MAX_BOAT_WAKES];
-	static int16       nGeomUsed;
+	
+	static bool        RequireWavySector;
+	static bool        MaskCalculatedThisFrame;
+	static CVector     PreCalculatedMaskPosn;
+	static bool        m_bRenderSeaBed;
+	static int32       m_nRenderWaterLayers;
+	
+	static RpAtomic    *ms_pWavyAtomic;
+	static RpAtomic    *ms_pMaskAtomic;
 
-public:
-	static void    Initialise(Const char *pWaterDat);
 	static void    Shutdown();
+	
 	static void    CreateWavyAtomic();
 	static void    DestroyWavyAtomic();
+	
+	
 	static bool    GetWaterLevel(float fX, float fY, float fZ, float *pfOutLevel, bool bDontCheckZ);
 	static bool    GetWaterLevel(CVector coors, float *pfOutLevel, bool bDontCheckZ) { return GetWaterLevel(coors.x, coors.y, coors.z, pfOutLevel, bDontCheckZ); }
 	static bool    GetWaterLevelNoWaves(float fX, float fY, float fZ, float *pfOutLevel);
+	static float   GetWaterWavesOnly(short x, short y);	// unused
+	static CVector GetWaterNormal(float fX, float fY);
+	
 	static void    RenderWater();
-	static void    RenderOneFlatSmallWaterPoly    (float fX, float fY, float fZ, RwRGBA const &color);
-	static void    RenderOneFlatLargeWaterPoly    (float fX, float fY, float fZ, RwRGBA const &color);	
-	static void    RenderOneFlatHugeWaterPoly     (float fX, float fY, float fZ, RwRGBA const &color);
-	static void    RenderOneFlatExtraHugeWaterPoly(float fX, float fY, float fZ, RwRGBA const &color);
-	static void    RenderOneWavySector            (float fX, float fY, float fZ, RwRGBA const &color, bool bUnk = false);
-	static float   CalcDistanceToWater(float fX, float fY);
-	static void    RenderAndEmptyRenderBuffer();	
-	static void    AllocateBoatWakeArray();
-	static void    FreeBoatWakeArray();
+	static void    RenderTransparentWater(void);
+	// unused 
+	static void RenderOneFlatSmallWaterPoly    (float fX, float fY, float fZ, RwRGBA const &color);
+	// inlined
+	static void RenderOneFlatLargeWaterPoly    (float fX, float fY, float fZ, RwRGBA const &color);	
+	static void RenderOneFlatHugeWaterPoly     (float fX, float fY, float fZ, RwRGBA const &color);
+	static void RenderOneFlatExtraHugeWaterPoly(float fX, float fY, float fZ, RwRGBA const &color);
+	// inlined
+	static void RenderOneWavySector            (float fX, float fY, float fZ, RwRGBA const &color, bool bDontRender = false);
+	// unused
+#ifdef PC_WATER
+	static void RenderWavyMask(float fX, float fY, float fZ, float fSectorX, float fSectorY, float fCamPosX, float fCamPosY, float fCamDirX, float fCamDirY, RwRGBA const&color);
+#else
+	static void RenderWavyMask(float fX, float fY, float fZ, float fSectorX, float fSectorY, int32 nCamDirX, int32 nCamDirY, RwRGBA const&color);
+#endif
+
+#ifdef PC_WATER
+	static void PreCalcWaterGeometry(void);
+	static bool PreCalcWavySector(RwRGBA const &color);	//fucked up
+	static bool PreCalcWavyMask(float fX, float fY, float fZ, float fSectorX, float fSectorY, float fCamPosX, float fCamPosY, float fCamDirX, float fCamDirY, RwRGBA const&color);
+#endif
+		
+	
+	static void RenderBoatWakes(void);
+	static void RenderWakeSegment(CVector2D &vecA, CVector2D &vecB, CVector2D &vecC, CVector2D &vecD, float &fSizeA, float &fSizeB, float &fAlphaA, float &fAlphaB, float &fWakeZ);
+	
+	// unused
+	static void RenderOneSlopedUnderWaterPoly(float fX, float fY, float fZ, RwRGBA const&color); // UNUSED
+	static void RenderOneFlatSmallWaterPolyBlended(float fX, float fY, float fZ, float fCamX, float fCamY, RwRGBA const &color, RwRGBA const &colorTrans, float fDrawDist);
+	static float CalcDistanceToWater(float fX, float fY);
+	static void RenderAndEmptyRenderBuffer();
+	
+	static bool GetGroundLevel(CVector const &vecPosn, float *pfOutLevel, ColData *pData, float fDistance);
+	
+	// unused
+	static bool IsLocationOutOfWorldBounds_WS(CVector const &vecPosn, int nOffset);
+	// unused
+	static bool GetGroundLevel_WS(CVector const & vecPosn, float *pfOutLevel, ColData *pData, float fDistance);
+	static bool GetWaterDepth(CVector const &vecPosn, float *pfDepth, float *pfLevelNoWaves, float *pfGroundLevel);
+	
+	static void RenderSeaBirds();
+	static void RenderShipsOnHorizon();
+	
+	static void HandleSeaLifeForms();
+	
+	static void HandleBeachToysStuff(void);
+	static CEntity *CreateBeachToy(CVector const &vec, eBeachToy beachtoy);
 };
+
+extern void WaterLevelInitialise(Const char *datFile);
\ No newline at end of file
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp
index b4031705..106e2f89 100644
--- a/src/render/Weather.cpp
+++ b/src/render/Weather.cpp
@@ -8,6 +8,7 @@
 #include "DMAudio.h"
 #include "General.h"
 #include "Pad.h"
+#include "PlayerPed.h"
 #include "Particle.h"
 #include "RenderBuffer.h"
 #include "Stats.h"
@@ -17,6 +18,7 @@
 #include "Vehicle.h"
 #include "World.h"
 #include "ZoneCull.h"
+#include "SpecialFX.h"
 
 int32 CWeather::SoundHandle = -1;
 
@@ -32,6 +34,7 @@ uint32 CWeather::LightningFlashLastChange;
 uint32 CWeather::WhenToPlayLightningSound;
 uint32 CWeather::LightningDuration;
 
+float CWeather::ExtraSunnyness;
 float CWeather::Foggyness;
 float CWeather::CloudCoverage;
 float CWeather::Wind;
@@ -39,41 +42,60 @@ float CWeather::Rain;
 float CWeather::InterpolationValue;
 float CWeather::WetRoads;
 float CWeather::Rainbow;
+float CWeather::SunGlare;
+float CWeather::WindClipped;
+float CWeather::TrafficLightBrightness;
 
 bool CWeather::bScriptsForceRain;
-bool CWeather::Stored_StateStored;
-
-float CWeather::Stored_InterpolationValue;
-int16 CWeather::Stored_OldWeatherType;
-int16 CWeather::Stored_NewWeatherType;
-float CWeather::Stored_Rain;
 
 tRainStreak Streaks[NUM_RAIN_STREAKS];
 
 const int16 WeatherTypesList[] = {
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
+	WEATHER_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
 	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_CLOUDY, WEATHER_CLOUDY, WEATHER_RAINY, WEATHER_RAINY,
+	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_CLOUDY,
+	WEATHER_RAINY, WEATHER_RAINY, WEATHER_RAINY, WEATHER_RAINY,
 	WEATHER_CLOUDY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_CLOUDY, WEATHER_FOGGY, WEATHER_FOGGY, WEATHER_CLOUDY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_CLOUDY, WEATHER_CLOUDY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_CLOUDY, WEATHER_CLOUDY, WEATHER_RAINY, WEATHER_RAINY,
-	WEATHER_CLOUDY, WEATHER_RAINY, WEATHER_CLOUDY, WEATHER_SUNNY,
+	WEATHER_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY
+};
+
+const int16 WeatherTypesList_WithHurricanes[] = {
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
+	WEATHER_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_CLOUDY,
+	WEATHER_HURRICANE, WEATHER_HURRICANE, WEATHER_CLOUDY, WEATHER_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
 	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
 	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_FOGGY, WEATHER_FOGGY, WEATHER_SUNNY,
-	WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_RAINY, WEATHER_CLOUDY,
+	WEATHER_CLOUDY, WEATHER_HURRICANE, WEATHER_HURRICANE, WEATHER_HURRICANE,
+	WEATHER_CLOUDY, WEATHER_SUNNY, WEATHER_SUNNY, WEATHER_SUNNY,
+	WEATHER_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY,
+	WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY, WEATHER_EXTRA_SUNNY
 };
 
 const float Windiness[] = {
-	0.0f, // WEATHER_SUNNY
+	0.25f,// WEATHER_SUNNY
 	0.7f, // WEATHER_CLOUDY
 	1.0f, // WEATHER_RAINY
-	0.5f  // WEATHER_FOGGY
+	0.0f, // WEATHER_FOGGY
+	0.0f, // WEATHER_EXTRA_SUNNY
+	2.0f, // WEATHER_HURRICANE
+	0.0f
 };
 
 #define MIN_TIME_BETWEEN_LIGHTNING_FLASH_CHANGES (50)
@@ -104,10 +126,9 @@ const float Windiness[] = {
 
 void CWeather::Init(void)
 {
-	NewWeatherType = WEATHER_SUNNY;
+	NewWeatherType = WEATHER_EXTRA_SUNNY;
 	bScriptsForceRain = false;
-	OldWeatherType = WEATHER_CLOUDY;
-	Stored_StateStored = false;
+	OldWeatherType = WEATHER_EXTRA_SUNNY;
 	InterpolationValue = 0.0f;
 	WhenToPlayLightningSound = 0;
 	WeatherTypeInList = 0;
@@ -127,16 +148,8 @@ void CWeather::Update(void)
 			NewWeatherType = ForcedWeatherType;
 		else {
 			WeatherTypeInList = (WeatherTypeInList + 1) % ARRAY_SIZE(WeatherTypesList);
-			NewWeatherType = WeatherTypesList[WeatherTypeInList];
-#ifdef FIX_BUGS
-		}
-		if (NewWeatherType == WEATHER_RAINY)
-			CStats::mmRain += CGeneral::GetRandomNumber() & 7;
-#else
-			if (NewWeatherType == WEATHER_RAINY)
-				CStats::mmRain += CGeneral::GetRandomNumber() & 7;
+			NewWeatherType = CStats::NoMoreHurricanes ? WeatherTypesList[WeatherTypeInList] : WeatherTypesList_WithHurricanes[WeatherTypeInList];
 		}
-#endif
 	}
 	InterpolationValue = fNewInterpolation;
 	if (CPad::GetPad(1)->GetRightShockJustDown()) {
@@ -188,14 +201,14 @@ void CWeather::Update(void)
 	}
 
 	// Wet roads
-	if (OldWeatherType == WEATHER_RAINY) {
-		if (NewWeatherType == WEATHER_RAINY)
+	if (OldWeatherType == WEATHER_RAINY || OldWeatherType == WEATHER_HURRICANE) {
+		if (NewWeatherType == WEATHER_RAINY || NewWeatherType == WEATHER_HURRICANE)
 			WetRoads = 1.0f;
 		else
 			WetRoads = 1.0f - InterpolationValue;
 	}
 	else {
-		if (NewWeatherType == WEATHER_RAINY)
+		if (NewWeatherType == WEATHER_RAINY || NewWeatherType == WEATHER_HURRICANE)
 			WetRoads = InterpolationValue;
 		else
 			WetRoads = 0.0f;
@@ -203,10 +216,10 @@ void CWeather::Update(void)
 
 	// Rain
 	float fNewRain;
-	if (NewWeatherType == WEATHER_RAINY) {
+	if (NewWeatherType == WEATHER_RAINY || NewWeatherType == WEATHER_HURRICANE) {
 		// if raining for >1 hour, values: 0, 0.33, 0.66, 0.99, switching every ~16.5s
 		fNewRain = ((uint16)CTimer::GetTimeInMilliseconds() >> 14) * 0.33f;
-		if (OldWeatherType != WEATHER_RAINY) {
+		if (OldWeatherType != WEATHER_RAINY && OldWeatherType != WEATHER_HURRICANE) {
 			if (InterpolationValue < 0.4f)
 				// if rain has just started (<24 minutes), always 0.5
 				fNewRain = 0.5f;
@@ -217,19 +230,14 @@ void CWeather::Update(void)
 	}
 	else
 		fNewRain = 0.0f;
-	if (Rain != fNewRain) { // ok to use comparasion
-		if (Rain < fNewRain)
-			Rain = Min(fNewRain, Rain + RAIN_CHANGE_SPEED * CTimer::GetTimeStep());
-		else
-			Rain = Max(fNewRain, Rain - RAIN_CHANGE_SPEED * CTimer::GetTimeStep());
-	}
+	Rain = fNewRain;
 
 	// Clouds
-	if (OldWeatherType != WEATHER_SUNNY)
+	if (OldWeatherType != WEATHER_SUNNY && OldWeatherType != WEATHER_EXTRA_SUNNY)
 		CloudCoverage = 1.0f - InterpolationValue;
 	else
 		CloudCoverage = 0.0f;
-	if (NewWeatherType != WEATHER_SUNNY)
+	if (NewWeatherType != WEATHER_SUNNY && OldWeatherType != WEATHER_EXTRA_SUNNY)
 		CloudCoverage += InterpolationValue;
 	
 	// Fog
@@ -239,12 +247,77 @@ void CWeather::Update(void)
 		Foggyness = 0.0f;
 	if (NewWeatherType == WEATHER_FOGGY)
 		Foggyness += InterpolationValue;
-	if (OldWeatherType == WEATHER_RAINY && NewWeatherType == WEATHER_SUNNY && InterpolationValue < 0.5f && CClock::GetHours() > 6 && CClock::GetHours() < 21)
+
+	// Extra Sunnyness
+	if (OldWeatherType == WEATHER_EXTRA_SUNNY)
+		ExtraSunnyness = 1.0f - InterpolationValue;
+	else
+		ExtraSunnyness = 0.0f;
+	if (NewWeatherType == WEATHER_EXTRA_SUNNY)
+		ExtraSunnyness += InterpolationValue;
+
+	// Rainbow
+	if (OldWeatherType == WEATHER_RAINY && (NewWeatherType == WEATHER_SUNNY || NewWeatherType == WEATHER_EXTRA_SUNNY) &&
+		InterpolationValue < 0.5f && CClock::GetHours() > 6 && CClock::GetHours() < 21)
 		Rainbow = 1.0f - 4.0f * Abs(InterpolationValue - 0.25f) / 4.0f;
 	else
 		Rainbow = 0.0f;
+
+	// Sun Glare
+	if (OldWeatherType == WEATHER_EXTRA_SUNNY)
+		SunGlare = 1.0f - InterpolationValue;
+	else
+		SunGlare = 0.0f;
+	if (NewWeatherType == WEATHER_EXTRA_SUNNY)
+		SunGlare += InterpolationValue;
+
+	if (SunGlare > 0.0f) {
+		SunGlare *= Min(1.0f, 7.0 * CTimeCycle::GetSunDirection().z);
+		SunGlare = clamp(SunGlare, 0.0f, 1.0f);
+		if (!CSpecialFX::bSnapShotActive)
+			SunGlare *= (1.0f - (CGeneral::GetRandomNumber()&0x1F)*0.007f);
+	}
+
 	Wind = InterpolationValue * Windiness[NewWeatherType] + (1.0f - InterpolationValue) * Windiness[OldWeatherType];
+	WindClipped = Max(1.0f, Wind);
+
+	if (CClock::GetHours() == 20)
+		TrafficLightBrightness = CClock::GetMinutes() / 60.0f;
+	else if (CClock::GetHours() > 6 && CClock::GetHours() < 20)
+		TrafficLightBrightness = 0.0f;
+	else if (CClock::GetHours() == 6)
+		TrafficLightBrightness = 1.0f - CClock::GetMinutes() / 60.0f;
+	else
+		TrafficLightBrightness = 1.0f;
+	TrafficLightBrightness = Max(WetRoads, TrafficLightBrightness);
+	TrafficLightBrightness = Max(Rain, TrafficLightBrightness);
+
 	AddRain();
+
+	if ((NewWeatherType == WEATHER_SUNNY || NewWeatherType == WEATHER_EXTRA_SUNNY) &&
+		!CGame::IsInInterior() && !CCutsceneMgr::IsRunning() && (CTimer::GetFrameCounter() & 7) == 0) {
+#ifdef FIX_BUGS
+		if (FindPlayerPed() && (!FindPlayerPed()->CheckIfInTheAir() || FindPlayerPed()->CheckIfInTheAir() && FindPlayerPed()->GetPosition().z < 7.5f &&
+			CClock::GetHours() > 6 && CClock::GetHours() < 18))
+#else
+		if (!FindPlayerPed()->CheckIfInTheAir() || FindPlayerPed()->CheckIfInTheAir() && FindPlayerPed()->GetPosition().z < 7.5f &&
+			CClock::GetHours() > 6 && CClock::GetHours() < 18)
+#endif
+			AddHeatHaze();
+	}
+
+	if ((NewWeatherType == WEATHER_SUNNY || NewWeatherType == WEATHER_EXTRA_SUNNY) && !CGame::IsInInterior() && !CCutsceneMgr::IsRunning())
+		AddBeastie();
+}
+
+void CWeather::AddHeatHaze()
+{
+	/* TODO(MIAMI) */
+}
+
+void CWeather::AddBeastie()
+{
+	/* TODO(MIAMI) */
 }
 
 void CWeather::ForceWeather(int16 weather)
@@ -494,7 +567,7 @@ void CWeather::RenderRainStreaks(void)
 		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
 		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
 		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpRainDropTex[3]));
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpRainDropTex));
 		if (RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStored, nil, 1))
 		{
 			RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, TempBufferRenderIndexList, TempBufferIndicesStored);
@@ -510,23 +583,3 @@ void CWeather::RenderRainStreaks(void)
 	TempBufferVerticesStored = 0;
 	TempBufferIndicesStored = 0;
 }
-
-void CWeather::StoreWeatherState()
-{
-	Stored_StateStored = true;
-	Stored_InterpolationValue = InterpolationValue;
-	Stored_Rain = Rain;
-	Stored_NewWeatherType = NewWeatherType;
-	Stored_OldWeatherType = OldWeatherType;
-}
-
-void CWeather::RestoreWeatherState()
-{
-#ifdef FIX_BUGS // it's not used anyway though
-	Stored_StateStored = false;
-#endif
-	InterpolationValue = Stored_InterpolationValue;
-	Rain = Stored_Rain;
-	NewWeatherType = Stored_NewWeatherType;
-	OldWeatherType = Stored_OldWeatherType;
-}
diff --git a/src/render/Weather.h b/src/render/Weather.h
index 9c670317..ae09e5d1 100644
--- a/src/render/Weather.h
+++ b/src/render/Weather.h
@@ -1,21 +1,17 @@
 enum {
-	WEATHER_SUNNY,
+	WEATHER_RANDOM = -1,
+	WEATHER_SUNNY = 0,
 	WEATHER_CLOUDY,
 	WEATHER_RAINY,
-	WEATHER_FOGGY
+	WEATHER_FOGGY,
+	WEATHER_EXTRA_SUNNY,
+	WEATHER_HURRICANE,
+	WEATHER_TOTAL
 };
 
 class CWeather
 {
 public:
-	enum {
-		WEATHER_RANDOM = -1,
-		WEATHER_SUNNY = 0,
-		WEATHER_CLOUDY = 1,
-		WEATHER_RAINY = 2,
-		WEATHER_FOGGY = 3,
-		WEATHER_TOTAL = 4
-	};
 	static int32 SoundHandle;
 
 	static int32 WeatherTypeInList;
@@ -30,6 +26,7 @@ public:
 	static uint32 WhenToPlayLightningSound;
 	static uint32 LightningDuration;
 
+	static float ExtraSunnyness;
 	static float Foggyness;
 	static float CloudCoverage;
 	static float Wind;
@@ -37,13 +34,11 @@ public:
 	static float InterpolationValue;
 	static float WetRoads;
 	static float Rainbow;
+	static float SunGlare;
+	static float WindClipped;
+	static float TrafficLightBrightness;
 
 	static bool bScriptsForceRain;
-	static bool Stored_StateStored;
-	static float Stored_InterpolationValue;
-	static int16 Stored_OldWeatherType;
-	static int16 Stored_NewWeatherType;
-	static float Stored_Rain;
 
 	static void RenderRainStreaks(void);
 	static void Update(void);
@@ -52,9 +47,9 @@ public:
 	static void ReleaseWeather();
 	static void ForceWeather(int16);
 	static void ForceWeatherNow(int16);
-	static void StoreWeatherState();
-	static void RestoreWeatherState();
 	static void AddRain();
+	static void AddHeatHaze();
+	static void AddBeastie();
 };
 
 enum {
@@ -68,4 +63,4 @@ struct tRainStreak
 	uint32 timer;
 };
 
-extern RwTexture* gpRainDropTex[4];
\ No newline at end of file
+extern RwTexture* gpRainDropTex;
\ No newline at end of file
diff --git a/src/render/WindModifiers.cpp b/src/render/WindModifiers.cpp
new file mode 100644
index 00000000..49e7c96a
--- /dev/null
+++ b/src/render/WindModifiers.cpp
@@ -0,0 +1,13 @@
+#include "common.h"
+#include "WindModifiers.h"
+
+void
+CWindModifiers::RegisterOne(CVector pos, int32 unk)
+{
+}
+
+int32
+CWindModifiers::FindWindModifier(CVector pos, float *x, float *y)
+{
+	return 0;
+}
diff --git a/src/render/WindModifiers.h b/src/render/WindModifiers.h
new file mode 100644
index 00000000..c42e185d
--- /dev/null
+++ b/src/render/WindModifiers.h
@@ -0,0 +1,8 @@
+#pragma once
+
+class CWindModifiers
+{
+public:
+	static void RegisterOne(CVector pos, int32 unk);
+	static int32 FindWindModifier(CVector pos, float *x, float *y);
+};
diff --git a/src/rw/Lights.cpp b/src/rw/Lights.cpp
index 5a253854..cd45b81f 100644
--- a/src/rw/Lights.cpp
+++ b/src/rw/Lights.cpp
@@ -8,6 +8,7 @@
 #include "Weather.h"
 #include "ZoneCull.h"
 #include "Frontend.h"
+#include "MBlur.h"
 
 RpLight *pAmbient;
 RpLight *pDirect;
@@ -22,6 +23,7 @@ RwRGBAReal DirectionalLightColourForFrame;
 RwRGBAReal AmbientLightColour;
 RwRGBAReal DirectionalLightColour;
 
+//--MIAMI: done
 void
 SetLightsWithTimeOfDayColour(RpWorld *)
 {
@@ -29,17 +31,35 @@ SetLightsWithTimeOfDayColour(RpWorld *)
 	RwMatrix mat;
 
 	if(pAmbient){
-		AmbientLightColourForFrame.red = CTimeCycle::GetAmbientRed() * CCoronas::LightsMult;
-		AmbientLightColourForFrame.green = CTimeCycle::GetAmbientGreen() * CCoronas::LightsMult;
-		AmbientLightColourForFrame.blue = CTimeCycle::GetAmbientBlue() * CCoronas::LightsMult;
+		if(CMBlur::BlurOn){
+			AmbientLightColourForFrame.red = CTimeCycle::GetAmbientRed_Bl() * CCoronas::LightsMult;
+			AmbientLightColourForFrame.green = CTimeCycle::GetAmbientGreen_Bl() * CCoronas::LightsMult;
+			AmbientLightColourForFrame.blue = CTimeCycle::GetAmbientBlue_Bl() * CCoronas::LightsMult;
+		}else{
+			AmbientLightColourForFrame.red = CTimeCycle::GetAmbientRed() * CCoronas::LightsMult;
+			AmbientLightColourForFrame.green = CTimeCycle::GetAmbientGreen() * CCoronas::LightsMult;
+			AmbientLightColourForFrame.blue = CTimeCycle::GetAmbientBlue() * CCoronas::LightsMult;
+		}
+
+		if(CMBlur::BlurOn){
+			AmbientLightColourForFrame_PedsCarsAndObjects.red = CTimeCycle::GetAmbientRed_Obj_Bl() * CCoronas::LightsMult;
+			AmbientLightColourForFrame_PedsCarsAndObjects.green = CTimeCycle::GetAmbientGreen_Obj_Bl() * CCoronas::LightsMult;
+			AmbientLightColourForFrame_PedsCarsAndObjects.blue = CTimeCycle::GetAmbientBlue_Obj_Bl() * CCoronas::LightsMult;
+		}else{
+			AmbientLightColourForFrame_PedsCarsAndObjects.red = CTimeCycle::GetAmbientRed_Obj() * CCoronas::LightsMult;
+			AmbientLightColourForFrame_PedsCarsAndObjects.green = CTimeCycle::GetAmbientGreen_Obj() * CCoronas::LightsMult;
+			AmbientLightColourForFrame_PedsCarsAndObjects.blue = CTimeCycle::GetAmbientBlue_Obj() * CCoronas::LightsMult;
+		}
+
 		if(CWeather::LightningFlash && !CCullZones::CamNoRain()){
 			AmbientLightColourForFrame.red = 1.0f;
 			AmbientLightColourForFrame.green = 1.0f;
 			AmbientLightColourForFrame.blue = 1.0f;
+
+			AmbientLightColourForFrame_PedsCarsAndObjects.red = 1.0f;
+			AmbientLightColourForFrame_PedsCarsAndObjects.green = 1.0f;
+			AmbientLightColourForFrame_PedsCarsAndObjects.blue = 1.0f;
 		}
-		AmbientLightColourForFrame_PedsCarsAndObjects.red = Min(1.0f, AmbientLightColourForFrame.red*1.3f);
-		AmbientLightColourForFrame_PedsCarsAndObjects.green = Min(1.0f, AmbientLightColourForFrame.green*1.3f);
-		AmbientLightColourForFrame_PedsCarsAndObjects.blue = Min(1.0f, AmbientLightColourForFrame.blue*1.3f);
 		RpLightSetColor(pAmbient, &AmbientLightColourForFrame);
 	}
 
@@ -66,9 +86,9 @@ SetLightsWithTimeOfDayColour(RpWorld *)
 		RwFrameTransform(RpLightGetFrame(pDirect), &mat, rwCOMBINEREPLACE);
 	}
 
-	if(CMenuManager::m_PrefsBrightness > 256){
-		float f1 = 2.0f * (CMenuManager::m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
-		float f2 = 3.0f * (CMenuManager::m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
+	if(FrontEndMenuManager.m_PrefsBrightness > 256){
+		float f1 = 2.0f * (FrontEndMenuManager.m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
+		float f2 = 3.0f * (FrontEndMenuManager.m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
 
 		AmbientLightColourForFrame.red = Min(1.0f, AmbientLightColourForFrame.red * f2);
 		AmbientLightColourForFrame.green = Min(1.0f, AmbientLightColourForFrame.green * f2);
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index cd2a1bf6..76c6c753 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -12,6 +12,7 @@ RtCharset *debugCharset;
 #endif
 
 bool gPS2alphaTest = 1;
+bool gBackfaceCulling;
 
 #ifndef FINAL
 static bool charsetOpen;
@@ -127,6 +128,15 @@ DefinedState(void)
 #endif
 }
 
+void
+SetCullMode(uint32 mode)
+{
+	if(gBackfaceCulling)
+		RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)mode);
+	else
+		RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+}
+
 RwFrame*
 GetFirstFrameCallback(RwFrame *child, void *data)
 {
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index a751ee39..993acd89 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -1,6 +1,7 @@
 #pragma once
 
 extern bool gPS2alphaTest;
+extern bool gBackfaceCulling;
 
 void *RwMallocAlign(RwUInt32 size, RwUInt32 align);
 void RwFreeAlign(void *mem);
@@ -11,6 +12,7 @@ void DestroyDebugFont();
 void ObrsPrintfString(const char *str, short x, short y);
 void FlushObrsPrintfs();
 void DefinedState(void);
+void SetCullMode(uint32 mode);
 RwFrame *GetFirstChild(RwFrame *frame);
 RwObject *GetFirstObject(RwFrame *frame);
 RpAtomic *GetFirstAtomic(RpClump *clump);
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 22edcb68..cff1ff16 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -4,15 +4,20 @@
 #include "Entity.h"
 #include "ModelInfo.h"
 #include "Lights.h"
+#include "RwHelper.h"
 #include "Renderer.h"
 #include "Camera.h"
 #include "VisibilityPlugins.h"
 #include "World.h"
 
+//--MIAMI: file done
+
 #define FADE_DISTANCE 20.0f
 
 CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaList;
+CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaBoatAtomicList;
 CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaEntityList;
+CLinkList<CVisibilityPlugins::AlphaObjectInfo> CVisibilityPlugins::m_alphaUnderwaterEntityList;
 
 int32 CVisibilityPlugins::ms_atomicPluginOffset = -1;
 int32 CVisibilityPlugins::ms_framePluginOffset = -1;
@@ -26,7 +31,6 @@ float CVisibilityPlugins::ms_vehicleLod1Dist;
 float CVisibilityPlugins::ms_vehicleFadeDist;
 float CVisibilityPlugins::ms_bigVehicleLod0Dist;
 float CVisibilityPlugins::ms_bigVehicleLod1Dist;
-float CVisibilityPlugins::ms_pedLod0Dist;
 float CVisibilityPlugins::ms_pedLod1Dist;
 float CVisibilityPlugins::ms_pedFadeDist;
 
@@ -36,6 +40,11 @@ CVisibilityPlugins::Initialise(void)
 	m_alphaList.Init(NUMALPHALIST);
 	m_alphaList.head.item.sort = 0.0f;
 	m_alphaList.tail.item.sort = 100000000.0f;
+
+	m_alphaBoatAtomicList.Init(NUMBOATALPHALIST);
+	m_alphaBoatAtomicList.head.item.sort = 0.0f;
+	m_alphaBoatAtomicList.tail.item.sort = 100000000.0f;
+
 #ifdef ASPECT_RATIO_SCALE
 	// default 150 if not enough for bigger FOVs
 	m_alphaEntityList.Init(NUMALPHAENTITYLIST * 3);
@@ -44,19 +53,28 @@ CVisibilityPlugins::Initialise(void)
 #endif // ASPECT_RATIO_SCALE
 	m_alphaEntityList.head.item.sort = 0.0f;
 	m_alphaEntityList.tail.item.sort = 100000000.0f;
+
+	m_alphaUnderwaterEntityList.Init(NUMALPHAUNTERWATERENTITYLIST);
+	m_alphaUnderwaterEntityList.head.item.sort = 0.0f;
+	m_alphaUnderwaterEntityList.tail.item.sort = 100000000.0f;
+
 }
 
 void
 CVisibilityPlugins::Shutdown(void)
 {
 	m_alphaList.Shutdown();
+	m_alphaBoatAtomicList.Shutdown();
 	m_alphaEntityList.Shutdown();
+	m_alphaUnderwaterEntityList.Shutdown();
 }
 
 void
 CVisibilityPlugins::InitAlphaEntityList(void)
 {
 	m_alphaEntityList.Clear();
+	m_alphaBoatAtomicList.Clear();
+	m_alphaUnderwaterEntityList.Clear();
 }
 
 bool
@@ -65,10 +83,9 @@ CVisibilityPlugins::InsertEntityIntoSortedList(CEntity *e, float dist)
 	AlphaObjectInfo item;
 	item.entity = e;
 	item.sort = dist;
-	bool ret = !!m_alphaEntityList.InsertSorted(item);
-//	if(!ret)
-//		printf("list full %d\n", m_alphaEntityList.Count());
-	return ret;
+	if(e->bUnderwater && m_alphaUnderwaterEntityList.InsertSorted(item))
+		return true;
+	return !!m_alphaEntityList.InsertSorted(item);
 }
 
 void
@@ -83,10 +100,16 @@ CVisibilityPlugins::InsertAtomicIntoSortedList(RpAtomic *a, float dist)
 	AlphaObjectInfo item;
 	item.atomic = a;
 	item.sort = dist;
-	bool ret = !!m_alphaList.InsertSorted(item);
-//	if(!ret)
-//		printf("list full %d\n", m_alphaList.Count());
-	return ret;
+	return !!m_alphaList.InsertSorted(item);
+}
+
+bool
+CVisibilityPlugins::InsertAtomicIntoBoatSortedList(RpAtomic *a, float dist)
+{
+	AlphaObjectInfo item;
+	item.atomic = a;
+	item.sort = dist;
+	return !!m_alphaBoatAtomicList.InsertSorted(item);
 }
 
 void
@@ -106,11 +129,25 @@ CVisibilityPlugins::SetRenderWareCamera(RwCamera *camera)
         ms_vehicleFadeDist = sq(100.0f * TheCamera.GenerationDistMultiplier);
         ms_bigVehicleLod0Dist = sq(60.0f * TheCamera.GenerationDistMultiplier);
         ms_bigVehicleLod1Dist = sq(150.0f * TheCamera.GenerationDistMultiplier);
-        ms_pedLod0Dist = sq(25.0f * TheCamera.LODDistMultiplier);
         ms_pedLod1Dist = sq(60.0f * TheCamera.LODDistMultiplier);
         ms_pedFadeDist = sq(70.0f * TheCamera.LODDistMultiplier);
 }
 
+static float DistToCameraSq;
+static float PitchToCamera;
+
+void
+CVisibilityPlugins::SetupVehicleVariables(RpClump *vehicle)
+{
+	if (RwObjectGetType((RwObject*)vehicle) != rpCLUMP)
+		return;
+	DistToCameraSq = GetDistanceSquaredFromCamera(RpClumpGetFrame(vehicle));
+	RwV3d distToCam;
+	RwV3dSub(&distToCam, ms_pCameraPosn, &RwFrameGetMatrix(RpClumpGetFrame(vehicle))->pos);
+	float dist2d = Sqrt(SQR(distToCam.x) + SQR(distToCam.y));
+	PitchToCamera = Atan2(distToCam.z, dist2d);
+}
+
 RpMaterial*
 SetAlphaCB(RpMaterial *material, void *data)
 {
@@ -126,32 +163,38 @@ SetTextureCB(RpMaterial *material, void *data)
 }
 
 void
-CVisibilityPlugins::RenderAlphaAtomics(void)
+CVisibilityPlugins::RenderAtomicList(CLinkList<AlphaObjectInfo> &list)
 {
 	CLink<AlphaObjectInfo> *node;
-	for(node = m_alphaList.tail.prev;
-	    node != &m_alphaList.head;
-	    node = node->prev)
+	for(node = list.tail.prev; node != &list.head; node = node->prev)
 		AtomicDefaultRenderCallBack(node->item.atomic);
 }
 
 void
-CVisibilityPlugins::RenderFadingEntities(void)
+CVisibilityPlugins::RenderAlphaAtomics(void)
+{
+	RenderAtomicList(m_alphaList);
+}
+
+void
+CVisibilityPlugins::RenderBoatAlphaAtomics(void)
+{
+	SetCullMode(rwCULLMODECULLNONE);
+	RenderAtomicList(m_alphaBoatAtomicList);
+	SetCullMode(rwCULLMODECULLBACK);
+}
+
+void
+CVisibilityPlugins::RenderFadingEntities(CLinkList<AlphaObjectInfo> &list)
 {
 	CLink<AlphaObjectInfo> *node;
 	CSimpleModelInfo *mi;
-	for(node = m_alphaEntityList.tail.prev;
-	    node != &m_alphaEntityList.head;
-	    node = node->prev){
+	for(node = list.tail.prev; node != &list.head; node = node->prev){
 		CEntity *e = node->item.entity;
 		if(e->m_rwObject == nil)
 			continue;
 		mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex());
-#ifdef FIX_BUGS
 		if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
-#else
-		if(mi->m_noZwrite)
-#endif
 			RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
 
 		if(e->bDistanceFade){
@@ -163,29 +206,34 @@ CVisibilityPlugins::RenderFadingEntities(void)
 		}else
 			CRenderer::RenderOneNonRoad(e);
 
-#ifdef FIX_BUGS
 		if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
-#else
-		if(mi->m_noZwrite)
-#endif
 			RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
 	}
 }
 
+void
+CVisibilityPlugins::RenderFadingEntities(void)
+{
+	RenderFadingEntities(m_alphaEntityList);
+	RenderBoatAlphaAtomics();
+}
+
+void
+CVisibilityPlugins::RenderFadingUnderwaterEntities(void)
+{
+	RenderFadingEntities(m_alphaUnderwaterEntityList);
+}
+
 RpAtomic*
 CVisibilityPlugins::RenderWheelAtomicCB(RpAtomic *atomic)
 {
 	RpAtomic *lodatm;
-	RwMatrix *m;
-	RwV3d view;
 	float len;
 	CSimpleModelInfo *mi;
 
 	mi = GetAtomicModelInfo(atomic);
-	m = RwFrameGetLTM(RpAtomicGetFrame(atomic));
-	RwV3dSub(&view, RwMatrixGetPos(m), ms_pCameraPosn);
-	len = RwV3dLength(&view);
-	lodatm = mi->GetAtomicFromDistance(len);
+	len = Sqrt(DistToCameraSq);
+	lodatm = mi->GetAtomicFromDistance(len * TheCamera.LODDistMultiplier / TheCamera.GenerationDistMultiplier);
 	if(lodatm){
 		if(RpAtomicGetGeometry(lodatm) != RpAtomicGetGeometry(atomic))
 			RpAtomicSetGeometry(atomic, RpAtomicGetGeometry(lodatm), rpATOMICSAMEBOUNDINGSPHERE);
@@ -227,6 +275,24 @@ CVisibilityPlugins::RenderAlphaAtomic(RpAtomic *atomic, int alpha)
 }
 
 RpAtomic*
+CVisibilityPlugins::RenderWeaponCB(RpAtomic *atomic)
+{
+	RwMatrix *m;
+	RwV3d view;
+	float maxdist, distsq;
+	CSimpleModelInfo *mi;
+
+	mi = GetAtomicModelInfo(atomic);
+	m = RwFrameGetLTM(RpAtomicGetFrame(atomic));
+	RwV3dSub(&view, RwMatrixGetPos(m), ms_pCameraPosn);
+	maxdist = mi->GetLodDistance(0);
+	distsq = RwV3dDotProduct(&view, &view);
+	if(distsq < maxdist*maxdist)
+		AtomicDefaultRenderCallBack(atomic);
+	return atomic;
+}
+
+RpAtomic*
 CVisibilityPlugins::RenderFadingAtomic(RpAtomic *atomic, float camdist)
 {
 	RpAtomic *lodatm;
@@ -236,29 +302,30 @@ CVisibilityPlugins::RenderFadingAtomic(RpAtomic *atomic, float camdist)
 
 	mi = GetAtomicModelInfo(atomic);
 	lodatm = mi->GetAtomicFromDistance(camdist - FADE_DISTANCE);
-	if(mi->m_additive){
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+	if(mi->m_additive)
 		AtomicDefaultRenderCallBack(atomic);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	}else{
-		fadefactor = (mi->GetLargestLodDistance() - (camdist - FADE_DISTANCE))/FADE_DISTANCE;
-		if(fadefactor > 1.0f)
-			fadefactor = 1.0f;
-		alpha = mi->m_alpha * fadefactor;
-		if(alpha == 255)
-			AtomicDefaultRenderCallBack(atomic);
-		else{
-			RpGeometry *geo = RpAtomicGetGeometry(lodatm);
-			uint32 flags = RpGeometryGetFlags(geo);
-			RpGeometrySetFlags(geo, flags | rpGEOMETRYMODULATEMATERIALCOLOR);
-			RpGeometryForAllMaterials(geo, SetAlphaCB, (void*)alpha);
-			if(geo != RpAtomicGetGeometry(atomic))
-				RpAtomicSetGeometry(atomic, geo, rpATOMICSAMEBOUNDINGSPHERE); // originally 5 (mistake?)
-			AtomicDefaultRenderCallBack(atomic);
-			RpGeometryForAllMaterials(geo, SetAlphaCB, (void*)255);
-			RpGeometrySetFlags(geo, flags);
-		}
+
+	fadefactor = (mi->GetLargestLodDistance() - (camdist - FADE_DISTANCE))/FADE_DISTANCE;
+	if(fadefactor > 1.0f)
+		fadefactor = 1.0f;
+	alpha = mi->m_alpha * fadefactor;
+	if(alpha == 255)
+		AtomicDefaultRenderCallBack(atomic);
+	else{
+		RpGeometry *geo = RpAtomicGetGeometry(lodatm);
+		uint32 flags = RpGeometryGetFlags(geo);
+		RpGeometrySetFlags(geo, flags | rpGEOMETRYMODULATEMATERIALCOLOR);
+		RpGeometryForAllMaterials(geo, SetAlphaCB, (void*)alpha);
+		if(geo != RpAtomicGetGeometry(atomic))
+			RpAtomicSetGeometry(atomic, geo, rpATOMICSAMEBOUNDINGSPHERE); // originally 5 (mistake?)
+		AtomicDefaultRenderCallBack(atomic);
+		RpGeometryForAllMaterials(geo, SetAlphaCB, (void*)255);
+		RpGeometrySetFlags(geo, flags);
 	}
+
+	if(mi->m_additive)
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+
 	return atomic;
 }
 
@@ -268,17 +335,16 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleHiDetailCB(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_vehicleLod0Dist){
+	if(DistToCameraSq < ms_vehicleLod0Dist){
 		flags = GetAtomicId(atomic);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0){
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f){
 			dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 				RwFrameGetLTM(clumpframe), flags);
-			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*distsq < dot*dot))
+			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*DistToCameraSq < dot*dot))
 				return atomic;
 		}
 		AtomicDefaultRenderCallBack(atomic);
@@ -290,25 +356,24 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleHiDetailAlphaCB(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_vehicleLod0Dist){
+	if(DistToCameraSq < ms_vehicleLod0Dist){
 		flags = GetAtomicId(atomic);
 		dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 			RwFrameGetLTM(clumpframe), flags);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0)
-			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*distsq < dot*dot))
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f)
+			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*DistToCameraSq < dot*dot))
 				return atomic;
 
 		if(flags & ATOMIC_FLAG_DRAWLAST){
 			// sort before clump
-			if(!InsertAtomicIntoSortedList(atomic, distsq - 0.0001f))
+			if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq - 0.0001f))
 				AtomicDefaultRenderCallBack(atomic);
 		}else{
-			if(!InsertAtomicIntoSortedList(atomic, distsq + dot))
+			if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq + dot))
 				AtomicDefaultRenderCallBack(atomic);
 		}
 	}
@@ -319,14 +384,13 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleHiDetailCB_BigVehicle(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_bigVehicleLod0Dist){
+	if(DistToCameraSq < ms_bigVehicleLod0Dist){
 		flags = GetAtomicId(atomic);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0){
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f){
 			dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 				RwFrameGetLTM(clumpframe), flags);
 			if(dot > 0.0f)
@@ -341,20 +405,19 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleHiDetailAlphaCB_BigVehicle(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_bigVehicleLod0Dist){
+	if(DistToCameraSq < ms_bigVehicleLod0Dist){
 		flags = GetAtomicId(atomic);
 		dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 			RwFrameGetLTM(clumpframe), flags);
-		if(dot > 0.0f)
-			if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0)
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f)
+			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*DistToCameraSq < dot*dot))
 				return atomic;
 
-		if(!InsertAtomicIntoSortedList(atomic, distsq + dot))
+		if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq + dot))
 			AtomicDefaultRenderCallBack(atomic);
 	}
 	return atomic;
@@ -363,29 +426,36 @@ CVisibilityPlugins::RenderVehicleHiDetailAlphaCB_BigVehicle(RpAtomic *atomic)
 RpAtomic*
 CVisibilityPlugins::RenderVehicleHiDetailCB_Boat(RpAtomic *atomic)
 {
-	RwFrame *clumpframe;
-	float distsq;
-
-	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_bigVehicleLod1Dist)
+	if(DistToCameraSq < ms_bigVehicleLod1Dist)
 		AtomicDefaultRenderCallBack(atomic);
 	return atomic;
 }
 
 RpAtomic*
+CVisibilityPlugins::RenderVehicleHiDetailAlphaCB_Boat(RpAtomic *atomic)
+{
+	if(DistToCameraSq < ms_vehicleLod0Dist){
+		if(GetAtomicId(atomic) & ATOMIC_FLAG_DRAWLAST){
+			if(!InsertAtomicIntoBoatSortedList(atomic, DistToCameraSq))
+				AtomicDefaultRenderCallBack(atomic);
+		}else
+			AtomicDefaultRenderCallBack(atomic);
+	}
+	return atomic;
+}
+
+RpAtomic*
 CVisibilityPlugins::RenderVehicleLowDetailCB_BigVehicle(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq >= ms_bigVehicleLod0Dist &&
-	   distsq < ms_bigVehicleLod1Dist){
+	if(DistToCameraSq >= ms_bigVehicleLod0Dist &&
+	   DistToCameraSq < ms_bigVehicleLod1Dist){
 		flags = GetAtomicId(atomic);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0){
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f){
 			dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 				RwFrameGetLTM(clumpframe), flags);
 			if(dot > 0.0f)
@@ -400,21 +470,20 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleLowDetailAlphaCB_BigVehicle(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq >= ms_bigVehicleLod0Dist &&
-	   distsq < ms_bigVehicleLod1Dist){
+	if(DistToCameraSq >= ms_bigVehicleLod0Dist &&
+	   DistToCameraSq < ms_bigVehicleLod1Dist){
 		flags = GetAtomicId(atomic);
 		dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 			RwFrameGetLTM(clumpframe), flags);
 		if(dot > 0.0f)
-			if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0)
+			if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f)
 				return atomic;
 
-		if(!InsertAtomicIntoSortedList(atomic, distsq + dot))
+		if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq + dot))
 			AtomicDefaultRenderCallBack(atomic);
 	}
 	return atomic;
@@ -424,12 +493,10 @@ RpAtomic*
 CVisibilityPlugins::RenderVehicleReallyLowDetailCB(RpAtomic *atomic)
 {
 	RpClump *clump;
-	float dist;
 	int32 alpha;
 
 	clump = RpAtomicGetClump(atomic);
-	dist = GetDistanceSquaredFromCamera(RpClumpGetFrame(clump));
-	if(dist >= ms_vehicleLod0Dist){
+	if(DistToCameraSq >= ms_vehicleLod0Dist){
 		alpha = GetClumpAlpha(clump);
 		if(alpha == 255)
 			AtomicDefaultRenderCallBack(atomic);
@@ -443,12 +510,7 @@ CVisibilityPlugins::RenderVehicleReallyLowDetailCB(RpAtomic *atomic)
 RpAtomic*
 CVisibilityPlugins::RenderVehicleReallyLowDetailCB_BigVehicle(RpAtomic *atomic)
 {
-	RwFrame *clumpframe;
-	float distsq;
-
-	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq >= ms_bigVehicleLod1Dist)
+	if(DistToCameraSq >= ms_bigVehicleLod1Dist)
 		AtomicDefaultRenderCallBack(atomic);
 	return atomic;
 }
@@ -457,17 +519,16 @@ RpAtomic*
 CVisibilityPlugins::RenderTrainHiDetailCB(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_bigVehicleLod1Dist){
+	if(DistToCameraSq < ms_bigVehicleLod1Dist){
 		flags = GetAtomicId(atomic);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0){
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f){
 			dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 				RwFrameGetLTM(clumpframe), flags);
-			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*distsq < dot*dot))
+			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*DistToCameraSq < dot*dot))
 				return atomic;
 		}
 		AtomicDefaultRenderCallBack(atomic);
@@ -479,25 +540,24 @@ RpAtomic*
 CVisibilityPlugins::RenderTrainHiDetailAlphaCB(RpAtomic *atomic)
 {
 	RwFrame *clumpframe;
-	float distsq, dot;
+	float dot;
 	uint32 flags;
 
 	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
-	distsq = GetDistanceSquaredFromCamera(clumpframe);
-	if(distsq < ms_bigVehicleLod1Dist){
+	if(DistToCameraSq < ms_bigVehicleLod1Dist){
 		flags = GetAtomicId(atomic);
 		dot = GetDotProductWithCameraVector(RwFrameGetLTM(RpAtomicGetFrame(atomic)),
 			RwFrameGetLTM(clumpframe), flags);
-		if(distsq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0)
-			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*distsq < dot*dot))
+		if(DistToCameraSq > ms_cullCompsDist && (flags & ATOMIC_FLAG_NOCULL) == 0 && PitchToCamera < 0.2f)
+			if(dot > 0.0f && ((flags & ATOMIC_FLAG_ANGLECULL) || 0.1f*DistToCameraSq < dot*dot))
 				return atomic;
 
 		if(flags & ATOMIC_FLAG_DRAWLAST){
 			// sort before clump
-			if(!InsertAtomicIntoSortedList(atomic, distsq - 0.0001f))
+			if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq - 0.0001f))
 				AtomicDefaultRenderCallBack(atomic);
 		}else{
-			if(!InsertAtomicIntoSortedList(atomic, distsq + dot))
+			if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq + dot))
 				AtomicDefaultRenderCallBack(atomic);
 		}
 	}
@@ -505,54 +565,49 @@ CVisibilityPlugins::RenderTrainHiDetailAlphaCB(RpAtomic *atomic)
 }
 
 RpAtomic*
-CVisibilityPlugins::RenderPlayerCB(RpAtomic *atomic)
+CVisibilityPlugins::RenderVehicleRotorAlphaCB(RpAtomic *atomic)
 {
-	if(CWorld::Players[0].m_pSkinTexture)
-		RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), SetTextureCB, CWorld::Players[0].m_pSkinTexture);
-	AtomicDefaultRenderCallBack(atomic);
+	RwFrame *clumpframe;
+	float dot;
+	RwV3d cam2atm;
+
+	clumpframe = RpClumpGetFrame(RpAtomicGetClump(atomic));
+	if(DistToCameraSq < ms_bigVehicleLod1Dist){
+		RwV3dSub(&cam2atm, &RwFrameGetLTM(RpAtomicGetFrame(atomic))->pos, ms_pCameraPosn);
+		dot = RwV3dDotProduct(&cam2atm, &RwFrameGetLTM(clumpframe)->at);
+		if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq + dot*20.0f))
+			AtomicDefaultRenderCallBack(atomic);
+	}
 	return atomic;
 }
 
 RpAtomic*
-CVisibilityPlugins::RenderPedLowDetailCB(RpAtomic *atomic)
+CVisibilityPlugins::RenderVehicleTailRotorAlphaCB(RpAtomic *atomic)
 {
-	RpClump *clump;
-	float dist;
-	int32 alpha;
+	RwMatrix *clumpMat, *atmMat;
+	float dot;
+	RwV3d cam2atm;
 
-	clump = RpAtomicGetClump(atomic);
-	dist = GetDistanceSquaredFromCamera(RpClumpGetFrame(clump));
-	if(dist >= ms_pedLod0Dist){
-		alpha = GetClumpAlpha(clump);
-		if(alpha == 255)
+	if(DistToCameraSq < ms_bigVehicleLod0Dist){
+		atmMat = RwFrameGetLTM(RpAtomicGetFrame(atomic));
+		clumpMat = RwFrameGetLTM(RpClumpGetFrame(RpAtomicGetClump(atomic)));
+		RwV3dSub(&cam2atm, &atmMat->pos, ms_pCameraPosn);
+		dot = RwV3dDotProduct(&cam2atm, &clumpMat->up) + RwV3dDotProduct(&cam2atm, &clumpMat->right);
+		if(!InsertAtomicIntoSortedList(atomic, DistToCameraSq - dot))
 			AtomicDefaultRenderCallBack(atomic);
-		else
-			RenderAlphaAtomic(atomic, alpha);
 	}
 	return atomic;
 }
 
 RpAtomic*
-CVisibilityPlugins::RenderPedHiDetailCB(RpAtomic *atomic)
+CVisibilityPlugins::RenderPlayerCB(RpAtomic *atomic)
 {
-	RpClump *clump;
-	float dist;
-	int32 alpha;
-
-	clump = RpAtomicGetClump(atomic);
-	dist = GetDistanceSquaredFromCamera(RpClumpGetFrame(clump));
-	if(dist < ms_pedLod0Dist){
-		alpha = GetClumpAlpha(clump);
-		if(alpha == 255)
-			AtomicDefaultRenderCallBack(atomic);
-		else
-			RenderAlphaAtomic(atomic, alpha);
-	}
+	if(CWorld::Players[0].m_pSkinTexture)
+		RpGeometryForAllMaterials(RpAtomicGetGeometry(atomic), SetTextureCB, CWorld::Players[0].m_pSkinTexture);
+	AtomicDefaultRenderCallBack(atomic);
 	return atomic;
 }
 
-// This is needed for peds with only one clump, i.e. skinned models
-// strangely even the xbox version has no such thing
 RpAtomic*
 CVisibilityPlugins::RenderPedCB(RpAtomic *atomic)
 {
@@ -627,16 +682,6 @@ CVisibilityPlugins::DefaultVisibilityCB(RpClump *clump)
 }
 
 bool
-CVisibilityPlugins::MloVisibilityCB(RpClump *clump)
-{
-	RwFrame *frame = RpClumpGetFrame(clump);
-	CMloModelInfo *modelInfo = (CMloModelInfo*)GetFrameHierarchyId(frame);
-	if (sq(modelInfo->field_34) < GetDistanceSquaredFromCamera(frame))
-		return false;
-	return CVisibilityPlugins::FrustumSphereCB(clump);
-}
-
-bool
 CVisibilityPlugins::FrustumSphereCB(RpClump *clump)
 {
 	RwSphere sphere;
@@ -730,13 +775,6 @@ CVisibilityPlugins::SetAtomicModelInfo(RpAtomic *atomic,
 {
 	AtomicExt *ext = ATOMICEXT(atomic);
 	ext->modelInfo = modelInfo;
-	switch (modelInfo->GetModelType()) {
-		case MITYPE_SIMPLE:
-		case MITYPE_TIME:
-			if(modelInfo->m_normalCull)
-				SetAtomicRenderCallback(atomic, RenderObjNormalAtomic);
-		default: break;
-	}
 }
 
 CSimpleModelInfo*
diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h
index b367d7ee..89583432 100644
--- a/src/rw/VisibilityPlugins.h
+++ b/src/rw/VisibilityPlugins.h
@@ -21,7 +21,9 @@ public:
 	};
 
 	static CLinkList<AlphaObjectInfo> m_alphaList;
+	static CLinkList<AlphaObjectInfo> m_alphaBoatAtomicList;
 	static CLinkList<AlphaObjectInfo> m_alphaEntityList;
+	static CLinkList<AlphaObjectInfo> m_alphaUnderwaterEntityList;
 	static RwCamera *ms_pCamera;
 	static RwV3d *ms_pCameraPosn;
 	static float ms_cullCompsDist;
@@ -30,7 +32,6 @@ public:
 	static float ms_vehicleFadeDist;
 	static float ms_bigVehicleLod0Dist;
 	static float ms_bigVehicleLod1Dist;
-	static float ms_pedLod0Dist;
 	static float ms_pedLod1Dist;
 	static float ms_pedFadeDist;
 
@@ -40,12 +41,15 @@ public:
 	static bool InsertEntityIntoSortedList(CEntity *e, float dist);
 	static void InitAlphaAtomicList(void);
 	static bool InsertAtomicIntoSortedList(RpAtomic *a, float dist);
+	static bool InsertAtomicIntoBoatSortedList(RpAtomic *a, float dist);
 
 	static void SetRenderWareCamera(RwCamera *camera);
+	static void SetupVehicleVariables(RpClump *vehicle);
 
 	static RpAtomic *RenderWheelAtomicCB(RpAtomic *atomic);
 	static RpAtomic *RenderObjNormalAtomic(RpAtomic *atomic);
 	static RpAtomic *RenderAlphaAtomic(RpAtomic *atomic, int alpha);
+	static RpAtomic *RenderWeaponCB(RpAtomic *atomic);
 	static RpAtomic *RenderFadingAtomic(RpAtomic *atm, float dist);
 
 	static RpAtomic *RenderVehicleHiDetailCB(RpAtomic *atomic);
@@ -53,25 +57,29 @@ public:
 	static RpAtomic *RenderVehicleHiDetailCB_BigVehicle(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleHiDetailAlphaCB_BigVehicle(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleHiDetailCB_Boat(RpAtomic *atomic);
+	static RpAtomic *RenderVehicleHiDetailAlphaCB_Boat(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleLowDetailCB_BigVehicle(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleLowDetailAlphaCB_BigVehicle(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleReallyLowDetailCB(RpAtomic *atomic);
 	static RpAtomic *RenderVehicleReallyLowDetailCB_BigVehicle(RpAtomic *atomic);
 	static RpAtomic *RenderTrainHiDetailCB(RpAtomic *atomic);
 	static RpAtomic *RenderTrainHiDetailAlphaCB(RpAtomic *atomic);
+	static RpAtomic *RenderVehicleRotorAlphaCB(RpAtomic *atomic);
+	static RpAtomic *RenderVehicleTailRotorAlphaCB(RpAtomic *atomic);
 
 	static RpAtomic *RenderPlayerCB(RpAtomic *atomic);
-	static RpAtomic *RenderPedLowDetailCB(RpAtomic *atomic);
-	static RpAtomic *RenderPedHiDetailCB(RpAtomic *atomic);
 	static RpAtomic *RenderPedCB(RpAtomic *atomic);	// for skinned models with only one clump
 
+	static void RenderAtomicList(CLinkList<AlphaObjectInfo> &list);
 	static void RenderAlphaAtomics(void);
+	static void RenderBoatAlphaAtomics(void);
+	static void RenderFadingEntities(CLinkList<AlphaObjectInfo> &list);
 	static void RenderFadingEntities(void);
+	static void RenderFadingUnderwaterEntities(void);
 
 	// All actually unused
 	static bool DefaultVisibilityCB(RpClump *clump);
 	static bool FrustumSphereCB(RpClump *clump);
-	static bool MloVisibilityCB(RpClump *clump);
 	static bool VehicleVisibilityCB(RpClump *clump);
 	static bool VehicleVisibilityCB_BigVehicle(RpClump *clump);
 
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index eff0f2ff..0f583221 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -29,6 +29,7 @@
 #include "Radar.h"
 #include "Restart.h"
 #include "Script.h"
+#include "SetPieces.h"
 #include "Stats.h"
 #include "Streaming.h"
 #include "Timer.h"
@@ -88,6 +89,7 @@ do {\
 
 #define WriteSaveDataBlock(save_func)\
 do {\
+	size = 0;\
 	buf = work_buff;\
 	reserved = 0;\
 	MakeSpaceForSizeInBufferPointer(presize, buf, postsize);\
@@ -201,6 +203,7 @@ GenericSave(int file)
 	// Save the rest
 	WriteSaveDataBlock(CPools::SavePedPool);
 	WriteSaveDataBlock(CGarages::Save);
+	WriteSaveDataBlock(CGameLogic::Save);
 	WriteSaveDataBlock(CPools::SaveVehiclePool);
 	WriteSaveDataBlock(CPools::SaveObjectPool);
 	WriteSaveDataBlock(ThePaths.Save);
@@ -216,6 +219,7 @@ GenericSave(int file)
 	WriteSaveDataBlock(cAudioScriptObject::SaveAllAudioScriptObjects);
 	WriteSaveDataBlock(CWorld::Players[CWorld::PlayerInFocus].SavePlayerInfo);
 	WriteSaveDataBlock(CStats::SaveStats);
+	WriteSaveDataBlock(CSetPieces::Save);
 	WriteSaveDataBlock(CStreaming::MemoryCardSave);
 	WriteSaveDataBlock(CPedType::Save);
 
@@ -325,6 +329,8 @@ GenericLoad()
 	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading Garages \n", CGarages::Load);
 	LoadSaveDataBlock();
+	ReadDataFromBlock("Loading GameLogic \n", CGameLogic::Load);
+	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading Vehicles \n", CPools::LoadVehiclePool);
 	LoadSaveDataBlock();
 	CProjectileInfo::RemoveAllProjectiles();
@@ -358,12 +364,14 @@ GenericLoad()
 	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading Stats \n", CStats::LoadStats);
 	LoadSaveDataBlock();
+	ReadDataFromBlock("Loading Set Pieces \n", CSetPieces::Load);
+	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading Streaming Stuff \n", CStreaming::MemoryCardLoad);
 	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading PedType Stuff \n", CPedType::Load);
 
-	DMAudio.SetMusicMasterVolume(CMenuManager::m_PrefsMusicVolume);
-	DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
+	DMAudio.SetMusicMasterVolume(FrontEndMenuManager.m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
 	if (!CloseFile(file)) {
 		PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE;
 		return false;
@@ -564,11 +572,6 @@ RestoreForStartLoad()
 		ReadDataFromBufferPointer(_buf, TheCamera.GetMatrix().GetPosition().z);
 		CStreaming::RemoveUnusedBigBuildings(CGame::currLevel);
 		CStreaming::RemoveUnusedBuildings(CGame::currLevel);
-		CCollision::SortOutCollisionAfterLoad();
-		CStreaming::RequestBigBuildings(CGame::currLevel);
-		CStreaming::LoadAllRequestedModels(false);
-		CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel);
-		CGame::TidyUpMemory(true, false);
 
 		if (CloseFile(file)) {
 			return true;
diff --git a/src/save/GenericGameStorage.h b/src/save/GenericGameStorage.h
index ee8a52a1..069ba7cd 100644
--- a/src/save/GenericGameStorage.h
+++ b/src/save/GenericGameStorage.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Game.h"
 #include "PCSave.h"
 
 #define SLOT_COUNT (8)
diff --git a/src/save/PCSave.cpp b/src/save/PCSave.cpp
index 3103c7ab..da8134fc 100644
--- a/src/save/PCSave.cpp
+++ b/src/save/PCSave.cpp
@@ -33,7 +33,7 @@ C_PcSave::DeleteSlot(int32 slot)
 	return true;
 }
 
-bool
+int8
 C_PcSave::SaveSlot(int32 slot)
 {
 	MakeValidSaveName(slot);
@@ -48,10 +48,10 @@ C_PcSave::SaveSlot(int32 slot)
 		if (GenericSave(file)) {
 			if (!!CFileMgr::CloseFile(file))
 				nErrorCode = SAVESTATUS_ERR_SAVE_CLOSE;
-			return true;
+			return 0;
 		}
 
-		return false;
+		return 2;
 	}
 	PcSaveHelper.nErrorCode = SAVESTATUS_ERR_SAVE_CREATE;
 	return false;
diff --git a/src/save/PCSave.h b/src/save/PCSave.h
index 4a2d9a66..2e85867a 100644
--- a/src/save/PCSave.h
+++ b/src/save/PCSave.h
@@ -32,7 +32,7 @@ public:
 	C_PcSave() : nErrorCode(SAVESTATUS_SUCCESSFUL) {}
 	void PopulateSlotInfo();
 	bool DeleteSlot(int32 slot);
-	bool SaveSlot(int32 slot);
+	int8 SaveSlot(int32 slot);
 	bool PcClassSaveRoutine(int32 a2, uint8 *data, uint32 size);
 	static void SetSaveDirectory(const char *path);
 };
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 3ef0ab63..a7194c0c 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -176,7 +176,7 @@ psCameraBeginUpdate(RwCamera *camera)
 void
 psCameraShowRaster(RwCamera *camera)
 {
-	if (CMenuManager::m_PrefsVsync)
+	if (FrontEndMenuManager.m_PrefsVsync)
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
 	else
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
@@ -944,7 +944,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_GERMAN )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::germanGame = true;
 	}
 	
@@ -953,7 +953,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_FRENCH )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::frenchGame = true;
 	}
 	
@@ -964,7 +964,7 @@ void InitialiseLanguage()
 
 #ifdef NASTY_GAME
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	CGame::noProstitutes = false;
 #endif
 	
@@ -999,33 +999,33 @@ void InitialiseLanguage()
 		}
 	}
 	
-	CMenuManager::OS_Language = primUserLCID;
+	FrontEndMenuManager.OS_Language = primUserLCID;
 
 	switch ( lang )
 	{
 		case LANG_GERMAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 			break;
 		}
 		case LANG_SPANISH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 			break;
 		}
 		case LANG_FRENCH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 			break;
 		}
 		case LANG_ITALIAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 			break;
 		}
 		default:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 			break;
 		}
 	}
@@ -1486,7 +1486,7 @@ main(int argc, char *argv[])
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
-						CMenuManager::m_bStartUpFrontEndRequested = true;
+						FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
 						
 						if ( defaultFullscreenRes )
 						{
@@ -1535,7 +1535,7 @@ main(int argc, char *argv[])
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if ( RwInitialised )
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsIDLE, (void *)TRUE);
 						}
 						break;
@@ -1546,7 +1546,7 @@ main(int argc, char *argv[])
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if (RwInitialised)
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
 						}
 						break;
@@ -1768,5 +1768,9 @@ int strcasecmp(const char* str1, const char* str2)
 {
 	return _strcmpi(str1, str2);
 }
+int strncasecmp(const char *str1, const char *str2, size_t len)
+{
+	return _strnicmp(str1, str2, len);
+}
 #endif
 #endif
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index 8191107e..073155d6 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -390,7 +390,7 @@ RsInitialize(void)
 	 */
 	RwBool              result;
 
-	RsGlobal.appName = RWSTRING("GTA3");
+	RsGlobal.appName = RWSTRING("GTA: Vice City");
 	RsGlobal.maximumWidth = DEFAULT_SCREEN_WIDTH;
 	RsGlobal.maximumHeight = DEFAULT_SCREEN_HEIGHT;
 	RsGlobal.width = DEFAULT_SCREEN_WIDTH;
diff --git a/src/skel/win/gta3.ico b/src/skel/win/gta3.ico
deleted file mode 100644
index 2017c811..00000000
--- a/src/skel/win/gta3.ico
+++ /dev/null
diff --git a/src/skel/win/gtavc.ico b/src/skel/win/gtavc.ico
new file mode 100644
index 00000000..d253ff2c
--- /dev/null
+++ b/src/skel/win/gtavc.ico
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 83860f04..7de58d87 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -221,7 +221,7 @@ psCameraBeginUpdate(RwCamera *camera)
 void
 psCameraShowRaster(RwCamera *camera)
 {
-	if (CMenuManager::m_PrefsVsync)
+	if (FrontEndMenuManager.m_PrefsVsync)
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
 	else
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
@@ -1222,6 +1222,16 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 			break;
 		}
 
+#ifdef FIX_BUGS // game turns on menu when focus is re-gained rather than lost
+		case WM_KILLFOCUS:
+#else
+		case WM_SETFOCUS:
+#endif
+		{
+			CGame::InitAfterFocusLoss();
+			break;
+		}
+
 	}
 
 	/*
@@ -1654,7 +1664,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_GERMAN )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::germanGame = true;
 	}
 	
@@ -1663,7 +1673,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_FRENCH )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::frenchGame = true;
 	}
 	
@@ -1674,7 +1684,7 @@ void InitialiseLanguage()
 
 #ifdef NASTY_GAME
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	CGame::noProstitutes = false;
 #endif
 	
@@ -1709,33 +1719,33 @@ void InitialiseLanguage()
 		}
 	}
 	
-	CMenuManager::OS_Language = primUserLCID;
+	FrontEndMenuManager.OS_Language = primUserLCID;
 
 	switch ( lang )
 	{
 		case LANG_GERMAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 			break;
 		}
 		case LANG_SPANISH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 			break;
 		}
 		case LANG_FRENCH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 			break;
 		}
 		case LANG_ITALIAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 			break;
 		}
 		default:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 			break;
 		}
 	}
@@ -1884,13 +1894,11 @@ WinMain(HINSTANCE instance,
 	StaticPatcher::Apply();
 	SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
 
-/*
 	// TODO: make this an option somewhere
 	AllocConsole();
 	freopen("CONIN$", "r", stdin);
 	freopen("CONOUT$", "w", stdout);
 	freopen("CONOUT$", "w", stderr);
-*/
 
 	/* 
 	 * Initialize the platform independent data.
@@ -2130,7 +2138,7 @@ WinMain(HINSTANCE instance,
 						
 						CoUninitialize();
 						
-						if ( CMenuManager::OS_Language == LANG_FRENCH || CMenuManager::OS_Language == LANG_GERMAN )
+						if ( FrontEndMenuManager.OS_Language == LANG_FRENCH || FrontEndMenuManager.OS_Language == LANG_GERMAN )
 							PlayMovieInWindow(cmdShow, "movies\\GTAtitlesGER.mpg");
 						else
 							PlayMovieInWindow(cmdShow, "movies\\GTAtitles.mpg");
@@ -2181,7 +2189,7 @@ WinMain(HINSTANCE instance,
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
-						CMenuManager::m_bStartUpFrontEndRequested = true;
+						FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
 						
 						if ( defaultFullscreenRes )
 						{
@@ -2232,7 +2240,7 @@ WinMain(HINSTANCE instance,
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if ( RwInitialised )
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsIDLE, (void *)TRUE);
 						}
 						break;
@@ -2243,7 +2251,7 @@ WinMain(HINSTANCE instance,
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if (RwInitialised)
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
 						}
 						break;
@@ -3152,5 +3160,9 @@ int strcasecmp(const char *str1, const char *str2)
 {
 	return _strcmpi(str1, str2);
 }
+int strncasecmp(const char *str1, const char *str2, size_t len)
+{
+	return _strnicmp(str1, str2, len);
+}
 #endif
 #endif
\ No newline at end of file
diff --git a/src/skel/win/win.rc b/src/skel/win/win.rc
index 379c473d..9b5aa305 100644
--- a/src/skel/win/win.rc
+++ b/src/skel/win/win.rc
@@ -42,6 +42,6 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MAIN_ICON           ICON    DISCARDABLE     "gta3.ico"
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gtavc.ico"
 
 /////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 1e58fcd1..e092627e 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -7,30 +7,39 @@
 #include "Frontend.h"
 #include "Messages.h"
 #include "Text.h"
+#include "Timer.h"
 
 static wchar WideErrorString[25];
 
 CText TheText;
 
+//--MIAMI: DONE
 CText::CText(void)
 {
 	encoding = 'e';
+	bHasMissionTextOffsets = false;
+	bIsMissionTextLoaded = false;
+	memset(szMissionTableName, 0, sizeof(szMissionTableName));
 	memset(WideErrorString, 0, sizeof(WideErrorString));
 }
 
+//--MIAMI: DONE
 void
 CText::Load(void)
 {
-	uint8 *filedata;
-	char filename[32], type[4];
-	int length;
-	int offset, sectlen;
+	char filename[32];
+	uint32 offset;
+	int file;
+	bool tkey_loaded = false, tdat_loaded = false;
+	ChunkHeader m_ChunkHeader;
+
+	bIsMissionTextLoaded = false;
+	bHasMissionTextOffsets = false;
 
 	Unload();
-	filedata = new uint8[0x40000];
 
 	CFileMgr::SetDir("TEXT");
-	switch(CMenuManager::m_PrefsLanguage){
+	switch(FrontEndMenuManager.m_PrefsLanguage){
 	case LANGUAGE_AMERICAN:
 		sprintf(filename, "AMERICAN.GXT");
 		break;
@@ -59,49 +68,64 @@ CText::Load(void)
 #endif
 	}
 
-	length = CFileMgr::LoadFile(filename, filedata, 0x40000, "rb");
-	CFileMgr::SetDir("");
+	file = CFileMgr::OpenFile(filename, "rb");
 
 	offset = 0;
-	while(offset < length){
-		type[0] = filedata[offset++];
-		type[1] = filedata[offset++];
-		type[2] = filedata[offset++];
-		type[3] = filedata[offset++];
-		sectlen = (int)filedata[offset+3]<<24 | (int)filedata[offset+2]<<16 |
-			(int)filedata[offset+1]<<8 | (int)filedata[offset+0];
-		offset += 4;
-		if(sectlen != 0){
-			if(strncmp(type, "TKEY", 4) == 0)
-				keyArray.Load(sectlen, filedata, &offset);
-			else if(strncmp(type, "TDAT", 4) == 0)
-				data.Load(sectlen, filedata, &offset);
-			else
-				offset += sectlen;
+	while (!tkey_loaded || !tdat_loaded) {
+		ReadChunkHeader(&m_ChunkHeader, file, &offset);
+		if (m_ChunkHeader.size != 0) {
+			if (strncmp(m_ChunkHeader.magic, "TABL", 4) == 0) {
+				MissionTextOffsets.Load(m_ChunkHeader.size, file, &offset, 0x58000);
+				bHasMissionTextOffsets = true;
+			} else if (strncmp(m_ChunkHeader.magic, "TKEY", 4) == 0) {
+				this->keyArray.Load(m_ChunkHeader.size, file, &offset);
+				tkey_loaded = true;
+			} else if (strncmp(m_ChunkHeader.magic, "TDAT", 4) == 0) {
+				this->data.Load(m_ChunkHeader.size, file, &offset);
+				tdat_loaded = true;
+			} else {
+				CFileMgr::Seek(file, m_ChunkHeader.size, SEEK_CUR);
+				offset += m_ChunkHeader.size;
+			}
 		}
 	}
 
 	keyArray.Update(data.chars);
-
-	delete[] filedata;
+	CFileMgr::CloseFile(file);
+	CFileMgr::SetDir("");
 }
 
+//--MIAMI: DONE
 void
 CText::Unload(void)
 {
 	CMessages::ClearAllMessagesDisplayedByGame();
-	data.Unload();
 	keyArray.Unload();
+	data.Unload();
+	mission_keyArray.Unload();
+	mission_data.Unload();
+	bIsMissionTextLoaded = false;
+	memset(szMissionTableName, 0, sizeof(szMissionTableName));
 }
 
+//--MIAMI: DONE
 wchar*
 CText::Get(const char *key)
 {
+	uint8 result = false;
+#ifdef FIX_BUGS
+	wchar *outstr = keyArray.Search(key, data.chars, &result);
+#else
+	wchar *outstr = keyArray.Search(key, &result);
+#endif
+
+	if (!result && bHasMissionTextOffsets && bIsMissionTextLoaded)
 #ifdef FIX_BUGS
-	return keyArray.Search(key, data.chars);
+		outstr = mission_keyArray.Search(key, mission_data.chars, &result);
 #else
-	return keyArray.Search(key);
+		outstr = mission_keyArray.Search(key, &result);
 #endif
+	return outstr;
 }
 
 wchar UpperCaseTable[128] = {
@@ -134,6 +158,7 @@ wchar FrenchUpperCaseTable[128] = {
 	253, 254, 255
 };
 
+//--MIAMI: TODO (check tables)
 wchar
 CText::GetUpperCase(wchar c)
 {
@@ -165,6 +190,7 @@ CText::GetUpperCase(wchar c)
 	return c;
 }
 
+//--MIAMI: DONE
 void
 CText::UpperCase(wchar *s)
 {
@@ -174,21 +200,131 @@ CText::UpperCase(wchar *s)
 	}
 }
 
+//--MIAMI: DONE
+void
+CText::GetNameOfLoadedMissionText(char *outName)
+{
+	strcpy(outName, szMissionTableName);
+}
+
+//--MIAMI: DONE
+void
+CText::ReadChunkHeader(ChunkHeader *buf, int32 file, uint32 *offset)
+{
+	// original code loops 8 times to read 1 byte with CFileMgr::Read, that's retarded
+	CFileMgr::Read(file, (char*)buf, sizeof(ChunkHeader));
+	*offset += sizeof(ChunkHeader);
+}
+
+//--MIAMI: DONE
+void
+CText::LoadMissionText(char *MissionTableName)
+{
+	char filename[32];
+
+	mission_keyArray.Unload();
+	mission_data.Unload();
+
+	bool search_result = false;
+	int missionTableId = 0;
+
+	for (missionTableId = 0; missionTableId < MissionTextOffsets.size; missionTableId++) {
+		if (strncmp(MissionTextOffsets.data[missionTableId].szMissionName, MissionTableName, strlen(MissionTextOffsets.data[missionTableId].szMissionName)) == 0) {
+			search_result = true;
+			break;
+		}
+	}
+
+	if (!search_result) {
+		printf("CText::LoadMissionText - couldn't find %s", MissionTableName);
+		return;
+	}
+
+	CFileMgr::SetDir("TEXT");
+	switch (FrontEndMenuManager.m_PrefsLanguage) {
+	case LANGUAGE_AMERICAN:
+		sprintf(filename, "AMERICAN.GXT");
+		break;
+	case LANGUAGE_FRENCH:
+		sprintf(filename, "FRENCH.GXT");
+		break;
+	case LANGUAGE_GERMAN:
+		sprintf(filename, "GERMAN.GXT");
+		break;
+	case LANGUAGE_ITALIAN:
+		sprintf(filename, "ITALIAN.GXT");
+		break;
+	case LANGUAGE_SPANISH:
+		sprintf(filename, "SPANISH.GXT");
+		break;
+#ifdef MORE_LANGUAGES
+	case LANGUAGE_POLISH:
+		sprintf(filename, "POLISH.GXT");
+		break;
+	case LANGUAGE_RUSSIAN:
+		sprintf(filename, "RUSSIAN.GXT");
+		break;
+	case LANGUAGE_JAPANESE:
+		sprintf(filename, "JAPANESE.GXT");
+		break;
+#endif
+	}
+	CTimer::Suspend();
+	int file = CFileMgr::OpenFile(filename, "rb");
+	CFileMgr::Seek(file, MissionTextOffsets.data[missionTableId].offset, SEEK_SET);
+
+	char TableCheck[8];
+	CFileMgr::Read(file, TableCheck, 8);
+	if (strncmp(TableCheck, MissionTableName, 8) != 0)
+		printf("CText::LoadMissionText - expected to find %s in the text file", MissionTableName);
+
+	bool tkey_loaded = false, tdat_loaded = false;
+	ChunkHeader m_ChunkHeader;
+	while (!tkey_loaded || !tdat_loaded) {
+		uint32 bytes_read = 0;
+		ReadChunkHeader(&m_ChunkHeader, file, &bytes_read);
+		if (m_ChunkHeader.size != 0) {
+			if (strncmp(m_ChunkHeader.magic, "TKEY", 4) == 0) {
+				uint32 bytes_read = 0;
+				mission_keyArray.Load(m_ChunkHeader.size, file, &bytes_read);
+				tkey_loaded = true;
+			} else if (strncmp(m_ChunkHeader.magic, "TDAT", 4) == 0) {
+				uint32 bytes_read = 0;
+				mission_data.Load(m_ChunkHeader.size, file, &bytes_read);
+				tdat_loaded = true;
+			} else
+				CFileMgr::Seek(file, m_ChunkHeader.size, SEEK_CUR);
+		}
+	}
+
+	mission_keyArray.Update(mission_data.chars);
+	CFileMgr::CloseFile(file);
+	CTimer::Resume();
+	CFileMgr::SetDir("");
+	strcpy(szMissionTableName, MissionTableName);
+	bIsMissionTextLoaded = true;
+}
+
 
+//--MIAMI: DONE
 void
-CKeyArray::Load(uint32 length, uint8 *data, int *offset)
+CKeyArray::Load(uint32 length, int file, uint32 *offset)
 {
-	uint32 i;
-	uint8 *rawbytes;
+	char *rawbytes;
 
 	numEntries = length / sizeof(CKeyEntry);
 	entries = new CKeyEntry[numEntries];
-	rawbytes = (uint8*)entries;
+	rawbytes = (char*)entries;
 
-	for(i = 0; i < length; i++)
-		rawbytes[i] = data[(*offset)++];
+#if DUMB
+	for (uint32 i = 0; i < length; i++)
+		CFileMgr::Read(file, &rawbytes[i], 1);
+#else
+	CFileMgr::Read(file, rawbytes, length);
+#endif
 }
 
+//--MIAMI: DONE
 void
 CKeyArray::Unload(void)
 {
@@ -197,6 +333,7 @@ CKeyArray::Unload(void)
 	numEntries = 0;
 }
 
+//--MIAMI: DONE
 void
 CKeyArray::Update(wchar *chars)
 {
@@ -207,6 +344,7 @@ CKeyArray::Update(wchar *chars)
 #endif
 }
 
+//--MIAMI: DONE
 CKeyEntry*
 CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high)
 {
@@ -227,11 +365,12 @@ CKeyArray::BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 hi
 	return nil;
 }
 
+//--MIAMI: DONE
 wchar*
 #ifdef FIX_BUGS
-CKeyArray::Search(const char *key, wchar *data)
+CKeyArray::Search(const char *key, wchar *data, uint8 *result)
 #else
-CKeyArray::Search(const char *key)
+CKeyArray::Search(const char *key, uint8 *result)
 #endif
 {
 	CKeyEntry *found;
@@ -240,34 +379,47 @@ CKeyArray::Search(const char *key)
 
 #ifdef FIX_BUGS
 	found = BinarySearch(key, entries, 0, numEntries-1);
-	if(found)
+	if (found) {
+		*result = true;
 		return (wchar*)((uint8*)data + found->valueOffset);
+	}
 #else
 	found = BinarySearch(key, entries, 0, numEntries-1);
-	if(found)
+	if (found) {
+		*result = true;
 		return found->value;
+	}
 #endif
+	*result = false;
+#ifdef MASTER
+	sprintf(errstr, "%");
+#else
 	sprintf(errstr, "%s missing", key);
+#endif // MASTER
 	for(i = 0; i < 25; i++)
 		WideErrorString[i] = errstr[i];
 	return WideErrorString;
 }
 
-
+//--MIAMI: DONE
 void
-CData::Load(uint32 length, uint8 *data, int *offset)
+CData::Load(uint32 length, int file, uint32 *offset)
 {
-	uint32 i;
-	uint8 *rawbytes;
+	char *rawbytes;
 
 	numChars = length / sizeof(wchar);
 	chars = new wchar[numChars];
-	rawbytes = (uint8*)chars;
+	rawbytes = (char*)chars;
 
-	for(i = 0; i < length; i++)
-		rawbytes[i] = data[(*offset)++];
+#if DUMB
+	for(uint32 i = 0; i < length; i++)
+		CFileMgr::Read(file, &rawbytes[i], 1);
+#else
+	CFileMgr::Read(file, rawbytes, length);
+#endif
 }
 
+//--MIAMI: DONE
 void
 CData::Unload(void)
 {
@@ -276,6 +428,16 @@ CData::Unload(void)
 	numChars = 0;
 }
 
+//--MIAMI: DONE
+void
+CMissionTextOffsets::Load(uint32 table_size, int file, uint32 *offset, int)
+{
+	// not exact VC code but smaller and better :P
+	size = table_size / sizeof(CMissionTextOffsets::Entry);
+	CFileMgr::Read(file, (char*)data, sizeof(CMissionTextOffsets::Entry) * size);
+	*offset += sizeof(CMissionTextOffsets::Entry) * size;
+}
+
 void
 AsciiToUnicode(const char *src, wchar *dst)
 {
diff --git a/src/text/Text.h b/src/text/Text.h
index 18a904bc..dcffccbf 100644
--- a/src/text/Text.h
+++ b/src/text/Text.h
@@ -28,14 +28,14 @@ public:
 
 	CKeyArray(void) : entries(nil), numEntries(0) {}
 	~CKeyArray(void) { Unload(); }
-	void Load(uint32 length, uint8 *data, int *offset);
+	void Load(uint32 length, int file, uint32 *offset);
 	void Unload(void);
 	void Update(wchar *chars);
 	CKeyEntry *BinarySearch(const char *key, CKeyEntry *entries, int16 low, int16 high);
 #ifdef FIX_BUGS
-	wchar *Search(const char *key, wchar *data);
+	wchar *Search(const char *key, wchar *data, uint8 *result);
 #else
-	wchar *Search(const char *key);
+	wchar *Search(const char *key, uint8* result);
 #endif
 };
 
@@ -47,15 +47,45 @@ public:
 
 	CData(void) : chars(nil), numChars(0) {}
 	~CData(void) { Unload(); }
-	void Load(uint32 length, uint8 *data, int *offset);
+	void Load(uint32 length, int file, uint32 *offset);
 	void Unload(void);
 };
 
+class CMissionTextOffsets
+{
+public:
+	struct Entry
+	{
+		char szMissionName[8];
+		uint32 offset;
+	};
+
+	enum {MAX_MISSION_TEXTS = 90}; // beware that LCS has more
+
+	Entry data[MAX_MISSION_TEXTS];
+	uint16 size;
+
+	CMissionTextOffsets(void) : size(0) {}
+	void Load(uint32 table_size, int file, uint32* bytes_read, int);
+};
+
+struct ChunkHeader
+{
+	char magic[4];
+	int size;
+};
+
 class CText
 {
 	CKeyArray keyArray;
 	CData data;
+	CKeyArray mission_keyArray;
+	CData mission_data;
 	char encoding;
+	bool bHasMissionTextOffsets;
+	bool bIsMissionTextLoaded;
+	char szMissionTableName[8];
+	CMissionTextOffsets MissionTextOffsets;
 public:
 	CText(void);
 	void Load(void);
@@ -63,6 +93,9 @@ public:
 	wchar *Get(const char *key);
 	wchar GetUpperCase(wchar c);
 	void UpperCase(wchar *s);
+	void GetNameOfLoadedMissionText(char *outName);
+	void ReadChunkHeader(ChunkHeader *buf, int32 file, uint32 *bytes_read);
+	void LoadMissionText(char *MissionTableName);
 };
 
 extern CText TheText;
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index eb1bad97..71192d47 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -17,8 +17,10 @@
 #include "Explosion.h"
 #include "Particle.h"
 #include "ParticleObject.h"
+#include "Glass.h"
 #include "Antennas.h"
 #include "Skidmarks.h"
+#include "WindModifiers.h"
 #include "Shadows.h"
 #include "PointLights.h"
 #include "Coronas.h"
@@ -35,8 +37,10 @@
 #include "Population.h"
 #include "CarCtrl.h"
 #include "CarAI.h"
+#include "Stats.h"
 #include "Garages.h"
 #include "PathFind.h"
+#include "Replay.h"
 #include "AnimManager.h"
 #include "RpAnimBlend.h"
 #include "AnimBlendAssociation.h"
@@ -45,7 +49,9 @@
 #include "Object.h"
 #include "Automobile.h"
 
-bool bAllCarCheat;	// unused
+//--MIAMI: file done except TODOs
+
+bool bAllCarCheat;
 
 RwObject *GetCurrentAtomicObjectCB(RwObject *object, void *data);
 
@@ -67,7 +73,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
 	m_fFireBlowUpTimer = 0.0f;
-	m_auto_unk1 = 0;
+	m_doingBurnout = 0;
 	bTaxiLight = m_sAllTaxiLights;
 	bFixedColour = false;
 	bBigWheels = false;
@@ -75,7 +81,26 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 
 	SetModelIndex(id);
 
+	// Already done in CVehicle...
+	switch(GetModelIndex()){
+	case MI_HUNTER:
+	case MI_ANGEL:
+	case MI_FREEWAY:
+		m_nRadioStation = V_ROCK;
+		break;
+	case MI_RCBARON:
+	case MI_RCBANDIT:
+	case MI_RCRAIDER:
+	case MI_RCGOBLIN:
+	case MI_TOPFUN:
+	case MI_CADDY:
+	case MI_BAGGAGE:
+		m_nRadioStation = RADIO_OFF;
+		break;
+	}
+
 	pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
+	pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId);
 
 	m_auto_unused1 = 20.0f;
 	m_auto_unused2 = 0;
@@ -129,6 +154,8 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	m_fElasticity = 0.05f;
 	m_fBuoyancy = pHandling->fBuoyancy;
 
+	m_fOrientation = m_auto_unk4 = 0.0f;
+
 	m_nBusDoorTimerEnd = 0;
 	m_nBusDoorTimerStart = 0;
 
@@ -139,6 +166,9 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	m_fGasPedalAudio = 0.0f;
 	bNotDamagedUpsideDown = false;
 	bMoreResistantToDamage = false;
+	bTankDetonateCars = true;
+	bStuckInSand = false;
+	bHeliDestroyed = false;
 	m_fVelocityChangeForAudio = 0.0f;
 	m_hydraulicState = 0;
 
@@ -150,7 +180,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 		m_aWheelRotation[i] = 0.0f;
 		m_aWheelSpeed[i] = 0.0f;
 		m_aWheelState[i] = WHEEL_STATE_NORMAL;
-		m_aWheelSkidmarkMuddy[i] = false;
+		m_aWheelSkidmarkType[i] = SKIDMARK_NORMAL;
 		m_aWheelSkidmarkBloody[i] = false;
 	}
 
@@ -159,6 +189,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	m_nDriveWheelsOnGroundPrev = 0;
 	m_fHeightAboveRoad = 0.0f;
 	m_fTraction = 1.0f;
+	m_fTireTemperature = 1.0f;
 
 	CColModel *colModel = mi->GetColModel();
 	if(colModel->lines == nil){
@@ -173,10 +204,6 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 
 	m_nNumPassengers = 0;
 
-	m_bombType = CARBOMB_NONE;
-	bDriverLastFrame = false;
-	m_pBombRigger = nil;
-
 	if(m_nDoorLock == CARLOCK_UNLOCKED &&
 	   (id == MI_POLICE || id == MI_ENFORCER || id == MI_RHINO))
 		m_nDoorLock = CARLOCK_LOCKED_INITIALLY;
@@ -184,6 +211,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	m_fCarGunLR = 0.0f;
 	m_fCarGunUD = 0.05f;
 	m_fPropellerRotation = 0.0f;
+	m_fHeliOrientation = -1.0f;
 	m_weaponDoorTimerLeft = 0.0f;
 	m_weaponDoorTimerRight = m_weaponDoorTimerLeft;
 
@@ -194,7 +222,10 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 		CMatrix mat2(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LF]));
 		mat1.GetPosition() += CVector(mat2.GetPosition().x + 0.1f, 0.0f, mat2.GetPosition().z);
 		mat1.UpdateRW();
-	}else if(GetModelIndex() == MI_MIAMI_SPARROW || GetModelIndex() == MI_MIAMI_RCRAIDER){
+	}else if(GetModelIndex() == MI_HUNTER){
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]), 0);
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RB]), 0);
+	}else if(IsRealHeli()){
 		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]), 0);
 		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]), 0);
 		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]), 0);
@@ -205,7 +236,6 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	}
 }
 
-
 void
 CAutomobile::SetModelIndex(uint32 id)
 {
@@ -213,6 +243,11 @@ CAutomobile::SetModelIndex(uint32 id)
 	SetupModelNodes();
 }
 
+#define SAND_SLOWDOWN (0.01f)
+float CAR_BALANCE_MULT = 0.3f;
+CVector vecSeaSparrowGunPos(-0.5f, 2.4f, -0.785f);
+CVector vecHunterGunPos(0.0f, 4.8f, -1.3f);
+CVector vecHunterRocketPos(2.5f, 1.0f, -0.5f);
 CVector vecDAMAGE_ENGINE_POS_SMALL(-0.1f, -0.1f, 0.0f);
 CVector vecDAMAGE_ENGINE_POS_BIG(-0.5f, -0.3f, 0.0f);
 
@@ -227,12 +262,25 @@ CAutomobile::ProcessControl(void)
 		colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel;
 	else
 		colModel = GetColModel();
+	bool drivingInSand = false;
 	bWarnedPeds = false;
+	m_doingBurnout = 0;
+	bStuckInSand = false;
+	bRestingOnPhysical = false;
+
+	bool carHasNitro = bAllTaxisHaveNitro && GetStatus() == STATUS_PLAYER && IsTaxi();
 
-	// skip if the collision isn't for the current level
-	if(colModel->level > LEVEL_NONE && colModel->level != CCollision::ms_collisionInMemory)
+	if(CReplay::IsPlayingBack())
 		return;
 
+	UpdatePassengerList();
+
+	// Heli wind
+	if(IsRealHeli())
+		if((GetStatus() == STATUS_PLAYER || GetStatus() == STATUS_PHYSICS) && m_aWheelSpeed[1] > 0.075f ||
+		   GetStatus() == STATUS_SIMPLE)
+			CWindModifiers::RegisterOne(GetPosition(), 1);
+
 	// Improve grip of vehicles in certain cases
 	bool strongGrip1 = false;
 	bool strongGrip2 = false;
@@ -247,7 +295,8 @@ CAutomobile::ProcessControl(void)
 			else if((GetPosition() - FindPlayerCoors()).Magnitude() > 50.0f)
 				strongGrip2 = true;
 		}
-	}
+	}else if(GetModelIndex() == MI_RCBANDIT && GetStatus() != STATUS_PLAYER_REMOTE)
+		strongGrip1 = true;
 
 	if(bIsBus)
 		ProcessAutoBusDoors();
@@ -258,7 +307,7 @@ CAutomobile::ProcessControl(void)
 	if(GetStatus() != STATUS_ABANDONED && GetStatus() != STATUS_WRECKED &&
 	   GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PLAYER_DISABLED){
 		switch(GetModelIndex())
-		case MI_FBICAR:
+		case MI_FBIRANCH:
 		case MI_POLICE:
 		case MI_ENFORCER:
 		case MI_SECURICA:
@@ -268,25 +317,15 @@ CAutomobile::ProcessControl(void)
 	}
 
 	// Process driver
-	if(pDriver){
-		if(!bDriverLastFrame && m_bombType == CARBOMB_ONIGNITIONACTIVE){
-			// If someone enters the car and there is a bomb, detonate
-			m_nBombTimer = 1000;
-			m_pBlowUpEntity = m_pBombRigger;
-			if(m_pBlowUpEntity)
-				m_pBlowUpEntity->RegisterReference((CEntity**)&m_pBlowUpEntity);
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TICK, 1.0f);
-		}
-		bDriverLastFrame = true;
-
+	if(pDriver)
 		if(IsUpsideDown() && CanPedEnterCar()){
 			if(!pDriver->IsPlayer() &&
 			   !(pDriver->m_leader && pDriver->m_leader->bInVehicle) &&
 			   pDriver->CharCreatedBy != MISSION_CHAR)
 				pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
 		}
-	}else
-		bDriverLastFrame = false;
+
+	ActivateBombWhenEntered();
 
 	// Process passengers
 	if(m_nNumPassengers != 0 && IsUpsideDown() && CanPedEnterCar()){
@@ -300,18 +339,7 @@ CAutomobile::ProcessControl(void)
 
 	CRubbish::StirUp(this);
 
-	// blend in clump
-	int clumpAlpha = CVisibilityPlugins::GetClumpAlpha((RpClump*)m_rwObject);
-	if(bFadeOut){
-		clumpAlpha -= 8;
-		if(clumpAlpha < 0)
-			clumpAlpha = 0;
-	}else if(clumpAlpha < 255){
-		clumpAlpha += 16;
-		if(clumpAlpha > 255)
-			clumpAlpha = 255;
-	}
-	CVisibilityPlugins::SetClumpAlpha((RpClump*)m_rwObject, clumpAlpha);
+	UpdateClumpAlpha();
 
 	AutoPilot.m_bSlowedDownBecauseOfCars = false;
 	AutoPilot.m_bSlowedDownBecauseOfPeds = false;
@@ -322,24 +350,33 @@ CAutomobile::ProcessControl(void)
 	else if(pHandling->Flags & HANDLING_NONPLAYER_STABILISER && GetStatus() == STATUS_PHYSICS)
 		m_vecCentreOfMass.z = pHandling->CentreOfMass.z - 0.2f*pHandling->Dimension.z;
 	else
-		m_vecCentreOfMass.z = pHandling->CentreOfMass.z;
+		m_vecCentreOfMass = pHandling->CentreOfMass;
+
+	// Park car
+	if(bCanPark && !bParking && VehicleCreatedBy != MISSION_VEHICLE && AutoPilot.m_nCarMission == MISSION_CRUISE &&
+	   ((CTimer::GetFrameCounter() + m_randomSeed)&0xF) == 0 && !IsTaxi()){
+		CVector parkPosition = GetPosition() + 3.0f*GetRight() + 10.0f*GetForward();
+		CEntity *ent = nil;
+		CColPoint colpoint;
+		if(!CWorld::ProcessLineOfSight(GetPosition(), parkPosition, colpoint, ent, true, true, true, false, false, false) ||
+		   ent == this)
+			CCarAI::GetCarToParkAtCoors(this, &parkPosition);
+	}
 
 	// Process depending on status
 
 	bool playerRemote = false;
 	switch(GetStatus()){
 	case STATUS_PLAYER_REMOTE:
-		if(CPad::GetPad(0)->WeaponJustDown()){
+		if(CPad::GetPad(0)->WeaponJustDown() && !bDisableRemoteDetonation){
 			BlowUpCar(FindPlayerPed());
 			CRemote::TakeRemoteControlledCarFromPlayer();
 		}
 
-		if(GetModelIndex() == MI_RCBANDIT){
-			CVector pos = GetPosition();
+		if(GetModelIndex() == MI_RCBANDIT && !bDisableRemoteDetonationOnContact){
+			//CVector pos = GetPosition();
 			// FindPlayerCoors unused
-			if(RcbanditCheckHitWheels() || bIsInWater || CPopulation::IsPointInSafeZone(&pos)){
-				if(CPopulation::IsPointInSafeZone(&pos))
-					CGarages::TriggerMessage("HM2_5", -1, 5000, -1);
+			if(RcbanditCheckHitWheels() || bIsInWater){
 				CRemote::TakeRemoteControlledCarFromPlayer();
 				BlowUpCar(FindPlayerPed());
 			}
@@ -350,7 +387,7 @@ CAutomobile::ProcessControl(void)
 		// fall through
 	case STATUS_PLAYER:
 		if(playerRemote ||
-		   pDriver && pDriver->GetPedState() != PED_EXIT_CAR && pDriver->GetPedState() != PED_DRAG_FROM_CAR){
+		   pDriver && pDriver->GetPedState() != PED_EXIT_CAR && pDriver->GetPedState() != PED_DRAG_FROM_CAR && pDriver->GetPedState() != PED_ARRESTED){
 			// process control input if controlled by player
 			if(playerRemote || pDriver->m_nPedType == PEDTYPE_PLAYER1)
 				ProcessControlInputs(0);
@@ -359,7 +396,59 @@ CAutomobile::ProcessControl(void)
 
 			if(GetStatus() == STATUS_PLAYER && !CRecordDataForChase::IsRecording())
 				DoDriveByShootings();
+
+			// Tweak center on mass when driving on two wheels
+			int twoWheelTime = CWorld::Players[CWorld::PlayerInFocus].m_nTimeNotFullyOnGround;
+			if(twoWheelTime > 500 && !IsRealHeli() && !IsRealPlane()){
+				float tweak = Min(twoWheelTime-500, 1000)/500.0f;
+				if(GetUp().z > 0.0f){
+					// positive when on left wheels, negative on right wheels
+					if(GetRight().z <= 0.0f)
+						tweak *= -1.0f;
+					m_vecCentreOfMass.z = pHandling->CentreOfMass.z +
+						CPad::GetPad(0)->GetSteeringLeftRight()/128.0f *
+						CAR_BALANCE_MULT * tweak * colModel->boundingBox.max.z;
+				}
+			}else
+				m_vecCentreOfMass.z = pHandling->CentreOfMass.z;
+
+			if(bHoverCheat)
+				DoHoverSuspensionRatios();
+
+			if(m_aSuspensionSpringRatio[0] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[0].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[1] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[1].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[2] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[2].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){
+				if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_RHINO){
+					float slowdown;
+					CVector parallelSpeed = m_vecMoveSpeed - DotProduct(m_vecMoveSpeed, GetUp())*GetUp();
+					float fSpeed = parallelSpeed.MagnitudeSqr();
+					if(fSpeed > SQR(0.3f)){
+						fSpeed = Sqrt(fSpeed);
+						parallelSpeed *= 0.3f / fSpeed;
+						slowdown = SAND_SLOWDOWN * Max(1.0f - 2.0f*fSpeed, 0.2f);
+					}else{
+						bStuckInSand = true;
+						slowdown = SAND_SLOWDOWN;
+					}
+					if(pHandling->Flags & HANDLING_GOOD_INSAND)
+						slowdown *= 0.5f;
+					if(CWeather::WetRoads > 0.2f)
+						slowdown *= (1.2f - CWeather::WetRoads);
+					ApplyMoveForce(parallelSpeed * -CTimer::GetTimeStep()*slowdown*m_fMass);
+					drivingInSand = true;
+				}
+			}
+		}else if(pDriver && pDriver->IsPlayer() &&
+		         (pDriver->GetPedState() == PED_ARRESTED ||
+		          pDriver->GetPedState() == PED_DRAG_FROM_CAR ||
+		          (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_VEHICLE) && !CanPedJumpOutCar())){
+			bIsHandbrakeOn = true;
+			m_fBrakePedal = 1.0f;
+			m_fGasPedal = 0.0f;
 		}
+		if(CPad::GetPad(0)->WeaponJustDown())
+			ActivateBomb();
 		break;
 
 	case STATUS_SIMPLE:
@@ -380,6 +469,7 @@ CAutomobile::ProcessControl(void)
 		PlayHornIfNecessary();
 		ReduceHornCounter();
 		bVehicleColProcessed = false;
+		bAudioChangingGear = false;
 		// that's all we do for simple vehicles
 		return;
 
@@ -387,15 +477,44 @@ CAutomobile::ProcessControl(void)
 		CCarAI::UpdateCarAI(this);
 		CCarCtrl::SteerAICarWithPhysics(this);
 		PlayHornIfNecessary();
+
+		if(bIsBeingCarJacked){
+			m_fGasPedal = 0.0f;
+			m_fBrakePedal = 1.0f;
+			bIsHandbrakeOn = true;
+		}
+
+		if(m_aSuspensionSpringRatio[0] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[0].surfaceB) == ADHESIVE_SAND ||
+		   m_aSuspensionSpringRatio[1] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[1].surfaceB) == ADHESIVE_SAND ||
+		   m_aSuspensionSpringRatio[2] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[2].surfaceB) == ADHESIVE_SAND ||
+		   m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){
+			if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_SANDKING && GetModelIndex() != MI_BFINJECT){
+				bStuckInSand = true;
+				if(CWeather::WetRoads > 0.0f)
+					ApplyMoveForce(m_vecMoveSpeed * -CTimer::GetTimeStep()*SAND_SLOWDOWN*m_fMass * (1.0f-CWeather::WetRoads));
+				else
+					ApplyMoveForce(m_vecMoveSpeed * -CTimer::GetTimeStep()*SAND_SLOWDOWN*m_fMass);
+			}
+		}
 		break;
 
 	case STATUS_ABANDONED:
-		m_fBrakePedal = 0.2f;
+		if(m_vecMoveSpeed.MagnitudeSqr() < SQR(0.1f))
+			m_fBrakePedal = 0.2f;
+		else
+			m_fBrakePedal = 0.0f;
 		bIsHandbrakeOn = false;
 
 		m_fSteerAngle = 0.0f;
 		m_fGasPedal = 0.0f;
-		m_nCarHornTimer = 0;
+		if(!IsAlarmOn())
+			m_nCarHornTimer = 0;
+
+		if(bIsBeingCarJacked){
+			m_fGasPedal = 0.0f;
+			m_fBrakePedal = 1.0f;
+			bIsHandbrakeOn = true;
+		}
 		break;
 
 	case STATUS_WRECKED:
@@ -404,26 +523,32 @@ CAutomobile::ProcessControl(void)
 
 		m_fSteerAngle = 0.0f;
 		m_fGasPedal = 0.0f;
-		m_nCarHornTimer = 0;
+		if(!IsAlarmOn())
+			m_nCarHornTimer = 0;
 		break;
 
 	case STATUS_PLAYER_DISABLED:
-		m_fBrakePedal = 1.0f;
-		bIsHandbrakeOn = true;
+		if(m_vecMoveSpeed.MagnitudeSqr() < SQR(0.1f) ||
+		   (pDriver && pDriver->IsPlayer() &&
+		    (pDriver->GetPedState() == PED_ARRESTED ||
+		     pDriver->GetPedState() == PED_DRAG_FROM_CAR ||
+		     (pDriver->GetPedState() == PED_EXIT_CAR || pDriver->m_objective == OBJECTIVE_LEAVE_VEHICLE) && !CanPedJumpOutCar()))){
+			bIsHandbrakeOn = true;
+			m_fBrakePedal = 1.0f;
+			m_fGasPedal = 0.0f;
+		}else{
+			m_fBrakePedal = 0.0f;
+			bIsHandbrakeOn = false;
+		}
 
 		m_fSteerAngle = 0.0f;
 		m_fGasPedal = 0.0f;
-		m_nCarHornTimer = 0;
+		if(!IsAlarmOn())
+			m_nCarHornTimer = 0;
 		break;
 	default: break;
 	}
 
-	// what's going on here?
-	if(GetPosition().z < -0.6f &&
-	   Abs(m_vecMoveSpeed.x) < 0.05f &&
-	   Abs(m_vecMoveSpeed.y) < 0.05f)
-		m_vecTurnSpeed *= Pow(0.95f, CTimer::GetTimeStep());
-
 	// Skip physics if object is found to have been static recently
 	bool skipPhysics = false;
 	if(!bIsStuck && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED)){
@@ -451,7 +576,8 @@ CAutomobile::ProcessControl(void)
 
 		if(m_vecMoveSpeedAvg.MagnitudeSqr() <= sq(moveSpeedLimit*CTimer::GetTimeStep()) &&
 		   m_vecTurnSpeedAvg.MagnitudeSqr() <= sq(turnSpeedLimit*CTimer::GetTimeStep()) &&
-		   m_fDistanceTravelled < distanceLimit ||
+		   m_fDistanceTravelled < distanceLimit &&
+		   !(m_fDamageImpulse > 0.0f && m_pDamageEntity && m_pDamageEntity->IsPed()) ||
 		   makeStatic){
 			m_nStaticFrames++;
 
@@ -467,15 +593,27 @@ CAutomobile::ProcessControl(void)
 				}
 		}else
 			m_nStaticFrames = 0;
+		if(IsRealHeli() && m_aWheelSpeed[1] > 0.0f){
+			skipPhysics = false;
+			m_nStaticFrames = 0;
+		}
 	}
 
 	// Postpone
 	for(i = 0; i < 4; i++)
-		if(m_aGroundPhysical[i] && !CWorld::bForceProcessControl && m_aGroundPhysical[i]->bIsInSafePosition){
-			bWasPostponed = true;
-			return;
+		if(m_aGroundPhysical[i]){
+			bRestingOnPhysical = true;
+			if(!CWorld::bForceProcessControl && m_aGroundPhysical[i]->bIsInSafePosition){
+				bWasPostponed = true;
+				return;
+			}
 		}
 
+	if(bRestingOnPhysical){
+		skipPhysics = false;
+		m_nStaticFrames = 0;
+	}
+
 	VehicleDamage(0.0f, 0);
 
 	// special control
@@ -487,12 +625,11 @@ CAutomobile::ProcessControl(void)
 		TankControl();
 		BlowUpCarsInPath();
 		break;
-	case MI_YARDIE:
-	// beta also had esperanto here it seems
+	case MI_VOODOO:
 		HydraulicControl();
 		break;
 	default:
-		if(CVehicle::bCheat3){
+		if(CVehicle::bCheat3 || carHasNitro){
 			// Make vehicle jump when horn is sounded
 			if(GetStatus() == STATUS_PLAYER && m_vecMoveSpeed.MagnitudeSqr() > sq(0.2f) &&
 			// BUG: game checks [0] four times, instead of all wheels
@@ -531,12 +668,17 @@ CAutomobile::ProcessControl(void)
 					1.2f*m_vecMoveSpeed, nil, 2.0f);
 
 				ApplyMoveForce(CVector(0.0f, 0.0f, 1.0f)*m_fMass*0.4f);
-				ApplyTurnForce(GetUp()*m_fMass*0.035f, GetForward()*1.0f);
+				ApplyTurnForce(GetUp()*m_fTurnMass*0.01f, GetForward()*1.0f);
 			}
 		}
 		break;
 	}
 
+	if(GetStatus() == STATUS_PHYSICS || GetStatus() == STATUS_SIMPLE)
+		if(AutoPilot.m_nCarMission == MISSION_HELI_FLYTOCOORS ||
+		   AutoPilot.m_nCarMission == MISSION_PLANE_FLYTOCOORS)
+			skipPhysics = true;
+
 	float brake;
 	if(skipPhysics){
 		bHasContacted = false;
@@ -546,11 +688,13 @@ CAutomobile::ProcessControl(void)
 		m_nCollisionRecords = 0;
 		bHasCollided = false;
 		bVehicleColProcessed = false;
+		bAudioChangingGear = false;
 		m_nDamagePieceType = 0;
 		m_fDamageImpulse = 0.0f;
 		m_pDamageEntity = nil;
 		m_vecTurnFriction = CVector(0.0f, 0.0f, 0.0f);
 		m_vecMoveFriction = CVector(0.0f, 0.0f, 0.0f);
+		m_fTireTemperature = 1.0f;
 	}else{
 
 		// This has to be done if ProcessEntityCollision wasn't called
@@ -603,6 +747,14 @@ CAutomobile::ProcessControl(void)
 					if(m_aSuspensionSpringRatio[i] > 1.0f)
 						m_aSuspensionSpringRatio[i] = 1.0f;
 				}
+			}else if(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[i].surfaceB) == ADHESIVE_SAND &&
+			         GetModelIndex() != MI_RHINO){
+				fwdSpeed *= 0.7f;
+				float f = 1.0f - fwdSpeed/0.3f - 0.7f*CWeather::WetRoads;
+				f = Max(f, 0.4f);
+				m_aSuspensionSpringRatio[i] += 0.35f*f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
+				if(m_aSuspensionSpringRatio[i] > 1.0f)
+					m_aSuspensionSpringRatio[i] = 1.0f;
 			}
 
 			// get points and directions if spring is compressed
@@ -620,13 +772,20 @@ CAutomobile::ProcessControl(void)
 				if(i == CARWHEEL_REAR_LEFT || i == CARWHEEL_REAR_RIGHT)
 					bias = 1.0f - bias;
 
-				ApplySpringCollision(pHandling->fSuspensionForceLevel,
+				ApplySpringCollisionAlt(pHandling->fSuspensionForceLevel,
 					springDirections[i], contactPoints[i],
-					m_aSuspensionSpringRatio[i], bias);
-				m_aWheelSkidmarkMuddy[i] =
-					m_aWheelColPoints[i].surfaceB == SURFACE_GRASS ||
-					m_aWheelColPoints[i].surfaceB == SURFACE_MUD_DRY ||
-					m_aWheelColPoints[i].surfaceB == SURFACE_SAND;
+					m_aSuspensionSpringRatio[i], bias, m_aWheelColPoints[i].normal);
+
+				m_aWheelSkidmarkUnk[i] = false;
+				if(m_aWheelColPoints[i].surfaceB == SURFACE_GRASS ||
+				   m_aWheelColPoints[i].surfaceB == SURFACE_MUD_DRY)
+					m_aWheelSkidmarkType[i] = SKIDMARK_MUDDY;
+				else if(m_aWheelColPoints[i].surfaceB == SURFACE_SAND ||
+				        m_aWheelColPoints[i].surfaceB == SURFACE_SAND_BEACH){
+					m_aWheelSkidmarkType[i] = SKIDMARK_SANDY;
+					m_aWheelSkidmarkUnk[i] = true;
+				}else
+					m_aWheelSkidmarkType[i] = SKIDMARK_NORMAL;
 			}else{
 				contactPoints[i] = Multiply3x3(GetMatrix(), colModel->lines[i].p1);
 			}
@@ -643,6 +802,8 @@ CAutomobile::ProcessControl(void)
 				m_aGroundPhysical[i] = nil;
 #endif
 			}
+			if(m_aSuspensionSpringRatio[i] < 1.0f && m_aWheelColPoints[i].normal.z > 0.35f)
+				springDirections[i] = -m_aWheelColPoints[i].normal;
 		}
 
 		// dampen springs
@@ -661,7 +822,6 @@ CAutomobile::ProcessControl(void)
 			}
 		}
 
-
 		bool gripCheat = true;
 		fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward());
 		if(!strongGrip1 && !CVehicle::bCheat3)
@@ -669,14 +829,25 @@ CAutomobile::ProcessControl(void)
 		float acceleration = pHandling->Transmission.CalculateDriveAcceleration(m_fGasPedal, m_nCurrentGear, m_fChangeGearTime, fwdSpeed, gripCheat);
 		acceleration /= m_fForceMultiplier;
 
-		// unused
-		if(GetModelIndex() == MI_MIAMI_RCBARON ||
-		   GetModelIndex() == MI_MIAMI_RCRAIDER ||
-		   GetModelIndex() == MI_MIAMI_SPARROW)
+		if(IsRealHeli() || IsRealPlane())
 			acceleration = 0.0f;
 
+		if(bAudioChangingGear && m_fGasPedal > 0.4f && m_fBrakePedal < 0.1f && fwdSpeed > 0.15f &&
+		   this == FindPlayerVehicle() && TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON){
+			if(GetStatus() == STATUS_PLAYER && pHandling->Flags & HANDLING_IS_BUS){
+				if(m_nBusDoorTimerEnd == 0)
+					m_nBusDoorTimerEnd = 1000;
+				else if(m_nBusDoorTimerEnd > CTimer::GetTimeStepInMilliseconds())
+					m_nBusDoorTimerEnd -= CTimer::GetTimeStepInMilliseconds();
+			}
+
+			if(m_aSuspensionSpringRatio[0] < 1.0f || m_aSuspensionSpringRatio[1] < 1.0f ||
+			   m_aSuspensionSpringRatio[2] < 1.0f || m_aSuspensionSpringRatio[3] < 1.0f)
+				ApplyTurnForce(-GRAVITY*Min(m_fTurnMass, 2500.0f)*GetUp(), -1.0f*GetForward());
+		}
+
 		brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep();
-		bool neutralHandling = !!(pHandling->Flags & HANDLING_NEUTRALHANDLING);
+		bool neutralHandling = GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && (pHandling->Flags & HANDLING_NEUTRALHANDLING);
 		float brakeBiasFront = neutralHandling ? 1.0f : 2.0f*pHandling->fBrakeBias;
 		float brakeBiasRear  = neutralHandling ? 1.0f : 2.0f*(1.0f-pHandling->fBrakeBias);
 		float tractionBiasFront = neutralHandling ? 1.0f : 2.0f*pHandling->fTractionBias;
@@ -722,21 +893,7 @@ CAutomobile::ProcessControl(void)
 		if(CVehicle::bCheat3)
 			traction *= 4.0f;
 
-		if(FindPlayerVehicle() && FindPlayerVehicle() == this){
-			if(CPad::GetPad(0)->WeaponJustDown()){
-				if(m_bombType == CARBOMB_TIMED){
-					m_bombType = CARBOMB_TIMEDACTIVE;
-					m_nBombTimer = 7000;
-					m_pBlowUpEntity = FindPlayerPed();
-					CGarages::TriggerMessage("GA_12", -1, 3000, -1);
-					DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TIMED_ACTIVATED, 1.0f);
-				}else if(m_bombType == CARBOMB_ONIGNITION){
-					m_bombType = CARBOMB_ONIGNITIONACTIVE;
-					CGarages::TriggerMessage("GA_12", -1, 3000, -1);
-					DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_ONIGNITION_ACTIVATED, 1.0f);
-				}
-			}
-		}else if(strongGrip1 || CVehicle::bCheat3){
+		if(FindPlayerVehicle() != this && (strongGrip1 || CVehicle::bCheat3)){
 			traction *= 1.2f;
 			acceleration *= 1.4f;
 			if(strongGrip2 || CVehicle::bCheat3){
@@ -748,13 +905,16 @@ CAutomobile::ProcessControl(void)
 		static float fThrust;
 		static tWheelState WheelState[4];
 
-		// Process front wheels on ground
+		bool rearWheelsFirst = !!(pHandling->Flags & HANDLING_REARWHEEL_1ST);
 
+		// Process front wheels on ground - first try
+
+		if(!rearWheelsFirst){
 		if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] > 0.0f || m_aWheelTimer[CARWHEEL_FRONT_RIGHT] > 0.0f){
 			float s = Sin(m_fSteerAngle);
 			float c = Cos(m_fSteerAngle);
-			CVector wheelFwd = Multiply3x3(GetMatrix(), CVector(-s, c, 0.0f));
-			CVector wheelRight = Multiply3x3(GetMatrix(), CVector(c, s, 0.0f));
+
+			CVector wheelFwd, wheelRight, tmp;
 
 			if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] > 0.0f){
 				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier))
@@ -762,6 +922,15 @@ CAutomobile::ProcessControl(void)
 				else
 					fThrust = acceleration;
 
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal)*m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal);
+				wheelRight.Normalise();
+				tmp = c*wheelFwd - s*wheelRight;
+				wheelRight = s*wheelFwd + c*wheelRight;
+				wheelFwd = tmp;
+
 				m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceA = SURFACE_WHEELBASE;
 				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_FRONT_LEFT])*traction;
 				if(GetStatus() == STATUS_PLAYER)
@@ -796,6 +965,15 @@ CAutomobile::ProcessControl(void)
 				else
 					fThrust = acceleration;
 
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal)*m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal);
+				wheelRight.Normalise();
+				tmp = c*wheelFwd - s*wheelRight;
+				wheelRight = s*wheelFwd + c*wheelRight;
+				wheelFwd = tmp;
+
 				m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceA = SURFACE_WHEELBASE;
 				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT])*traction;
 				if(GetStatus() == STATUS_PLAYER)
@@ -827,33 +1005,36 @@ CAutomobile::ProcessControl(void)
 
 		// Process front wheels off ground
 
-		if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] <= 0.0f){
-			if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
-				m_aWheelSpeed[CARWHEEL_FRONT_LEFT] *= 0.95f;
-			else{
-				if(acceleration > 0.0f){
-					if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] < 2.0f)
-						m_aWheelSpeed[CARWHEEL_FRONT_LEFT] -= 0.2f;
-				}else{
-					if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] > -2.0f)
-						m_aWheelSpeed[CARWHEEL_FRONT_LEFT] += 0.1f;
+		if(!IsRealHeli()){
+			if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] <= 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_FRONT_LEFT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_LEFT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_LEFT] += 0.1f;
+					}
 				}
+				m_aWheelRotation[CARWHEEL_FRONT_LEFT] += m_aWheelSpeed[CARWHEEL_FRONT_LEFT];
 			}
-			m_aWheelRotation[CARWHEEL_FRONT_LEFT] += m_aWheelSpeed[CARWHEEL_FRONT_LEFT];
-		}
-		if(m_aWheelTimer[CARWHEEL_FRONT_RIGHT] <= 0.0f){
-			if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
-				m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] *= 0.95f;
-			else{
-				if(acceleration > 0.0f){
-					if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] < 2.0f)
-						m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] -= 0.2f;
-				}else{
-					if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] > -2.0f)
-						m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] += 0.1f;
+			if(m_aWheelTimer[CARWHEEL_FRONT_RIGHT] <= 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] += 0.1f;
+					}
 				}
+				m_aWheelRotation[CARWHEEL_FRONT_RIGHT] += m_aWheelSpeed[CARWHEEL_FRONT_RIGHT];
 			}
-			m_aWheelRotation[CARWHEEL_FRONT_RIGHT] += m_aWheelSpeed[CARWHEEL_FRONT_RIGHT];
+		}
 		}
 
 		// Process rear wheels
@@ -862,14 +1043,28 @@ CAutomobile::ProcessControl(void)
 			CVector wheelFwd = GetForward();
 			CVector wheelRight = GetRight();
 
+			float rearBrake = brake;
+			float rearTraction = traction;
+			if(bIsHandbrakeOn){
 #ifdef FIX_BUGS
-			// Not sure if this is needed, but brake usually has timestep as a factor
-			if(bIsHandbrakeOn)
-				brake = 20000.0f * CTimer::GetTimeStepFix();
+				// Not sure if this is needed, but brake usually has timestep as a factor
+				rearBrake = 20000.0f * CTimer::GetTimeStepFix();
 #else
-			if(bIsHandbrakeOn)
-				brake = 20000.0f;
+				rearBrake = 20000.0f;
 #endif
+				if(fwdSpeed > 0.1f && pHandling->Flags & HANDLING_HANDBRAKE_TYRE){
+					m_fTireTemperature += 0.005*CTimer::GetTimeStep();
+					if(m_fTireTemperature > 2.0f)
+						m_fTireTemperature = 2.0f;
+				}
+			}else if(m_doingBurnout && !mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier)){
+				rearBrake = 0.0f;
+				rearTraction = 0.0f;
+				// BUG: missing timestep
+				ApplyTurnForce(contactPoints[CARWHEEL_REAR_LEFT], -0.001f*m_fTurnMass*m_fSteerAngle*GetRight());
+			}else if(m_fTireTemperature > 1.0f){
+				rearTraction *= m_fTireTemperature;
+			}
 
 			if(m_aWheelTimer[CARWHEEL_REAR_LEFT] > 0.0f){
 				if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier))
@@ -877,8 +1072,14 @@ CAutomobile::ProcessControl(void)
 				else
 					fThrust = acceleration;
 
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_REAR_LEFT].normal)*m_aWheelColPoints[CARWHEEL_REAR_LEFT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_REAR_LEFT].normal);
+				wheelRight.Normalise();
+
 				m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceA = SURFACE_WHEELBASE;
-				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_REAR_LEFT])*traction;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_REAR_LEFT])*rearTraction;
 				if(GetStatus() == STATUS_PLAYER)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB);
 				WheelState[CARWHEEL_REAR_LEFT] = m_aWheelState[CARWHEEL_REAR_LEFT];
@@ -887,7 +1088,7 @@ CAutomobile::ProcessControl(void)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_LEFT], contactPoints[CARWHEEL_REAR_LEFT],
 						m_nWheelsOnGround, fThrust,
-						brake*brakeBiasRear,
+						rearBrake*brakeBiasRear,
 						adhesion*tractionBiasRear*Damage.m_fWheelDamageEffect,
 						CARWHEEL_REAR_LEFT,
 						&m_aWheelSpeed[CARWHEEL_REAR_LEFT],
@@ -897,7 +1098,7 @@ CAutomobile::ProcessControl(void)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_LEFT], contactPoints[CARWHEEL_REAR_LEFT],
 						m_nWheelsOnGround, fThrust,
-						brake*brakeBiasRear,
+						rearBrake*brakeBiasRear,
 						adhesion*tractionBiasRear,
 						CARWHEEL_REAR_LEFT,
 						&m_aWheelSpeed[CARWHEEL_REAR_LEFT],
@@ -905,14 +1106,26 @@ CAutomobile::ProcessControl(void)
 						WHEEL_STATUS_OK);
 			}
 
+#ifdef FIX_BUGS
+			// Shouldn't we reset these after the left wheel?
+			wheelFwd = GetForward();
+			wheelRight = GetRight();
+#endif
+
 			if(m_aWheelTimer[CARWHEEL_REAR_RIGHT] > 0.0f){
 				if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier))
 					fThrust = 0.0f;
 				else
 					fThrust = acceleration;
 
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_REAR_RIGHT].normal)*m_aWheelColPoints[CARWHEEL_REAR_RIGHT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_REAR_RIGHT].normal);
+				wheelRight.Normalise();
+
 				m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceA = SURFACE_WHEELBASE;
-				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_REAR_RIGHT])*traction;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_REAR_RIGHT])*rearTraction;
 				if(GetStatus() == STATUS_PLAYER)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB);
 				WheelState[CARWHEEL_REAR_RIGHT] = m_aWheelState[CARWHEEL_REAR_RIGHT];
@@ -921,7 +1134,7 @@ CAutomobile::ProcessControl(void)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_RIGHT], contactPoints[CARWHEEL_REAR_RIGHT],
 						m_nWheelsOnGround, fThrust,
-						brake*brakeBiasRear,
+						rearBrake*brakeBiasRear,
 						adhesion*tractionBiasRear*Damage.m_fWheelDamageEffect,
 						CARWHEEL_REAR_RIGHT,
 						&m_aWheelSpeed[CARWHEEL_REAR_RIGHT],
@@ -931,7 +1144,7 @@ CAutomobile::ProcessControl(void)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_RIGHT], contactPoints[CARWHEEL_REAR_RIGHT],
 						m_nWheelsOnGround, fThrust,
-						brake*brakeBiasRear,
+						rearBrake*brakeBiasRear,
 						adhesion*tractionBiasRear,
 						CARWHEEL_REAR_RIGHT,
 						&m_aWheelSpeed[CARWHEEL_REAR_RIGHT],
@@ -940,58 +1153,203 @@ CAutomobile::ProcessControl(void)
 			}
 		}
 
+		if(m_doingBurnout && !mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier) &&
+	           (m_aWheelState[CARWHEEL_REAR_LEFT] == WHEEL_STATE_SPINNING || m_aWheelState[CARWHEEL_REAR_RIGHT] == WHEEL_STATE_SPINNING)){
+			m_fTireTemperature += 0.001f*CTimer::GetTimeStep();
+			if(m_fTireTemperature > 3.0f)
+				m_fTireTemperature = 3.0f;
+		}else if(m_fTireTemperature > 1.0f){
+			m_fTireTemperature = (m_fTireTemperature - 1.0f)*Pow(0.995f, CTimer::GetTimeStep()) + 1.0f;
+		}
+
 		// Process rear wheels off ground
 
-		if(m_aWheelTimer[CARWHEEL_REAR_LEFT] <= 0.0f){
-			if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
-				m_aWheelSpeed[CARWHEEL_REAR_LEFT] *= 0.95f;
-			else{
-				if(acceleration > 0.0f){
-					if(m_aWheelSpeed[CARWHEEL_REAR_LEFT] < 2.0f)
-						m_aWheelSpeed[CARWHEEL_REAR_LEFT] -= 0.2f;
-				}else{
-					if(m_aWheelSpeed[CARWHEEL_REAR_LEFT] > -2.0f)
-						m_aWheelSpeed[CARWHEEL_REAR_LEFT] += 0.1f;
+		if(!IsRealHeli()){
+			if(m_aWheelTimer[CARWHEEL_REAR_LEFT] <= 0.0f){
+				if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_REAR_LEFT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_REAR_LEFT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_REAR_LEFT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_REAR_LEFT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_REAR_LEFT] += 0.1f;
+					}
 				}
+				m_aWheelRotation[CARWHEEL_REAR_LEFT] += m_aWheelSpeed[CARWHEEL_REAR_LEFT];
 			}
-			m_aWheelRotation[CARWHEEL_REAR_LEFT] += m_aWheelSpeed[CARWHEEL_REAR_LEFT];
-		}
-		if(m_aWheelTimer[CARWHEEL_REAR_RIGHT] <= 0.0f){
-			if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
-				m_aWheelSpeed[CARWHEEL_REAR_RIGHT] *= 0.95f;
-			else{
-				if(acceleration > 0.0f){
-					if(m_aWheelSpeed[CARWHEEL_REAR_RIGHT] < 2.0f)
-						m_aWheelSpeed[CARWHEEL_REAR_RIGHT] -= 0.2f;
-				}else{
-					if(m_aWheelSpeed[CARWHEEL_REAR_RIGHT] > -2.0f)
-						m_aWheelSpeed[CARWHEEL_REAR_RIGHT] += 0.1f;
+			if(m_aWheelTimer[CARWHEEL_REAR_RIGHT] <= 0.0f){
+				if(mod_HandlingManager.HasFrontWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_REAR_RIGHT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_REAR_RIGHT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_REAR_RIGHT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_REAR_RIGHT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_REAR_RIGHT] += 0.1f;
+					}
+				}
+				m_aWheelRotation[CARWHEEL_REAR_RIGHT] += m_aWheelSpeed[CARWHEEL_REAR_RIGHT];
+			}
+		}
+
+		// Process front wheels on ground - second try
+
+		if(rearWheelsFirst){
+		if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] > 0.0f || m_aWheelTimer[CARWHEEL_FRONT_RIGHT] > 0.0f){
+			float s = Sin(m_fSteerAngle);
+			float c = Cos(m_fSteerAngle);
+
+			CVector wheelFwd, wheelRight, tmp;
+
+			if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] > 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier))
+					fThrust = 0.0f;
+				else
+					fThrust = acceleration;
+
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal)*m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].normal);
+				wheelRight.Normalise();
+				tmp = c*wheelFwd - s*wheelRight;
+				wheelRight = s*wheelFwd + c*wheelRight;
+				wheelFwd = tmp;
+
+				m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceA = SURFACE_WHEELBASE;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_FRONT_LEFT])*traction;
+				if(GetStatus() == STATUS_PLAYER)
+					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceB);
+				WheelState[CARWHEEL_FRONT_LEFT] = m_aWheelState[CARWHEEL_FRONT_LEFT];
+
+				if(Damage.GetWheelStatus(VEHWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
+					ProcessWheel(wheelFwd, wheelRight,
+						contactSpeeds[CARWHEEL_FRONT_LEFT], contactPoints[CARWHEEL_FRONT_LEFT],
+						m_nWheelsOnGround, fThrust,
+						brake*brakeBiasFront,
+						adhesion*tractionBiasFront*Damage.m_fWheelDamageEffect,
+						CARWHEEL_FRONT_LEFT,
+						&m_aWheelSpeed[CARWHEEL_FRONT_LEFT],
+						&WheelState[CARWHEEL_FRONT_LEFT],
+						WHEEL_STATUS_BURST);
+				else
+					ProcessWheel(wheelFwd, wheelRight,
+						contactSpeeds[CARWHEEL_FRONT_LEFT], contactPoints[CARWHEEL_FRONT_LEFT],
+						m_nWheelsOnGround, fThrust,
+						brake*brakeBiasFront,
+						adhesion*tractionBiasFront,
+						CARWHEEL_FRONT_LEFT,
+						&m_aWheelSpeed[CARWHEEL_FRONT_LEFT],
+						&WheelState[CARWHEEL_FRONT_LEFT],
+						WHEEL_STATUS_OK);
+			}
+
+			if(m_aWheelTimer[CARWHEEL_FRONT_RIGHT] > 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier))
+					fThrust = 0.0f;
+				else
+					fThrust = acceleration;
+
+				wheelFwd = GetForward();
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal)*m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal;
+				wheelFwd.Normalise();
+				wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].normal);
+				wheelRight.Normalise();
+				tmp = c*wheelFwd - s*wheelRight;
+				wheelRight = s*wheelFwd + c*wheelRight;
+				wheelFwd = tmp;
+
+				m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceA = SURFACE_WHEELBASE;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT])*traction;
+				if(GetStatus() == STATUS_PLAYER)
+					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceB);
+				WheelState[CARWHEEL_FRONT_RIGHT] = m_aWheelState[CARWHEEL_FRONT_RIGHT];
+
+				if(Damage.GetWheelStatus(VEHWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
+					ProcessWheel(wheelFwd, wheelRight,
+						contactSpeeds[CARWHEEL_FRONT_RIGHT], contactPoints[CARWHEEL_FRONT_RIGHT],
+						m_nWheelsOnGround, fThrust,
+						brake*brakeBiasFront,
+						adhesion*tractionBiasFront*Damage.m_fWheelDamageEffect,
+						CARWHEEL_FRONT_RIGHT,
+						&m_aWheelSpeed[CARWHEEL_FRONT_RIGHT],
+						&WheelState[CARWHEEL_FRONT_RIGHT],
+						WHEEL_STATUS_BURST);
+				else
+					ProcessWheel(wheelFwd, wheelRight,
+						contactSpeeds[CARWHEEL_FRONT_RIGHT], contactPoints[CARWHEEL_FRONT_RIGHT],
+						m_nWheelsOnGround, fThrust,
+						brake*brakeBiasFront,
+						adhesion*tractionBiasFront,
+						CARWHEEL_FRONT_RIGHT,
+						&m_aWheelSpeed[CARWHEEL_FRONT_RIGHT],
+						&WheelState[CARWHEEL_FRONT_RIGHT],
+						WHEEL_STATUS_OK);
+			}
+		}
+
+		// Process front wheels off ground
+
+		if(!IsRealHeli()){
+			if(m_aWheelTimer[CARWHEEL_FRONT_LEFT] <= 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_FRONT_LEFT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_LEFT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_FRONT_LEFT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_LEFT] += 0.1f;
+					}
 				}
+				m_aWheelRotation[CARWHEEL_FRONT_LEFT] += m_aWheelSpeed[CARWHEEL_FRONT_LEFT];
 			}
-			m_aWheelRotation[CARWHEEL_REAR_RIGHT] += m_aWheelSpeed[CARWHEEL_REAR_RIGHT];
+			if(m_aWheelTimer[CARWHEEL_FRONT_RIGHT] <= 0.0f){
+				if(mod_HandlingManager.HasRearWheelDrive(pHandling->nIdentifier) || acceleration == 0.0f)
+					m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] *= 0.95f;
+				else{
+					if(acceleration > 0.0f){
+						if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] < 2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] -= 0.2f;
+					}else{
+						if(m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] > -2.0f)
+							m_aWheelSpeed[CARWHEEL_FRONT_RIGHT] += 0.1f;
+					}
+				}
+				m_aWheelRotation[CARWHEEL_FRONT_RIGHT] += m_aWheelSpeed[CARWHEEL_FRONT_RIGHT];
+			}
+		}
 		}
 
 		for(i = 0; i < 4; i++){
 			float wheelPos = colModel->lines[i].p0.z;
 			if(m_aSuspensionSpringRatio[i] > 0.0f)
 				wheelPos -= m_aSuspensionSpringRatio[i]*m_aSuspensionSpringLength[i];
-			m_aWheelPosition[i] += (wheelPos - m_aWheelPosition[i])*0.75f;
+			if(GetModelIndex() == MI_VOODOO && bUsingSpecialColModel)
+				m_aWheelPosition[i] = wheelPos;
+			else
+				m_aWheelPosition[i] += (wheelPos - m_aWheelPosition[i])*0.75f;
 		}
 		for(i = 0; i < 4; i++)
 			m_aWheelState[i] = WheelState[i];
+		if(m_fGasPedal < 0.0f){
+			if(m_aWheelState[CARWHEEL_REAR_LEFT] == WHEEL_STATE_SPINNING)
+				m_aWheelState[CARWHEEL_REAR_LEFT] = WHEEL_STATE_NORMAL;
+			if(m_aWheelState[CARWHEEL_REAR_RIGHT] == WHEEL_STATE_SPINNING)
+				m_aWheelState[CARWHEEL_REAR_RIGHT] = WHEEL_STATE_NORMAL;
+		}
 
 		// Process horn
 
 		if(GetStatus() != STATUS_PLAYER){
-			ReduceHornCounter();
+			if(!IsAlarmOn())
+				ReduceHornCounter();
 		}else{
-			if(GetModelIndex() == MI_MRWHOOP){
-				if(Pads[0].bHornHistory[Pads[0].iCurrHornHistory] &&
-				   !Pads[0].bHornHistory[(Pads[0].iCurrHornHistory+4) % 5]){
-					m_bSirenOrAlarm = !m_bSirenOrAlarm;
-					printf("m_bSirenOrAlarm toggled to %d\n", m_bSirenOrAlarm);
-				}
-			}else if(UsesSiren(GetModelIndex())){
+			if(UsesSiren(GetModelIndex())){
 				if(Pads[0].bHornHistory[Pads[0].iCurrHornHistory]){
 					if(Pads[0].bHornHistory[(Pads[0].iCurrHornHistory+4) % 5] &&
 					   Pads[0].bHornHistory[(Pads[0].iCurrHornHistory+3) % 5])
@@ -1004,43 +1362,137 @@ CAutomobile::ProcessControl(void)
 					m_bSirenOrAlarm = !m_bSirenOrAlarm;
 				}else
 					m_nCarHornTimer = 0;
-			}else if(GetModelIndex() != MI_YARDIE && !CVehicle::bCheat3){
-				if(Pads[0].GetHorn())
-					m_nCarHornTimer = 1;
-				else
-					m_nCarHornTimer = 0;
+			}else if(GetModelIndex() != MI_VOODOO && !CVehicle::bCheat3 && !carHasNitro){
+				if(!IsAlarmOn()){
+					if(Pads[0].GetHorn())
+						m_nCarHornTimer = 1;
+					else
+						m_nCarHornTimer = 0;
+				}
 			}
 		}
 
 		// Flying
 
+		bool playRotorSound = false;
 		if(GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PHYSICS){
-			if(GetModelIndex() == MI_MIAMI_RCRAIDER || GetModelIndex() == MI_MIAMI_SPARROW)
-				m_aWheelSpeed[0] = Max(m_aWheelSpeed[0]-0.0005f, 0.0f);
+			if(IsRealHeli()){
+				bEngineOn = false;
+				m_aWheelSpeed[1] = Max(m_aWheelSpeed[1]-0.0005f, 0.0f);
+				if(GetModelIndex() != MI_RCRAIDER && GetModelIndex() != MI_RCGOBLIN)
+					if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f)
+						playRotorSound = true;
+			}
 		}else if((GetModelIndex() == MI_DODO || CVehicle::bAllDodosCheat) &&
 		         m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){
 #ifdef ALT_DODO_CHEAT
 			if (bAltDodoCheat)
-				FlyingControl(FLIGHT_MODEL_SEAPLANE);
+				FlyingControl(FLIGHT_MODEL_PLANE);
 			else
 #endif
+			if(GetModelIndex() == MI_DODO)
 				FlyingControl(FLIGHT_MODEL_DODO);
-		}else if(GetModelIndex() == MI_MIAMI_RCBARON){
-			FlyingControl(FLIGHT_MODEL_RCPLANE);
-		}else if(GetModelIndex() == MI_MIAMI_RCRAIDER || GetModelIndex() == MI_MIAMI_SPARROW || bAllCarCheat){
-#ifdef ALLCARSHELI_CHEAT
-			if (bAllCarCheat)
-				FlyingControl(FLIGHT_MODEL_HELI);
 			else
-#endif
-			{
-				if (CPad::GetPad(0)->GetCircleJustDown())
-					m_aWheelSpeed[0] = Max(m_aWheelSpeed[0] - 0.03f, 0.0f);
-				if (m_aWheelSpeed[0] < 0.22f)
-					m_aWheelSpeed[0] += 0.0001f;
-				if (m_aWheelSpeed[0] > 0.15f)
+				FlyingControl(FLIGHT_MODEL_PLANE);
+		}else if(GetModelIndex() == MI_RCBARON){
+			FlyingControl(FLIGHT_MODEL_RCPLANE);
+		}else if(IsRealHeli() || bAllCarCheat){
+			// Speed up rotor
+			if(m_aWheelSpeed[1] < 0.22f && !bIsInWater){
+				if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
+					m_aWheelSpeed[1] += 0.003f;
+				else
+					m_aWheelSpeed[1] += 0.001f;
+			}
+
+			// Fly
+			if(m_aWheelSpeed[1] > 0.15f){
+				if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
+					FlyingControl(FLIGHT_MODEL_RCHELI);
+				else if(m_nWheelsOnGround < 4 && !(GetModelIndex() == MI_SEASPAR && bTouchingWater) ||
+				        CPad::GetPad(0)->GetAccelerate() != 0 || CPad::GetPad(0)->GetCarGunUpDown() > 1.0f ||
+				        Abs(m_vecMoveSpeed.x) > 0.02f ||
+				        Abs(m_vecMoveSpeed.y) > 0.02f ||
+				        Abs(m_vecMoveSpeed.z) > 0.02f)
 					FlyingControl(FLIGHT_MODEL_HELI);
 			}
+
+			// Blade collision
+			if(m_aWheelSpeed[1] > 0.015f && m_aCarNodes[CAR_BONNET]){
+				CMatrix mat;
+				mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
+				if(GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN)
+					DoBladeCollision(mat.GetPosition(), GetMatrix(), ROTOR_TOP, 0.72f, 0.9f);
+				else if(GetModelIndex() == MI_SPARROW || GetModelIndex() == MI_SEASPAR)
+					DoBladeCollision(mat.GetPosition(), GetMatrix(), ROTOR_TOP, 5.15f, 0.8f);
+				else if(GetModelIndex() == MI_HUNTER)
+					DoBladeCollision(mat.GetPosition(), GetMatrix(), ROTOR_TOP, 6.15f, 0.5f);
+				else
+					DoBladeCollision(mat.GetPosition(), GetMatrix(), ROTOR_TOP, 6.15f, 1.0f);
+			}
+
+			// Heli weapons
+			if(GetModelIndex() == MI_HUNTER && GetStatus() == STATUS_PLAYER){
+				// Hunter rockets
+				if(CPad::GetPad(0)->CarGunJustDown() && CTimer::GetTimeInMilliseconds() > m_nGunFiringTime+350){
+					CWeapon gun(WEAPONTYPE_ROCKETLAUNCHER, 100);
+					CVector source = vecHunterRocketPos;
+					source = GetMatrix()*source + Max(DotProduct(m_vecMoveSpeed, GetForward()), 0.0f)*GetForward()*CTimer::GetTimeStep();
+					gun.FireProjectile(this, &source, 0.0f);
+
+					source = vecHunterRocketPos;
+					source.x = -source.x;
+					source = GetMatrix()*source + Max(DotProduct(m_vecMoveSpeed, GetForward()), 0.0f)*GetForward()*CTimer::GetTimeStep();
+					gun.FireProjectile(this, &source, 0.0f);
+
+					CStats::RoundsFiredByPlayer++;
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
+					m_nGunFiringTime = CTimer::GetTimeInMilliseconds();
+				// Hunter gun
+				}else if(CPad::GetPad(0)->GetHandBrake() && CTimer::GetTimeInMilliseconds() > m_nGunFiringTime+60){
+					CWeapon gun(WEAPONTYPE_HELICANNON, 5000);
+					CVector source = vecHunterGunPos;
+					source = GetMatrix()*source + m_vecMoveSpeed*CTimer::GetTimeStep();
+					gun.FireInstantHit(this, &source);
+					gun.AddGunshell(this, source, CVector2D(0.0f, 0.1f), 0.025f);
+					CStats::RoundsFiredByPlayer++;
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
+					m_nGunFiringTime = CTimer::GetTimeInMilliseconds();
+				}
+			}else if(GetModelIndex() == MI_SEASPAR && GetStatus() == STATUS_PLAYER){
+				// Sea sparrow gun
+				if(CPad::GetPad(0)->GetHandBrake() && CTimer::GetTimeInMilliseconds() > m_nGunFiringTime+40){
+					CWeapon gun(WEAPONTYPE_M4, 5000);
+					CVector source = vecSeaSparrowGunPos;
+					source = GetMatrix()*source + m_vecMoveSpeed*CTimer::GetTimeStep();
+					gun.FireInstantHit(this, &source);
+					gun.AddGunshell(this, source, CVector2D(0.0f, 0.1f), 0.025f);
+					CStats::RoundsFiredByPlayer++;
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
+					m_nGunFiringTime = CTimer::GetTimeInMilliseconds();
+				}
+			}
+
+			if(GetModelIndex() != MI_RCRAIDER && GetModelIndex() != MI_RCGOBLIN)
+				if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f)
+					playRotorSound = true;
+		}
+
+		// Play rotor sound
+		if(playRotorSound && m_aCarNodes[CAR_BONNET]){
+			CVector camDist = TheCamera.GetPosition() - GetPosition();
+			float distSq = camDist.MagnitudeSqr();
+			if(distSq < SQR(20.0f) && Abs(m_fPropellerRotation - m_aWheelRotation[1]) > DEGTORAD(30.0f)){
+				CMatrix mat;
+				mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
+				CVector blade = mat.GetRight();
+				blade = GetMatrix() * blade;
+				camDist /= Max(Sqrt(distSq), 0.01f);
+				if(Abs(DotProduct(camDist, blade)) > 0.95f){
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_31, 0.0f);
+					m_fPropellerRotation = m_aWheelRotation[1];
+				}
+			}
 		}
 	}
 
@@ -1082,7 +1534,7 @@ CAutomobile::ProcessControl(void)
 
 		CParticle::AddParticle(PARTICLE_CARFLAME, damagePos,
 			CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.01125f, 0.09f)),
-			nil, 0.9f);
+			nil, 0.63f);
 
 		CVector coors = damagePos;
 		coors.x += CGeneral::GetRandomNumberInRange(-0.5625f, 0.5625f),
@@ -1094,10 +1546,8 @@ CAutomobile::ProcessControl(void)
 
 		// Blow up car after 5 seconds
 		m_fFireBlowUpTimer += CTimer::GetTimeStepInMilliseconds();
-		if(m_fFireBlowUpTimer > 5000.0f){
-			CWorld::Players[CWorld::PlayerInFocus].AwardMoneyForExplosion(this);
+		if(m_fFireBlowUpTimer > 5000.0f)
 			BlowUpCar(m_pSetOnFireEntity);
-		}
 	}else
 		m_fFireBlowUpTimer = 0.0f;
 
@@ -1117,10 +1567,14 @@ CAutomobile::ProcessControl(void)
 
 	float suspShake = 0.0f;
 	float surfShake = 0.0f;
+	float speedsq = m_vecMoveSpeed.MagnitudeSqr();
 	for(i = 0; i < 4; i++){
 		float suspChange = m_aSuspensionSpringRatioPrev[i] - m_aSuspensionSpringRatio[i];
-		if(suspChange > 0.3f){
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_JUMP, suspChange);
+		if(suspChange > 0.3f && !drivingInSand && speedsq > 0.04f){
+			if(Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST)
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_JUMP_2, suspChange);
+			else
+				DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_JUMP, suspChange);
 			if(suspChange > suspShake)
 				suspShake = suspChange;
 		}
@@ -1129,7 +1583,7 @@ CAutomobile::ProcessControl(void)
 		if(surf == SURFACE_GRAVEL || surf == SURFACE_WATER || surf == SURFACE_HEDGE){
 			if(surfShake < 0.2f)
 				surfShake = 0.3f;
-		}else if(surf == SURFACE_MUD_DRY || surf == SURFACE_SAND){
+		}else if(surf == SURFACE_MUD_DRY){
 			if(surfShake < 0.1f)
 				surfShake = 0.2f;
 		}else if(surf == SURFACE_GRASS){
@@ -1137,13 +1591,17 @@ CAutomobile::ProcessControl(void)
 				surfShake = 0.1f;
 		}
 
+		if(this == FindPlayerVehicle())
+// BUG: this only observes one of the wheels
+			TheCamera.m_bVehicleSuspenHigh = Abs(suspChange) > 0.05f;
+
 		m_aSuspensionSpringRatioPrev[i] = m_aSuspensionSpringRatio[i];
 		m_aSuspensionSpringRatio[i] = 1.0f;
 	}
 
 	// Shake pad
 
-	if((suspShake > 0.0f || surfShake > 0.0f) && GetStatus() == STATUS_PLAYER){
+	if(!drivingInSand && (suspShake > 0.0f || surfShake > 0.0f) && GetStatus() == STATUS_PLAYER){
 		float speed = m_vecMoveSpeed.MagnitudeSqr();
 		if(speed > sq(0.1f)){
 			speed = Sqrt(speed);
@@ -1158,8 +1616,9 @@ CAutomobile::ProcessControl(void)
 	}
 
 	bVehicleColProcessed = false;
+	bAudioChangingGear = false;
 
-	if(!bWarnedPeds)
+	if(!bWarnedPeds && GetVehicleAppearance() != VEHICLE_APPEARANCE_HELI && GetVehicleAppearance() != VEHICLE_APPEARANCE_PLANE)
 		CCarCtrl::ScanForPedDanger(this);
 
 
@@ -1167,20 +1626,20 @@ CAutomobile::ProcessControl(void)
 	// TODO: make the numbers defines
 
 	float heading;
-	if(GetPosition().x > 1900.0f){
+	if(GetPosition().x > 1950.0f-400.0f){
 		if(m_vecMoveSpeed.x > 0.0f)
 			m_vecMoveSpeed.x *= -1.0f;
 		heading = GetForward().Heading();
 		if(heading > 0.0f)	// going west
 			SetHeading(-heading);
-	}else if(GetPosition().x < -1900.0f){
+	}else if(GetPosition().x < -1950.0f-400.0f){
 		if(m_vecMoveSpeed.x < 0.0f)
 			m_vecMoveSpeed.x *= -1.0f;
 		heading = GetForward().Heading();
 		if(heading < 0.0f)	// going east
 			SetHeading(-heading);
 	}
-	if(GetPosition().y > 1900.0f){
+	if(GetPosition().y > 1950.0f){
 		if(m_vecMoveSpeed.y > 0.0f)
 			m_vecMoveSpeed.y *= -1.0f;
 		heading = GetForward().Heading();
@@ -1188,7 +1647,7 @@ CAutomobile::ProcessControl(void)
 			SetHeading(PI-heading);
 		else if(heading > -HALFPI && heading < 0.0f)
 			SetHeading(-PI-heading);
-	}else if(GetPosition().y < -1900.0f){
+	}else if(GetPosition().y < -1950.0f){
 		if(m_vecMoveSpeed.y < 0.0f)
 			m_vecMoveSpeed.y *= -1.0f;
 		heading = GetForward().Heading();
@@ -1207,11 +1666,31 @@ CAutomobile::ProcessControl(void)
 	         (m_fGasPedal == 0.0f && brake == 0.0f || GetStatus() == STATUS_WRECKED)){
 		if(Abs(m_vecMoveSpeed.x) < 0.005f &&
 		   Abs(m_vecMoveSpeed.y) < 0.005f &&
-		   Abs(m_vecMoveSpeed.z) < 0.005f){
+		   Abs(m_vecMoveSpeed.z) < 0.005f &&
+		   !(m_fDamageImpulse > 0.0f && m_pDamageEntity == FindPlayerPed()) &&
+		   (m_aSuspensionSpringRatioPrev[0] < 1.0f && m_aSuspensionSpringRatioPrev[1] < 1.0f &&
+		    m_aSuspensionSpringRatioPrev[2] < 1.0f && m_aSuspensionSpringRatioPrev[3] < 1.0f)){
 			m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
 			m_vecTurnSpeed.z = 0.0f;
 		}
 	}
+
+	if(IsRealHeli() && bHeliDestroyed && !bRenderScorched){
+		ApplyMoveForce(0.0f, 0.0f, -2.0f*CTimer::GetTimeStep());
+		m_vecTurnSpeed.z += -0.002f*CTimer::GetTimeStep();
+		m_vecTurnSpeed.x += -0.0002f*CTimer::GetTimeStep();
+
+		RwRGBA col = { 84, 84, 84, 255 };
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, GetMatrix()*CVector(0.0f, 0.0f, -10.0f),
+			CVector(0.0f, 0.0f, 0.0f), nil, 0.7f, col, 0, 0, 0, 3000);
+
+		if(CWorld::TestSphereAgainstWorld(GetPosition(), 10.0f, this, true, false, false, false, false, false) ||
+		   GetPosition().z < 6.0f)
+			if(!bRenderScorched){	// we already know this is true...
+				CExplosion::AddExplosion(this, nil, EXPLOSION_CAR, GetPosition(), 0);
+				bRenderScorched = true;
+			}
+	}
 }
 
 void
@@ -1235,6 +1714,17 @@ CAutomobile::PreRender(void)
 	int i, j, n;
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
 
+	if(GetModelIndex() == MI_RHINO && m_aCarNodes[CAR_BONNET]){
+		// Rotate Rhino turret
+		CMatrix m;
+		CVector p;
+		m.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
+		p = m.GetPosition();
+		m.SetRotateZ(m_fCarGunLR);
+		m.Translate(p);
+		m.UpdateRW();
+	}
+
 	if(GetModelIndex() == MI_RCBANDIT){
 		CVector pos = GetMatrix() * CVector(0.218f, -0.444f, 0.391f);
 		CAntennas::RegisterOne((uintptr)this, GetUp(), pos, 1.0f);
@@ -1245,7 +1735,7 @@ CAutomobile::PreRender(void)
 
 	// Wheel particles
 
-	if(GetModelIndex() == MI_DODO){
+	if(GetModelIndex() == MI_DODO || GetVehicleAppearance() != VEHICLE_APPEARANCE_CAR){
 		; // nothing
 	}else if(GetModelIndex() == MI_RCBANDIT){
 		for(i = 0; i < 4; i++){
@@ -1300,6 +1790,7 @@ CAutomobile::PreRender(void)
 				rearSkidding = true;
 
 			for(i = 0; i < 4; i++){
+				if(m_aSuspensionSpringRatioPrev[i] < 1.0f && m_aWheelColPoints[i].surfaceB != SURFACE_WATER)
 				switch(m_aWheelState[i]){
 				case WHEEL_STATE_SPINNING:
 					if(AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles)){
@@ -1319,46 +1810,79 @@ CAutomobile::PreRender(void)
 					if(m_aWheelTimer[i] > 0.0f)
 						CSkidmarks::RegisterOne((uintptr)this + i, m_aWheelColPoints[i].point,
 							GetForward().x, GetForward().y,
-							&m_aWheelSkidmarkMuddy[i], &m_aWheelSkidmarkBloody[i]);
+							m_aWheelSkidmarkType[i], &m_aWheelSkidmarkBloody[i]);
 					break;
 
 				case WHEEL_STATE_SKIDDING:
 					if(i == CARWHEEL_REAR_LEFT || i == CARWHEEL_REAR_RIGHT || rearSkidding){
 						// same as below
 
-						AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles);
+						if(Abs(fwdSpeed) > 5.0f){
+							AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles);
 
-						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
-							m_aWheelColPoints[i].point + CVector(0.0f, 0.0f, 0.25f),
-							CVector(0.0f, 0.0f, 0.0f));
+							CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
+								m_aWheelColPoints[i].point + CVector(0.0f, 0.0f, 0.25f),
+								CVector(0.0f, 0.0f, 0.0f));
+						}
 
 						if(m_aWheelTimer[i] > 0.0f)
 							CSkidmarks::RegisterOne((uintptr)this + i, m_aWheelColPoints[i].point,
 								GetForward().x, GetForward().y,
-								&m_aWheelSkidmarkMuddy[i], &m_aWheelSkidmarkBloody[i]);
+								m_aWheelSkidmarkType[i], &m_aWheelSkidmarkBloody[i]);
 					}
 					break;
 
 				case WHEEL_STATE_FIXED:
-					AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles);
+					if(Abs(fwdSpeed) > 5.0f){
+						AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles);
 
-					CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
-						m_aWheelColPoints[i].point + CVector(0.0f, 0.0f, 0.25f),
-						CVector(0.0f, 0.0f, 0.0f));
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
+							m_aWheelColPoints[i].point + CVector(0.0f, 0.0f, 0.25f),
+							CVector(0.0f, 0.0f, 0.0f));
+					}
 
 					if(m_aWheelTimer[i] > 0.0f)
 						CSkidmarks::RegisterOne((uintptr)this + i, m_aWheelColPoints[i].point,
 							GetForward().x, GetForward().y,
-							&m_aWheelSkidmarkMuddy[i], &m_aWheelSkidmarkBloody[i]);
+							m_aWheelSkidmarkType[i], &m_aWheelSkidmarkBloody[i]);
 					break;
 
 				default:
 					if(Abs(fwdSpeed) > 0.5f)
 						AddWheelDirtAndWater(&m_aWheelColPoints[i], drawParticles);
-					if(m_aWheelSkidmarkBloody[i] && m_aWheelTimer[i] > 0.0f)
+					if((m_aWheelSkidmarkBloody[i] || m_aWheelSkidmarkUnk[i]) && m_aWheelTimer[i] > 0.0f)
 						CSkidmarks::RegisterOne((uintptr)this + i, m_aWheelColPoints[i].point,
 							GetForward().x, GetForward().y,
-							&m_aWheelSkidmarkMuddy[i], &m_aWheelSkidmarkBloody[i]);
+							m_aWheelSkidmarkType[i], &m_aWheelSkidmarkBloody[i]);
+				}
+
+				// Sparks for friction of burst wheels
+				if(Damage.GetWheelStatus(i) == WHEEL_STATUS_BURST && m_aSuspensionSpringRatioPrev[i] < 1.0f){
+					static float speedSq;
+					speedSq = m_vecMoveSpeed.MagnitudeSqr();
+					if(speedSq > SQR(0.1f) &&
+					   m_aWheelColPoints[i].surfaceB != SURFACE_GRASS &&
+					   m_aWheelColPoints[i].surfaceB != SURFACE_MUD_DRY &&
+					   m_aWheelColPoints[i].surfaceB != SURFACE_SAND &&
+					   m_aWheelColPoints[i].surfaceB != SURFACE_SAND_BEACH &&
+					   m_aWheelColPoints[i].surfaceB != SURFACE_WATER){
+						CVector normalSpeed = m_aWheelColPoints[i].normal * DotProduct(m_aWheelColPoints[i].normal, m_vecMoveSpeed);
+						CVector frictionSpeed = m_vecMoveSpeed - normalSpeed;
+						if(i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_REAR_LEFT)
+							frictionSpeed -= 0.05f*GetRight();
+						else
+							frictionSpeed += 0.05f*GetRight();
+						CVector unusedRight = 0.15f*GetRight();
+						CVector sparkDir = 0.25f*frictionSpeed;
+						CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[i].point, sparkDir);
+
+						if(speedSq > 0.04f)
+							CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[i].point, sparkDir);
+						if(speedSq > 0.16f){
+							CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[i].point, sparkDir);
+							CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[i].point, sparkDir);
+						}
+					}
 				}
 			}
 		}
@@ -1381,7 +1905,7 @@ CAutomobile::PreRender(void)
 				CSkidmarks::RegisterOne((uintptr)this + CARWHEEL_REAR_LEFT,
 					m_aWheelColPoints[CARWHEEL_REAR_LEFT].point + offset,
 					GetForward().x, GetForward().y,
-					&m_aWheelSkidmarkMuddy[CARWHEEL_REAR_LEFT], &m_aWheelSkidmarkBloody[CARWHEEL_REAR_LEFT]);
+					m_aWheelSkidmarkType[CARWHEEL_REAR_LEFT], &m_aWheelSkidmarkBloody[CARWHEEL_REAR_LEFT]);
 			break;
 		default: break;
 		}
@@ -1399,7 +1923,7 @@ CAutomobile::PreRender(void)
 				CSkidmarks::RegisterOne((uintptr)this + CARWHEEL_REAR_RIGHT,
 					m_aWheelColPoints[CARWHEEL_REAR_RIGHT].point + offset,
 					GetForward().x, GetForward().y,
-					&m_aWheelSkidmarkMuddy[CARWHEEL_REAR_RIGHT], &m_aWheelSkidmarkBloody[CARWHEEL_REAR_RIGHT]);
+					m_aWheelSkidmarkType[CARWHEEL_REAR_RIGHT], &m_aWheelSkidmarkBloody[CARWHEEL_REAR_RIGHT]);
 			break;
 			default: break;
 		}
@@ -1434,21 +1958,22 @@ CAutomobile::PreRender(void)
 	AddDamagedVehicleParticles();
 
 	// Exhaust smoke
-	if(bEngineOn && fwdSpeed < 90.0f){
+	if(bEngineOn && !(pHandling->Flags & HANDLING_NO_EXHAUST) && fwdSpeed < 130.0f){
 		CVector exhaustPos = mi->m_positions[CAR_POS_EXHAUST];
-		CVector pos1, pos2, dir;
+		CVector pos1, pos2, dir1, dir2;
 
 		if(exhaustPos != CVector(0.0f, 0.0f, 0.0f)){
-			dir.z = 0.0f;
+			dir1.z = 0.0f;
+			dir2.z = 0.0f;
 			if(fwdSpeed < 10.0f){
 				CVector steerFwd(-Sin(m_fSteerAngle), Cos(m_fSteerAngle), 0.0f);
 				steerFwd = Multiply3x3(GetMatrix(), steerFwd);
 				float r = CGeneral::GetRandomNumberInRange(-0.06f, -0.03f);
-				dir.x = steerFwd.x * r;
-				dir.y = steerFwd.y * r;
+				dir1.x = steerFwd.x * r;
+				dir1.y = steerFwd.y * r;
 			}else{
-				dir.x = m_vecMoveSpeed.x;
-				dir.y = m_vecMoveSpeed.y;
+				dir1.x = m_vecMoveSpeed.x;
+				dir1.y = m_vecMoveSpeed.y;
 			}
 
 			bool dblExhaust = false;
@@ -1458,17 +1983,62 @@ CAutomobile::PreRender(void)
 				pos2 = exhaustPos;
 				pos2.x = -pos2.x;
 				pos2 = GetMatrix() * pos2;
+				dir2 = dir1;
 			}
 
-			n = 4.0f*m_fGasPedal;
-			if(dblExhaust)
-				for(i = 0; i <= n; i++){
-					CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir);
-					CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos2, dir);
+			static float fumesLimit = 2.0f;
+			if(CGeneral::GetRandomNumberInRange(1.0f, 3.0f)*(m_fGasPedal+1.1f) > fumesLimit)
+				for(i = 0; i < 4;){
+					CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir1);
+					if(pHandling->Flags & HANDLING_DBL_EXHAUST)
+						CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos2, dir2);
+
+					static float extraFumesLimit = 0.5f;
+					if(m_fGasPedal > extraFumesLimit && m_nCurrentGear < 3){
+						if(CGeneral::GetRandomNumber() & 1)
+							CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir1);
+						else if(pHandling->Flags & HANDLING_DBL_EXHAUST)
+							CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos2, dir2);
+					}
+
+					// Fire on Cuban hermes
+					if(GetModelIndex() == MI_CUBAN && i == 1 && m_fGasPedal > 0.9f){
+						if(m_nCurrentGear == 1 || m_nCurrentGear == 3 && (CTimer::GetTimeInMilliseconds()%1500) > 750){
+							if(CGeneral::GetRandomNumber() & 1){
+								CParticle::AddParticle(PARTICLE_FIREBALL, pos1, dir1, nil, 0.05f, 0, 0, 2, 200);
+								CParticle::AddParticle(PARTICLE_FIREBALL, pos1, dir1, nil, 0.05f, 0, 0, 2, 200);
+							}else{
+								CParticle::AddParticle(PARTICLE_FIREBALL, pos2, dir2, nil, 0.05f, 0, 0, 2, 200);
+								CParticle::AddParticle(PARTICLE_FIREBALL, pos2, dir2, nil, 0.05f, 0, 0, 2, 200);
+							}
+						}
+					}
+
+					if(GetStatus() == STATUS_PLAYER && (CTimer::GetFrameCounter()&3) == 0 &&
+					   CWeather::Rain == 0.0f && i == 0){
+						CVector camDist = GetPosition() - TheCamera.GetPosition();
+						if(DotProduct(GetForward(), camDist) > 0.0f ||
+						   TheCamera.GetLookDirection() == LOOKING_LEFT ||
+						   TheCamera.GetLookDirection() == LOOKING_RIGHT){
+							CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
+							if(pHandling->Flags & HANDLING_DBL_EXHAUST)
+								CParticle::AddParticle(PARTICLE_HEATHAZE, pos2, CVector(0.0f, 0.0f, 0.0f));
+
+							CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
+							if(pHandling->Flags & HANDLING_DBL_EXHAUST)
+								CParticle::AddParticle(PARTICLE_HEATHAZE, pos2, CVector(0.0f, 0.0f, 0.0f));
+						}
+					}
+
+					if(GetModelIndex() == MI_CUBAN && i < 1){
+						i = 1;
+						pos1 = GetMatrix() * CVector(1.134f, -1.276f, -0.56f);
+						pos2 = GetMatrix() * CVector(-1.134f, -1.276f, -0.56f);
+						dir1 += 0.05f*GetRight();
+						dir2 -= 0.05f*GetRight();
+					}else
+						i = 99;
 				}
-			else
-				for(i = 0; i <= n; i++)
-					CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir);
 		}
 	}
 
@@ -1540,8 +2110,8 @@ CAutomobile::PreRender(void)
 			float angle = (CTimer::GetTimeInMilliseconds() & 0x3FF)*TWOPI/0x3FF;
 			float s = 8.0f*Sin(angle);
 			float c = 8.0f*Cos(angle);
-			CShadows::StoreCarLightShadow(this, (uintptr)this + 21, gpShadowHeadLightsTex,
-				&pos, c, s, s, -c, r, g, b, 8.0f);
+			//CShadows::StoreCarLightShadow(this, (uintptr)this + 21, gpShadowHeadLightsTex,
+			//	&pos, c, s, s, -c, r, g, b, 8.0f);
 
 			CPointLights::AddLight(CPointLights::LIGHT_POINT,
 				pos + GetUp()*2.0f, CVector(0.0f, 0.0f, 0.0f), 12.0f,
@@ -1579,17 +2149,26 @@ CAutomobile::PreRender(void)
 		}
 		break;
 
-	case MI_FBICAR:
+	case MI_FBIRANCH:
+	case MI_VICECHEE:
 		if(m_bSirenOrAlarm){
 			CVector pos = GetMatrix() * CVector(0.4f, 0.6f, 0.3f);
 			if(CTimer::GetTimeInMilliseconds() & 0x100 &&
 			   DotProduct(GetForward(), GetPosition() - TheCamera.GetPosition()) < 0.0f)
-				CCoronas::RegisterCorona((uintptr)this + 21,
-					0, 0, 255, 255,
-					pos, 0.4f, 50.0f,
-					CCoronas::TYPE_STAR,
-					CCoronas::FLARE_NONE,
-					CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
+				if(GetModelIndex() == MI_VICECHEE)
+					CCoronas::RegisterCorona((uintptr)this + 21,
+						255, 70, 70, 255,
+						pos, 0.4f, 50.0f,
+						CCoronas::TYPE_STAR,
+						CCoronas::FLARE_NONE,
+						CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
+				else
+					CCoronas::RegisterCorona((uintptr)this + 21,
+						0, 0, 255, 255,
+						pos, 0.4f, 50.0f,
+						CCoronas::TYPE_STAR,
+						CCoronas::FLARE_NONE,
+						CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f);
 			else
 				CCoronas::UpdateCoronaCoors((uintptr)this + 21, pos, 50.0f, 0.0f);
 		}
@@ -1597,7 +2176,8 @@ CAutomobile::PreRender(void)
 
 	case MI_TAXI:
 	case MI_CABBIE:
-	case MI_BORGNINE:
+	case MI_ZEBRA:
+	case MI_KAUFMAN:
 		if(bTaxiLight){
 			CVector pos = GetPosition() + GetUp()*0.95f;
 			CCoronas::RegisterCorona((uintptr)this + 21,
@@ -1614,7 +2194,8 @@ CAutomobile::PreRender(void)
 	}
 
 	if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_DODO &&
-	   GetModelIndex() != MI_RHINO) {
+	   GetModelIndex() != MI_RHINO && GetModelIndex() != MI_RCBARON &&
+	   GetVehicleAppearance() != VEHICLE_APPEARANCE_HELI) {
 	// Process lights
 
 	// Turn lights on/off
@@ -1653,7 +2234,6 @@ CAutomobile::PreRender(void)
 			lookVector = CVector(1.0f, 0.0f, 0.0f);
 
 		// 1.0 if directly behind car, -1.0 if in front
-		// BUG on PC: Abs of DotProduct is taken
 		float behindness = DotProduct(lookVector, GetForward());
 		behindness = clamp(behindness, -1.0f, 1.0f);	// shouldn't be necessary
 		// 0.0 if behind car, PI if in front
@@ -1668,7 +2248,8 @@ CAutomobile::PreRender(void)
 		lightL -= GetRight()*2.0f*headLightPos.x;
 
 		// Headlight coronas
-		if(behindness < 0.0f){
+		if(DotProduct(lightR-TheCamera.GetPosition(), GetForward()) < 0.0f &&
+		   (TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_1STPERSON || this != FindPlayerVehicle())){
 			// In front of car
 			float intensity = -0.5f*behindness + 0.3f;
 			float size = 1.0f - behindness;
@@ -1758,7 +2339,7 @@ CAutomobile::PreRender(void)
 		lightL -= GetRight()*2.0f*tailLightPos.x;
 
 		// Taillight coronas
-		if(behindness > 0.0f){
+		if(DotProduct(lightR-TheCamera.GetPosition(), GetForward()) > 0.0f){
 			// Behind car
 			float intensity = 0.4f*behindness + 0.4f;
 			float size = (behindness + 1.0f)/2.0f;
@@ -1832,7 +2413,7 @@ CAutomobile::PreRender(void)
 			if(Damage.GetLightStatus(VEHLIGHT_FRONT_LEFT) == LIGHT_STATUS_OK ||
 			   Damage.GetLightStatus(VEHLIGHT_FRONT_RIGHT) == LIGHT_STATUS_OK)
 				CShadows::StoreCarLightShadow(this, (uintptr)this + 22, gpShadowHeadLightsTex, &pos,
-					7.0f*fwd.x, 7.0f*fwd.y, 7.0f*fwd.y, -7.0f*fwd.x, 45, 45, 45, 7.0f);
+					7.0f*fwd.x, 7.0f*fwd.y, 5.5f*fwd.y, -5.5f*fwd.x, 45, 45, 45, 7.0f);
 
 			f = (tailLightPos.y - 2.5f) - (headLightPos.y + 6.0f);
 			pos += CVector(f*fwd.x, f*fwd.y, 0.0f);
@@ -1924,26 +2505,39 @@ CAutomobile::PreRender(void)
 	// end of lights
 	}
 
+//TODO(MIAMI): StoreShadowForVehicle once we have it
 	CShadows::StoreShadowForCar(this);
-}
 
-void
-CAutomobile::Render(void)
-{
-	int i;
+	DoSunGlare();
+
+	// Heli dust
+	if(IsRealHeli() && m_aWheelSpeed[1] > 0.1125f && GetPosition().z < 30.0f){
+		bool foundGround = false;
+		float waterZ = -1000.0f;
+		float groundZ = CWorld::FindGroundZFor3DCoord(GetPosition().x, GetPosition().y, GetPosition().z, &foundGround);
+		if(!CWaterLevel::GetWaterLevel(GetPosition(), &waterZ, false))
+			waterZ = 0.0f;
+		groundZ = Max(groundZ, waterZ);
+		float rnd = (m_aWheelSpeed[1]-0.1125f)*((int)Max(16.0f-4.0f*CTimer::GetTimeStep(),2.0f))*400.0f/43.0f;
+		float radius = 10.0f;
+		if(GetModelIndex() == MI_RCGOBLIN || GetModelIndex() == MI_RCRAIDER)
+			radius = 3.0f;
+		if(GetPosition().z - groundZ < radius)
+			HeliDustGenerate(this, radius-(GetPosition().z - groundZ), groundZ, ceilf(rnd));
+	}
+
 	CMatrix mat;
 	CVector pos;
-	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
 
-	if(GetModelIndex() == MI_RHINO && m_aCarNodes[CAR_BONNET]){
-		// Rotate Rhino turret
-		CMatrix m;
-		CVector p;
-		m.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
-		p = m.GetPosition();
-		m.SetRotateZ(m_fCarGunLR);
-		m.Translate(p);
-		m.UpdateRW();
+	bool onlyFrontWheels = false;
+	if(IsRealHeli()){
+		// top rotor
+		m_aWheelRotation[1] += m_aWheelSpeed[1]*CTimer::GetTimeStep();
+		if(m_aWheelRotation[1] > TWOPI) m_aWheelRotation[1] -= TWOPI;
+		// rear rotor
+		m_aWheelRotation[3] += m_aWheelSpeed[1]*CTimer::GetTimeStep();
+		if(m_aWheelRotation[3] > TWOPI) m_aWheelRotation[3] -= TWOPI;
+		onlyFrontWheels = true;
 	}
 
 	CVector contactPoints[4];	// relative to model
@@ -1951,7 +2545,7 @@ CAutomobile::Render(void)
 	CVector frontWheelFwd = Multiply3x3(GetMatrix(), CVector(-Sin(m_fSteerAngle), Cos(m_fSteerAngle), 0.0f));
 	CVector rearWheelFwd = GetForward();
 	for(i = 0; i < 4; i++){
-		if (m_aWheelTimer[i] > 0.0f) {
+		if (m_aWheelTimer[i] > 0.0f && (!onlyFrontWheels || i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_FRONT_RIGHT)) {
 			contactPoints[i] = m_aWheelColPoints[i].point - GetPosition();
 			contactSpeeds[i] = GetSpeed(contactPoints[i]);
 			if (i == CARWHEEL_FRONT_LEFT || i == CARWHEEL_FRONT_RIGHT)
@@ -1962,75 +2556,146 @@ CAutomobile::Render(void)
 		}
 	}
 
+	RwRGBA hoverParticleCol = { 255, 255, 255, 32 };
+
 	// Rear right wheel
 	mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_RB]));
-	pos.x = mat.GetPosition().x;
-	pos.y = mat.GetPosition().y;
+	pos = mat.GetPosition();
 	pos.z = m_aWheelPosition[CARWHEEL_REAR_RIGHT];
 	if(Damage.GetWheelStatus(CARWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
 		mat.SetRotate(m_aWheelRotation[CARWHEEL_REAR_RIGHT], 0.0f, 0.3f*Sin(m_aWheelRotation[CARWHEEL_REAR_RIGHT]));
 	else
 		mat.SetRotateX(m_aWheelRotation[CARWHEEL_REAR_RIGHT]);
-	mat.Scale(mi->m_wheelScale);
+	if(GetStatus() == STATUS_PLAYER){
+		if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_REAR_RIGHT] < 1.0f &&
+		   m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB == SURFACE_WATER){
+			// hovering on water
+			mat.RotateY(-HALFPI);
+			if((CTimer::GetFrameCounter()+CARWHEEL_REAR_RIGHT) & 1){
+				CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, m_aWheelColPoints[CARWHEEL_REAR_RIGHT].point,
+					0.5f*m_vecMoveSpeed+0.1f*GetRight(), nil, 0.4f, hoverParticleCol);
+			}else{
+				CParticle::AddParticle(PARTICLE_CAR_SPLASH, m_aWheelColPoints[CARWHEEL_REAR_RIGHT].point,
+					0.3f*m_vecMoveSpeed+0.15f*GetRight()+CVector(0.0f, 0.0f, 0.1f), nil, 0.15f, hoverParticleCol,
+					CGeneral::GetRandomNumberInRange(0.0f, 90.0f),
+					CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1);
+			}
+		}else{
+			// tilt wheel depending oh how much it presses on ground
+			float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+			if(GetModelIndex() == MI_VOODOO)
+				groundOffset *= 0.6f;
+			mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+		}
+	}
+	if(pHandling->Flags & HANDLING_FAT_REARW)
+		mat.Scale(1.15f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+	else
+		mat.Scale(mi->m_wheelScale);
 	mat.Translate(pos);
 	mat.UpdateRW();
-	if(CVehicle::bWheelsOnlyCheat)
-		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RB]));
 
 	// Rear left wheel
 	mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LB]));
-	pos.x = mat.GetPosition().x;
-	pos.y = mat.GetPosition().y;
+	pos = mat.GetPosition();
 	pos.z = m_aWheelPosition[CARWHEEL_REAR_LEFT];
 	if(Damage.GetWheelStatus(CARWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
-		mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI+0.3f*Sin(-m_aWheelRotation[CARWHEEL_REAR_LEFT]));
+		mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI+0.3f*Sin(m_aWheelRotation[CARWHEEL_REAR_LEFT]));
 	else
 		mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI);
-	mat.Scale(mi->m_wheelScale);
+	if(GetStatus() == STATUS_PLAYER){
+		if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_REAR_LEFT] < 1.0f &&
+		   m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB == SURFACE_WATER){
+			// hovering on water
+			mat.RotateY(HALFPI);
+			if((CTimer::GetFrameCounter()+CARWHEEL_REAR_LEFT) & 1){
+				CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, m_aWheelColPoints[CARWHEEL_REAR_LEFT].point,
+					0.5f*m_vecMoveSpeed-0.1f*GetRight(), nil, 0.4f, hoverParticleCol);
+			}else{
+				CParticle::AddParticle(PARTICLE_CAR_SPLASH, m_aWheelColPoints[CARWHEEL_REAR_LEFT].point,
+					0.3f*m_vecMoveSpeed-0.15f*GetRight()+CVector(0.0f, 0.0f, 0.1f), nil, 0.15f, hoverParticleCol,
+					CGeneral::GetRandomNumberInRange(0.0f, 90.0f),
+					CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1);
+			}
+		}else{
+			// tilt wheel depending oh how much it presses on ground
+			float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+			if(GetModelIndex() == MI_VOODOO)
+				groundOffset *= 0.6f;
+			mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+		}
+	}
+	if(pHandling->Flags & HANDLING_FAT_REARW)
+		mat.Scale(1.15f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+	else
+		mat.Scale(mi->m_wheelScale);
 	mat.Translate(pos);
 	mat.UpdateRW();
-	if(CVehicle::bWheelsOnlyCheat)
-		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]));
 
 	// Mid right wheel
 	if(m_aCarNodes[CAR_WHEEL_RM]){
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_RM]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_REAR_RIGHT];
 		if(Damage.GetWheelStatus(CARWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
 			mat.SetRotate(m_aWheelRotation[CARWHEEL_REAR_RIGHT], 0.0f, 0.3f*Sin(m_aWheelRotation[CARWHEEL_REAR_RIGHT]));
 		else
 			mat.SetRotateX(m_aWheelRotation[CARWHEEL_REAR_RIGHT]);
-		mat.Scale(mi->m_wheelScale);
+		if(GetStatus() == STATUS_PLAYER){
+			if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_REAR_RIGHT] < 1.0f &&
+			   m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB == SURFACE_WATER){
+				// hovering on water
+				mat.RotateY(-HALFPI);
+			}else{
+				// tilt wheel depending oh how much it presses on ground
+				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+				if(GetModelIndex() == MI_VOODOO)
+					groundOffset *= 0.6f;
+				mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+			}
+		}
+		if(pHandling->Flags & HANDLING_FAT_REARW)
+			mat.Scale(1.15f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+		else
+			mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RM]));
 	}
 
 	// Mid left wheel
 	if(m_aCarNodes[CAR_WHEEL_LM]){
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LM]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_REAR_LEFT];
 		if(Damage.GetWheelStatus(CARWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
-			mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI+0.3f*Sin(-m_aWheelRotation[CARWHEEL_REAR_LEFT]));
+			mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI+0.3f*Sin(m_aWheelRotation[CARWHEEL_REAR_LEFT]));
 		else
 			mat.SetRotate(-m_aWheelRotation[CARWHEEL_REAR_LEFT], 0.0f, PI);
-		mat.Scale(mi->m_wheelScale);
+		if(GetStatus() == STATUS_PLAYER){
+			if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_REAR_LEFT] < 1.0f &&
+			   m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB == SURFACE_WATER){
+				// hovering on water
+				mat.RotateY(HALFPI);
+			}else{
+				// tilt wheel depending oh how much it presses on ground
+				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+				if(GetModelIndex() == MI_VOODOO)
+					groundOffset *= 0.6f;
+				mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+			}
+		}
+		if(pHandling->Flags & HANDLING_FAT_REARW)
+			mat.Scale(1.15f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+		else
+			mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LM]));
 	}
 
 	if(GetModelIndex() == MI_DODO){
 		// Front wheel
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_RF]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_FRONT_RIGHT];
 		if(Damage.GetWheelStatus(CARWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
 			mat.SetRotate(m_aWheelRotation[CARWHEEL_FRONT_RIGHT], 0.0f, m_fSteerAngle+0.3f*Sin(m_aWheelRotation[CARWHEEL_FRONT_RIGHT]));
@@ -2039,8 +2704,6 @@ CAutomobile::Render(void)
 		mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]));
 
 		// Rotate propeller
 		if(m_aCarNodes[CAR_WINDSCREEN]){
@@ -2070,59 +2733,130 @@ CAutomobile::Render(void)
 	}else if(GetModelIndex() == MI_RHINO){
 		// Front right wheel
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_RF]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_FRONT_RIGHT];
 		// no damaged wheels or steering
 		mat.SetRotate(m_aWheelRotation[CARWHEEL_FRONT_RIGHT], 0.0f, 0.0f);
 		mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]));
 
 		// Front left wheel
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LF]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_FRONT_LEFT];
 		// no damaged wheels or steering
 		mat.SetRotate(-m_aWheelRotation[CARWHEEL_FRONT_LEFT], 0.0f, PI);
 		mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]));
+	}else if(IsRealHeli()){
+		// Top rotor
+		if(m_aCarNodes[CAR_BONNET]){
+			mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));
+			pos = mat.GetPosition();
+			mat.SetRotateZ(m_aWheelRotation[1]);
+			mat.Translate(pos);
+			mat.UpdateRW();
+		}
+		// Blurred top rotor
+		if(m_aCarNodes[CAR_WINDSCREEN]){
+			mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WINDSCREEN]));
+			pos = mat.GetPosition();
+			mat.SetRotateZ(-m_aWheelRotation[1]);
+			mat.Translate(pos);
+			mat.UpdateRW();
+		}
+		// Rear rotor
+		if(m_aCarNodes[CAR_BOOT]){
+			mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BOOT]));
+			pos = mat.GetPosition();
+			mat.SetRotateX(m_aWheelRotation[3]);
+			mat.Translate(pos);
+			mat.UpdateRW();
+		}
+		// Blurred rear rotor
+		if(m_aCarNodes[CAR_BUMP_REAR]){
+			mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BUMP_REAR]));
+			pos = mat.GetPosition();
+			mat.SetRotateX(-m_aWheelRotation[3]);
+			mat.Translate(pos);
+			mat.UpdateRW();
+		}
 	}else{
 		// Front right wheel
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_RF]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_FRONT_RIGHT];
 		if(Damage.GetWheelStatus(CARWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
 			mat.SetRotate(m_aWheelRotation[CARWHEEL_FRONT_RIGHT], 0.0f, m_fSteerAngle+0.3f*Sin(m_aWheelRotation[CARWHEEL_FRONT_RIGHT]));
 		else
 			mat.SetRotate(m_aWheelRotation[CARWHEEL_FRONT_RIGHT], 0.0f, m_fSteerAngle);
-		mat.Scale(mi->m_wheelScale);
+		if(GetStatus() == STATUS_PLAYER){
+			if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_FRONT_RIGHT] < 1.0f &&
+			   m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceB == SURFACE_WATER){
+				// hovering on water
+				mat.RotateY(-HALFPI);
+				if((CTimer::GetFrameCounter()+CARWHEEL_FRONT_RIGHT) & 1){
+					CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].point,
+						0.5f*m_vecMoveSpeed+0.1f*GetRight(), nil, 0.4f, hoverParticleCol);
+				}else{
+					CParticle::AddParticle(PARTICLE_CAR_SPLASH, m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].point,
+						0.3f*m_vecMoveSpeed+0.15f*GetRight()+CVector(0.0f, 0.0f, 0.1f), nil, 0.15f, hoverParticleCol,
+						CGeneral::GetRandomNumberInRange(0.0f, 90.0f),
+						CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1);
+				}
+			}else{
+				// tilt wheel depending oh how much it presses on ground
+				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+				if(GetModelIndex() == MI_VOODOO)
+					groundOffset *= 0.6f;
+				mat.RotateY(Asin(clamp(-groundOffset, -1.0f, 1.0f)));
+			}
+		}
+		if(pHandling->Flags & HANDLING_NARROW_FRONTW)
+			mat.Scale(0.7f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+		else
+			mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]));
 
 		// Front left wheel
 		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WHEEL_LF]));
-		pos.x = mat.GetPosition().x;
-		pos.y = mat.GetPosition().y;
+		pos = mat.GetPosition();
 		pos.z = m_aWheelPosition[CARWHEEL_FRONT_LEFT];
 		if(Damage.GetWheelStatus(CARWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
-			mat.SetRotate(-m_aWheelRotation[CARWHEEL_FRONT_LEFT], 0.0f, PI+m_fSteerAngle+0.3f*Sin(-m_aWheelRotation[CARWHEEL_FRONT_LEFT]));
+			mat.SetRotate(-m_aWheelRotation[CARWHEEL_FRONT_LEFT], 0.0f, PI+m_fSteerAngle+0.3f*Sin(m_aWheelRotation[CARWHEEL_FRONT_LEFT]));
 		else
 			mat.SetRotate(-m_aWheelRotation[CARWHEEL_FRONT_LEFT], 0.0f, PI+m_fSteerAngle);
-		mat.Scale(mi->m_wheelScale);
+		if(GetStatus() == STATUS_PLAYER){
+			if(bHoverCheat && m_aSuspensionSpringRatioPrev[CARWHEEL_FRONT_LEFT] < 1.0f &&
+			   m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceB == SURFACE_WATER){
+				// hovering on water
+				mat.RotateY(HALFPI);
+				if((CTimer::GetFrameCounter()+CARWHEEL_FRONT_LEFT) & 1){
+					CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].point,
+						0.5f*m_vecMoveSpeed-0.1f*GetRight(), nil, 0.4f, hoverParticleCol);
+				}else{
+					CParticle::AddParticle(PARTICLE_CAR_SPLASH, m_aWheelColPoints[CARWHEEL_FRONT_LEFT].point,
+						0.3f*m_vecMoveSpeed-0.15f*GetRight()+CVector(0.0f, 0.0f, 0.1f), nil, 0.15f, hoverParticleCol,
+						CGeneral::GetRandomNumberInRange(0.0f, 90.0f),
+						CGeneral::GetRandomNumberInRange(0.0f, 10.0f), 1);
+				}
+			}else{
+				// tilt wheel depending oh how much it presses on ground
+				float groundOffset = pos.z + m_fHeightAboveRoad - 0.5f*mi->m_wheelScale;
+				if(GetModelIndex() == MI_VOODOO)
+					groundOffset *= 0.6f;
+				mat.RotateY(Asin(clamp(groundOffset, -1.0f, 1.0f)));
+			}
+		}
+		if(pHandling->Flags & HANDLING_NARROW_FRONTW)
+			mat.Scale(0.7f*mi->m_wheelScale, mi->m_wheelScale, mi->m_wheelScale);
+		else
+			mat.Scale(mi->m_wheelScale);
 		mat.Translate(pos);
 		mat.UpdateRW();
-		if(CVehicle::bWheelsOnlyCheat)
-			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]));
 
 		ProcessSwingingDoor(CAR_DOOR_LF, DOOR_FRONT_LEFT);
 		ProcessSwingingDoor(CAR_DOOR_RF, DOOR_FRONT_RIGHT);
@@ -2130,11 +2864,104 @@ CAutomobile::Render(void)
 		ProcessSwingingDoor(CAR_DOOR_RR, DOOR_REAR_RIGHT);
 		ProcessSwingingDoor(CAR_BONNET, DOOR_BONNET);
 		ProcessSwingingDoor(CAR_BOOT, DOOR_BOOT);
+	}
+
+	if((GetModelIndex() == MI_PHEONIX || GetModelIndex() == MI_BFINJECT) &&
+	   GetStatus() == STATUS_PLAYER && m_aCarNodes[CAR_WING_LR]){
+		float rotation = 0.0f;
+
+		if(GetModelIndex() == MI_BFINJECT)
+			if(m_fPropellerRotation > TWOPI) m_fPropellerRotation -= TWOPI;
+
+		if(Abs(m_fGasPedal) > 0.0f){
+			if(GetModelIndex() == MI_BFINJECT){
+				m_fPropellerRotation += 0.2f*CTimer::GetTimeStep();
+				rotation = m_fPropellerRotation;
+			}else{
+				if(m_fPropellerRotation < 1.3f){
+					m_fPropellerRotation = Min(m_fPropellerRotation+0.1f*CTimer::GetTimeStep(), 1.3f);
+					rotation = m_fPropellerRotation;
+				}else{
+					float wave = Sin((CTimer::GetTimeInMilliseconds()%10000)/70.0f);
+					rotation = m_fPropellerRotation + 0.13*wave;
+				}
+			}
+		}else{
+			if(GetModelIndex() == MI_BFINJECT){
+				m_fPropellerRotation += 0.1f*CTimer::GetTimeStep();
+				rotation = m_fPropellerRotation;
+			}else{
+				if(m_fPropellerRotation > 0.0f){
+					m_fPropellerRotation = Max(m_fPropellerRotation-0.05f*CTimer::GetTimeStep(), 0.0f);
+					rotation = m_fPropellerRotation;
+				}
+			}
+		}
+
+		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WING_LR]));
+		pos = mat.GetPosition();
+		if(GetModelIndex() == MI_BFINJECT)
+			mat.SetRotateY(rotation);
+		else
+			mat.SetRotateX(rotation);
+		mat.Translate(pos);
+		mat.UpdateRW();
+	}
+}
 
-		mi->SetVehicleColour(m_currentColour1, m_currentColour2);
+void
+CAutomobile::Render(void)
+{
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+
+	mi->SetVehicleColour(m_currentColour1, m_currentColour2);
+
+	if(IsRealHeli()){
+		RpAtomic *atomic = nil;
+		int rotorAlpha = (1.5f - Min(1.7f*Max(m_aWheelSpeed[1],0.0f)/0.22f, 1.5f))*255.0f;
+		rotorAlpha = Min(rotorAlpha, 255);
+		int blurAlpha = Max(1.5f*m_aWheelSpeed[1]/0.22f - 0.4f, 0.0f)*150.0f;
+		blurAlpha = Min(blurAlpha, 150);
+
+		// Top rotor
+		if(m_aCarNodes[CAR_BONNET]){
+			RwFrameForAllObjects(m_aCarNodes[CAR_BONNET], GetCurrentAtomicObjectCB, &atomic);
+			if(atomic)
+				SetComponentAtomicAlpha(atomic, rotorAlpha);
+		}
+		atomic = nil;
+		// Rear rotor
+		if(m_aCarNodes[CAR_BOOT]){
+			RwFrameForAllObjects(m_aCarNodes[CAR_BOOT], GetCurrentAtomicObjectCB, &atomic);
+			if(atomic)
+				SetComponentAtomicAlpha(atomic, rotorAlpha);
+		}
+		atomic = nil;
+		// Blurred top rotor
+		if(m_aCarNodes[CAR_WINDSCREEN]){
+			RwFrameForAllObjects(m_aCarNodes[CAR_WINDSCREEN], GetCurrentAtomicObjectCB, &atomic);
+			if(atomic)
+				SetComponentAtomicAlpha(atomic, blurAlpha);
+		}
+		atomic = nil;
+		// Blurred rear rotor
+		if(m_aCarNodes[CAR_BUMP_REAR]){
+			RwFrameForAllObjects(m_aCarNodes[CAR_BUMP_REAR], GetCurrentAtomicObjectCB, &atomic);
+			if(atomic)
+				SetComponentAtomicAlpha(atomic, blurAlpha);
+		}
 	}
 
-	if(!CVehicle::bWheelsOnlyCheat)
+	if(CVehicle::bWheelsOnlyCheat){
+		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RB]));
+		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]));
+		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]));
+		RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]));
+		if(m_aCarNodes[CAR_WHEEL_RM])
+			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RM]));
+		if(m_aCarNodes[CAR_WHEEL_LM])
+			RpAtomicRender((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LM]));
+	}else
 		CEntity::Render();
 }
 
@@ -2157,6 +2984,10 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
 	for(i = 0; i < 4; i++)
 		prevRatios[i] = m_aSuspensionSpringRatio[i];
 
+	if(m_bIsVehicleBeingShifted || bSkipLineCol || ent->IsPed() ||
+	   GetModelIndex() == MI_DODO && ent->IsVehicle())
+		colModel->numLines = 0;
+
 	int numCollisions = CCollision::ProcessColModels(GetMatrix(), *colModel,
 		ent->GetMatrix(), *ent->GetColModel(),
 		colpoints,
@@ -2165,12 +2996,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
 	// m_aSuspensionSpringRatio are now set to the point where the tyre touches ground.
 	// In ProcessControl these will be re-normalized to ignore the tyre radius.
 
-	if(m_bIsVehicleBeingShifted || bSkipLineCol ||
-	   GetModelIndex() == MI_DODO && (ent->IsPed() || ent->IsVehicle())){
-		// don't do line collision
-		for(i = 0; i < 4; i++)
-			m_aSuspensionSpringRatio[i] = prevRatios[i];
-	}else{
+	if(colModel->numLines){
 		for(i = 0; i < 4; i++)
 			if(m_aSuspensionSpringRatio[i] < 1.0f && m_aSuspensionSpringRatio[i] < prevRatios[i]){
 				numWheelCollisions++;
@@ -2182,30 +3008,14 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
 					m_aGroundPhysical[i] = phys;
 					phys->RegisterReference((CEntity**)&m_aGroundPhysical[i]);
 					m_aGroundOffset[i] = m_aWheelColPoints[i].point - phys->GetPosition();
-
-					if(phys->GetModelIndex() == MI_BODYCAST && GetStatus() == STATUS_PLAYER){
-						// damage body cast
-						float speed = m_vecMoveSpeed.MagnitudeSqr();
-						if(speed > 0.1f){
-							CObject::nBodyCastHealth -= 0.1f*m_fMass*speed;
-							DMAudio.PlayOneShot(m_audioEntityId, SOUND_PED_BODYCAST_HIT, 0.0f);
-						}
-
-						// move body cast
-						if(phys->IsStatic()){
-							phys->bIsStatic = false;
-							phys->m_nStaticFrames = 0;
-							phys->ApplyMoveForce(m_vecMoveSpeed / Sqrt(speed));
-							phys->AddToMovingList();
-						}
-					}
 				}
 
 				m_nSurfaceTouched = m_aWheelColPoints[i].surfaceB;
 				if(ent->IsBuilding())
 					m_pCurGroundEntity = ent;
 			}
-	}
+	}else
+		colModel->numLines = 4;
 
 	if(numCollisions > 0 || numWheelCollisions > 0){
 		AddCollisionRecord(ent);
@@ -2231,10 +3041,12 @@ CAutomobile::ProcessControlInputs(uint8 pad)
 {
 	float speed = DotProduct(m_vecMoveSpeed, GetForward());
 
-	if(CPad::GetPad(pad)->GetExitVehicle())
-		bIsHandbrakeOn = true;
-	else
+	if(!CPad::GetPad(pad)->GetExitVehicle() ||
+	   pDriver && pDriver->m_pVehicleAnim && (pDriver->m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_LHS ||
+	                                          pDriver->m_pVehicleAnim->animId == ANIM_CAR_ROLLOUT_RHS))
 		bIsHandbrakeOn = !!CPad::GetPad(pad)->GetHandBrake();
+	else
+		bIsHandbrakeOn = true;
 
 	// Steer left/right
 	if(CCamera::m_bUseMouse3rdPerson && !CVehicle::m_bDisableMouseSteering){
@@ -2262,8 +3074,14 @@ CAutomobile::ProcessControlInputs(uint8 pad)
 		acceleration *= 0.3f;
 	if(Abs(speed) < 0.01f){
 		// standing still, go into direction we want
-		m_fGasPedal = acceleration;
-		m_fBrakePedal = 0.0f;
+		if(CPad::GetPad(pad)->GetAccelerate() > 150.0f && CPad::GetPad(pad)->GetBrake() > 150.0f){
+			m_fGasPedal = CPad::GetPad(pad)->GetAccelerate()/255.0f;
+			m_fBrakePedal = CPad::GetPad(pad)->GetBrake()/255.0f;
+			m_doingBurnout = 1;
+		}else{
+			m_fGasPedal = acceleration;
+			m_fBrakePedal = 0.0f;
+		}
 	}else{
 #if 1
 		// simpler than the code below
@@ -2312,17 +3130,6 @@ CAutomobile::ProcessControlInputs(uint8 pad)
 	m_fSteerAngle = DEGTORAD(pHandling->fSteeringLock) * fValue;
 
 	if(bComedyControls){
-#if 0	// old comedy controls from PS2 - same as bike's
-		if(((CTimer::GetTimeInMilliseconds() >> 10) & 0xF) < 12)
-			m_fGasPedal = 1.0f;
-		if((((CTimer::GetTimeInMilliseconds() >> 10)+6) & 0xF) < 12)
-			m_fBrakePedal = 0.0f;
-		bIsHandbrakeOn = false;
-		if(CTimer::GetTimeInMilliseconds() & 0x800)
-			m_fSteerAngle += 0.08f;
-		else
-			m_fSteerAngle -= 0.03f;
-#else
 		int rnd = CGeneral::GetRandomNumber() % 10;
 		switch(m_comedyControlState){
 		case 0:
@@ -2342,10 +3149,8 @@ CAutomobile::ProcessControlInputs(uint8 pad)
 				m_comedyControlState = 0;
 			break;
 		}
-	}else{
+	}else
 		m_comedyControlState = 0;
-#endif
-	}
 
 	// Brake if player isn't in control
 	// BUG: game always uses pad 0 here
@@ -2524,22 +3329,10 @@ CAutomobile::TankControl(void)
 		flashPos += 0.1f*shotDir;
 		CParticle::AddParticle(PARTICLE_GUNFLASH, flashPos, nullDir, nil, 0.15f, black, 0, 0, 0, lifeSpan);
 	}
-
-	// Actually update turret node
-	if(m_aCarNodes[CAR_WINDSCREEN]){
-		CMatrix mat;
-		CVector pos;
-
-		mat.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_WINDSCREEN]));
-		pos = mat.GetPosition();
-		mat.SetRotateZ(m_fCarGunLR);
-		mat.Translate(pos);
-		mat.UpdateRW();
-	}
 }
 
-#define HYDRAULIC_UPPER_EXT (-0.12f)
-#define HYDRAULIC_LOWER_EXT (0.14f)
+#define HYDRAULIC_UPPER_EXT (-0.16f)
+#define HYDRAULIC_LOWER_EXT (0.16f)
 
 void
 CAutomobile::HydraulicControl(void)
@@ -2647,8 +3440,6 @@ CAutomobile::HydraulicControl(void)
 	if(m_hydraulicState < 20 && m_fVelocityChangeForAudio > 0.2f){
 		if(m_hydraulicState == 0){
 			m_hydraulicState = 20;
-			for(i = 0; i < 4; i++)
-				m_aWheelPosition[i] -= 0.06f;
 			DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_HYDRAULIC_1, 0.0f);
 			setPrevRatio = true;
 		}else{
@@ -2722,7 +3513,6 @@ CAutomobile::HydraulicControl(void)
 				}
 
 				setPrevRatio = true;
-				m_aWheelPosition[i] -= 0.05f;
 			}
 			DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_HYDRAULIC_2, 0.0f);
 		}
@@ -2753,7 +3543,6 @@ CAutomobile::HydraulicControl(void)
 				if(suspChange[i] > 1.0f)
 					suspChange[i] = 1.0f;
 
-				float oldZ = specialColModel->lines[i].p1.z;
 				float upperLimit = suspChange[i]*(extendedUpperLimit-normalUpperLimit) + normalUpperLimit;
 				float springLength = suspChange[i]*(extendedSpringLength-normalSpringLength) + normalSpringLength;
 				float lineLength = springLength + wheelRadius;
@@ -2773,15 +3562,11 @@ CAutomobile::HydraulicControl(void)
 					m_aSuspensionSpringRatio[i] = (specialColModel->lines[i].p0.z - wheelPositions[i])/m_aSuspensionLineLength[i];
 					if(m_aSuspensionSpringRatio[i] > 1.0f)
 						m_aSuspensionSpringRatio[i] = 1.0f;
-					m_aWheelPosition[i] -= (oldZ - specialColModel->lines[i].p1.z)*0.3f;
 				}
 			}
 		}else{
-			if(m_hydraulicState < 104){
+			if(m_hydraulicState < 104)
 				m_hydraulicState++;
-				for(i = 0; i < 4; i++)
-					m_aWheelPosition[i] -= 0.1f;
-			}
 
 			if(m_fVelocityChangeForAudio < 0.1f){
 				normalUpperLimit += HYDRAULIC_UPPER_EXT;
@@ -2847,19 +3632,47 @@ CAutomobile::ProcessBuoyancy(void)
 	CVector impulse, point;
 
 	if(mod_Buoyancy.ProcessBuoyancy(this, m_fBuoyancy, &point, &impulse)){
-		bTouchingWater = true;
-		ApplyMoveForce(impulse);
-		ApplyTurnForce(impulse, point);
-
-		CVector initialSpeed = m_vecMoveSpeed;
 		float timeStep = Max(CTimer::GetTimeStep(), 0.01f);
 		float impulseRatio = impulse.z / (GRAVITY * m_fMass * timeStep);
 		float waterResistance = Pow(1.0f - 0.05f*impulseRatio, CTimer::GetTimeStep());
 		m_vecMoveSpeed *= waterResistance;
 		m_vecTurnSpeed *= waterResistance;
 
-		if(impulseRatio > 0.5f){
+		bool heliHitWaterHard = false;
+		if(IsRealHeli() && m_aWheelSpeed[1] > 0.15f){
+			if(GetModelIndex() == MI_SEASPAR){
+				if(impulseRatio > 3.0f){
+					m_aWheelSpeed[1] = 0.0f;
+					heliHitWaterHard = true;
+				}
+			}else{
+				float strength = 1.0f/Max(8.0f*impulseRatio, 1.0f);
+				ApplyMoveForce(-2.0f*impulse/strength);
+				ApplyTurnForce(-impulse/strength, point);
+				if(impulseRatio > 0.9f){
+					m_aWheelSpeed[1] = 0.0f;
+					heliHitWaterHard = true;
+				}else
+					return;
+			}
+		}
+
+		bTouchingWater = true;
+		ApplyMoveForce(impulse);
+		ApplyTurnForce(impulse, point);
+		CVector initialSpeed = m_vecMoveSpeed;
+
+		if(m_modelIndex == MI_SEASPAR && impulseRatio < 3.0f && (GetUp().z > -0.5f || impulseRatio < 0.6f) ||
+		   CVehicle::bHoverCheat && GetStatus() == STATUS_PLAYER && GetUp().z > 0.1f){
+			bIsInWater = false;
+			bIsDrowning = false;
+		}else if(heliHitWaterHard || impulseRatio > 1.0f ||
+		         impulseRatio > 0.6f && (m_aSuspensionSpringRatio[0] == 1.0f ||
+		                                 m_aSuspensionSpringRatio[1] == 1.0f ||
+		                                 m_aSuspensionSpringRatio[2] == 1.0f ||
+		                                 m_aSuspensionSpringRatio[3] == 1.0f)){
 			bIsInWater = true;
+			bIsDrowning = true;
 			if(m_vecMoveSpeed.z < -0.1f)
 				m_vecMoveSpeed.z = -0.1f;
 
@@ -2874,49 +3687,35 @@ CAutomobile::ProcessBuoyancy(void)
 					if(pPassengers[i]->IsPlayer() || !bWaterTight)
 						pPassengers[i]->InflictDamage(nil, WEAPONTYPE_DROWNING, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
 				}
-		}else
+		}else{
 			bIsInWater = false;
+			bIsDrowning = false;
+		}
 
 		static uint32 nGenerateRaindrops = 0;
 		static uint32 nGenerateWaterCircles = 0;
 
-		if(initialSpeed.z < -0.3f && impulse.z > 0.3f){
-#if defined(PC_PARTICLE) || defined (PS2_ALTERNATIVE_CARSPLASH)
+		if(initialSpeed.z < -0.1f && impulse.z > 0.3f || heliHitWaterHard){
 			RwRGBA color;
-			color.red = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed())*0.45f*255;
-			color.green = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen())*0.45f*255;
-			color.blue = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue())*0.45f*255;
+			color.red = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed_Obj())*0.45f*255;
+			color.green = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen_Obj())*0.45f*255;
+			color.blue = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue_Obj())*0.45f*255;
 			color.alpha = CGeneral::GetRandomNumberInRange(0, 32) + 128;
+			CVector target = CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.15f, 0.45f));
 			CParticleObject::AddObject(POBJECT_CAR_WATER_SPLASH, GetPosition(),
-				CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.15f, 0.3f)),
-				0.0f, 75, color, true);
-#else
-			CVector pos = (initialSpeed * 2.0f) + (GetPosition() + point);
-	
-			for ( int32 i = 0; i < 360; i += 4 )
-			{
-				float fSin = Sin(float(i));
-				float fCos = Cos(float(i));
-				
-				CVector dir(fSin*0.01f, fCos*0.01f, CGeneral::GetRandomNumberInRange(0.25f, 0.45f));
-				
-				CParticle::AddParticle(PARTICLE_CAR_SPLASH,
-					pos + CVector(fSin*4.5f, fCos*4.5f, 0.0f),
-					dir, NULL, 0.0f, CRGBA(225, 225, 255, 180));
-	
-				for ( int32 j = 0; j < 3; j++ )
-				{
-					float fMul = 1.5f * float(j + 1);
-					
-					CParticle::AddParticle(PARTICLE_CAR_SPLASH,
-						pos + CVector(fSin * fMul, fCos * fMul, 0.0f),
-						dir, NULL, 0.0f, CRGBA(225, 225, 255, 180));                      
-				}
-			}
-#endif
+				target, 0.0f, 75, color, true);
 
 			nGenerateRaindrops = CTimer::GetTimeInMilliseconds() + 300;
 			nGenerateWaterCircles = CTimer::GetTimeInMilliseconds() + 60;
+
+			if(heliHitWaterHard){
+				CVector right = CrossProduct(GetForward(), CVector(0.0f, 0.0f, 1.0f));
+				CParticleObject::AddObject(POBJECT_CAR_WATER_SPLASH, GetPosition() + right,
+					target, 0.0f, 75, color, true);
+				CParticleObject::AddObject(POBJECT_CAR_WATER_SPLASH, GetPosition() - right,
+					target, 0.0f, 75, color, true);
+			}
+
 			if(m_vecMoveSpeed.z < -0.2f)
 				m_vecMoveSpeed.z = -0.2f;
 			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WATER_FALL, 0.0f);
@@ -2957,6 +3756,7 @@ CAutomobile::ProcessBuoyancy(void)
 		}
 	}else{
 		bIsInWater = false;
+		bIsDrowning = false;
 		bTouchingWater = false;
 
 		static RwRGBA splashCol = {155, 155, 185, 196};
@@ -2967,13 +3767,7 @@ CAutomobile::ProcessBuoyancy(void)
 				CVector pos = m_aWheelColPoints[i].point + 0.3f*GetUp() - GetPosition();
 				CVector vSpeed = GetSpeed(pos);
 				vSpeed.z = 0.0f;
-#ifdef GTA_PS2_STUFF
-				// ps2 puddle physics
-				CVector moveForce = CTimer::GetTimeStep() * (m_fMass * (vSpeed * -0.003f));
-				ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z);
-#endif
 				float fSpeed = vSpeed.MagnitudeSqr();
-#ifdef PC_PARTICLE
 				if(fSpeed > sq(0.05f)){
 					fSpeed = Sqrt(fSpeed);
 
@@ -2993,35 +3787,6 @@ CAutomobile::ProcessBuoyancy(void)
 					if((CTimer::GetFrameCounter() & 0xF) == 0)
 						DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_SPLASH, 2000.0f*fSpeed);
 				}
-#else
-				if ( ( (CTimer::GetFrameCounter() + i) & 3 ) == 0 )
-				{
-					if(fSpeed > sq(0.05f))
-					{
-						fSpeed = Sqrt(fSpeed);
-						CRGBA color(155, 185, 155, 255);
-						float boxY = GetColModel()->boundingBox.max.y;
-						CVector right = 0.5f * GetRight();
-						
-						if ( i == 2 )
-						{
-							CParticle::AddParticle(PARTICLE_PED_SPLASH,
-								GetPosition() + (boxY * GetForward()) + right,
-								0.75f*m_vecMoveSpeed, NULL, 0.0f, color);
-			
-						}
-						else if ( i == 0 )
-						{
-							CParticle::AddParticle(PARTICLE_PED_SPLASH,
-								GetPosition() + (boxY * GetForward()) - right,
-								0.75f*m_vecMoveSpeed, NULL, 0.0f, color);
-						}
-						
-						if((CTimer::GetFrameCounter() & 0xF) == 0)
-							DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_SPLASH, 2000.0f*fSpeed);
-					}
-				}
-#endif	
 			}
 		}
 	}
@@ -3030,16 +3795,21 @@ CAutomobile::ProcessBuoyancy(void)
 void
 CAutomobile::DoDriveByShootings(void)
 {
-	CAnimBlendAssociation *anim;
+	CAnimBlendAssociation *anim = nil;
+	CPlayerInfo* playerInfo = ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed();
+	if (playerInfo && !playerInfo->m_bDriveByAllowed)
+		return;
+
 	CWeapon *weapon = pDriver->GetWeapon();
-	if(weapon->m_eWeaponType != WEAPONTYPE_UZI)
+	if(CWeaponInfo::GetWeaponInfo(weapon->m_eWeaponType)->m_nWeaponSlot != 5)
 		return;
 
-	weapon->Update(pDriver->m_audioEntityId);
+	weapon->Update(pDriver->m_audioEntityId, nil);
 
 	bool lookingLeft = false;
 	bool lookingRight = false;
-	if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN){
+	if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN ||
+	   TheCamera.m_bObbeCinematicCarCamOn){
 		if(CPad::GetPad(0)->GetLookLeft())
 			lookingLeft = true;
 		if(CPad::GetPad(0)->GetLookRight())
@@ -3051,37 +3821,42 @@ CAutomobile::DoDriveByShootings(void)
 			lookingRight = true;
 	}
 
+	AnimationId rightAnim = ANIM_DRIVEBY_R;
+	AnimationId leftAnim = ANIM_DRIVEBY_L;
+	if (pDriver->m_pMyVehicle->bLowVehicle) {
+		rightAnim = ANIM_DRIVEBY_LOW_R;
+		leftAnim = ANIM_DRIVEBY_LOW_L;
+	}
+
 	if(lookingLeft || lookingRight){
 		if(lookingLeft){
-			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), rightAnim);
 			if(anim)
 				anim->blendDelta = -1000.0f;
-			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), leftAnim);
 			if(anim == nil || anim->blendDelta < 0.0f)
-				CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, ANIM_DRIVEBY_L);
-			else
-				anim->SetRun();
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, leftAnim);
 		}else if(pDriver->m_pMyVehicle->pPassengers[0] == nil || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON){
-			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), leftAnim);
 			if(anim)
 				anim->blendDelta = -1000.0f;
-			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), rightAnim);
 			if(anim == nil || anim->blendDelta < 0.0f)
-				CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, ANIM_DRIVEBY_R);
-			else
-				anim->SetRun();
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, rightAnim);
 		}
 
-		if(CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer){
-			weapon->FireFromCar(this, lookingLeft);
-			weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
+		if (!anim || !anim->IsRunning()) {
+			if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
+				weapon->FireFromCar(this, lookingLeft, true);
+				weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
+			}
 		}
 	}else{
 		weapon->Reload();
-		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), leftAnim);
 		if(anim)
 			anim->blendDelta = -1000.0f;
-		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), rightAnim);
 		if(anim)
 			anim->blendDelta = -1000.0f;
 	}
@@ -3089,11 +3864,49 @@ CAutomobile::DoDriveByShootings(void)
 	// TODO: what is this?
 	if(!lookingLeft && m_weaponDoorTimerLeft > 0.0f){
 		m_weaponDoorTimerLeft = Max(m_weaponDoorTimerLeft - CTimer::GetTimeStep()*0.1f, 0.0f);
-		ProcessOpenDoor(CAR_DOOR_LF, NUM_ANIMS, m_weaponDoorTimerLeft);
+		ProcessOpenDoor(CAR_DOOR_LF, NUM_STD_ANIMS, m_weaponDoorTimerLeft);
 	}
 	if(!lookingRight && m_weaponDoorTimerRight > 0.0f){
 		m_weaponDoorTimerRight = Max(m_weaponDoorTimerRight - CTimer::GetTimeStep()*0.1f, 0.0f);
-		ProcessOpenDoor(CAR_DOOR_RF, NUM_ANIMS, m_weaponDoorTimerRight);
+		ProcessOpenDoor(CAR_DOOR_RF, NUM_STD_ANIMS, m_weaponDoorTimerRight);
+	}
+}
+
+void
+CAutomobile::DoHoverSuspensionRatios(void)
+{
+	int i;
+
+	if(GetUp().z < 0.1f)
+		return;
+
+	CColModel *colmodel = GetColModel();
+	for(i = 0; i < 4; i++){
+		float z, waterZ;
+		CVector upper = GetMatrix() * colmodel->lines[i].p0;
+		CVector lower = GetMatrix() * colmodel->lines[i].p1;
+		if(m_aSuspensionSpringRatio[i] < 1.0f)
+			z = m_aWheelColPoints[i].point.z;
+		else
+			z = -100.0f;
+		// see if touching water
+		if(CWaterLevel::GetWaterLevel(lower, &waterZ, false) &&
+		   waterZ > z && lower.z-1.0f < waterZ){
+			// compress spring
+			if(lower.z < waterZ){
+				if(upper.z < waterZ)
+					m_aSuspensionSpringRatio[i] = 0.0f;
+				else
+					m_aSuspensionSpringRatio[i] = (upper.z - waterZ)/(upper.z - lower.z);
+			}else
+				m_aSuspensionSpringRatio[i] = 0.99999f;
+
+			m_aWheelColPoints[i].point.x = (lower.x - upper.x)*m_aSuspensionSpringRatio[i] + upper.x;
+			m_aWheelColPoints[i].point.y = (lower.y - upper.y)*m_aSuspensionSpringRatio[i] + upper.y;
+			m_aWheelColPoints[i].point.z = waterZ;
+			m_aWheelColPoints[i].normal = CVector(0.01f, 0.0f, 1.0f);
+			m_aWheelColPoints[i].surfaceB = SURFACE_WATER;
+		}
 	}
 }
 
@@ -3136,7 +3949,8 @@ CAutomobile::RcbanditCheck1CarWheels(CPtrList &list)
 
 	for(node = list.first; node; node = node->next){
 		car = (CAutomobile*)node->item;
-		if(this != car && car->IsCar() && car->m_scanCode != CWorld::GetCurrentScanCode()){
+		if(this != car && car->IsCar() && car->GetModelIndex() != MI_RCBANDIT &&
+		   car->m_scanCode != CWorld::GetCurrentScanCode()){
 			car->m_scanCode = CWorld::GetCurrentScanCode();
 
 			if(Abs(this->GetPosition().x - car->GetPosition().x) < 10.0f &&
@@ -3210,8 +4024,7 @@ void
 CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
 {
 	int i;
-	float damageMultiplier = 0.2f;
-	bool doubleMoney = false;
+	float damageMultiplier = 0.333f;
 
 	if(impulse == 0.0f){
 		impulse = m_fDamageImpulse;
@@ -3219,19 +4032,30 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
 		damageMultiplier = 1.0f;
 	}
 
+	if(GetStatus() == STATUS_PLAYER && CStats::GetPercentageProgress() >= 100.0f)
+		impulse *= 0.5f;
+
 	CVector pos(0.0f, 0.0f, 0.0f);
 
 	if(!bCanBeDamaged)
 		return;
 
+	if(m_pDamageEntity && m_pDamageEntity->IsPed() && ((CPed*)m_pDamageEntity)->bIsStanding){
+		float speed = ((CPed*)m_pDamageEntity)->m_vecAnimMoveDelta.y * DotProduct(GetForward(), m_vecDamageNormal);
+		if(speed < 0.0f)
+			impulse = Max(impulse + ((CPed*)m_pDamageEntity)->m_fMass * speed, 0.0f);
+	}
+
 	// damage flipped over car
 	if(GetUp().z < 0.0f && this != FindPlayerVehicle()){
 		if(bNotDamagedUpsideDown || GetStatus() == STATUS_PLAYER_REMOTE || bIsInWater)
 			return;
-		m_fHealth -= 4.0f*CTimer::GetTimeStep();
+		if(GetStatus() != STATUS_WRECKED)
+			m_fHealth = Max(m_fHealth - 4.0f*CTimer::GetTimeStep(), 0.0f);
 	}
 
-	if(impulse > 25.0f && GetStatus() != STATUS_WRECKED){
+	float minImpulse = GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN ? 1.0f : 25.0f;
+	if(impulse > minImpulse && GetStatus() != STATUS_WRECKED){
 		if(bIsLawEnforcer &&
 		   FindPlayerVehicle() && FindPlayerVehicle() == m_pDamageEntity &&
 		   GetStatus() != STATUS_ABANDONED &&
@@ -3244,12 +4068,17 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
 			CPad::GetPad(0)->StartShake(40000/freq, freq);
 		}
 
-		if(bOnlyDamagedByPlayer){
+		if(GetStatus() != STATUS_PLAYER && bOnlyDamagedByPlayer){
 			if(m_pDamageEntity != FindPlayerPed() &&
 			   m_pDamageEntity != FindPlayerVehicle())
 				return;
 		}
 
+		if(m_pDamageEntity && m_pDamageEntity->IsVehicle()){
+			m_nLastWeaponDamage = WEAPONTYPE_RAMMEDBYCAR;
+			m_pLastDamageEntity = m_pDamageEntity;
+		}
+
 		if(bCollisionProof)
 			return;
 
@@ -3269,109 +4098,81 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
 			switch(damagedPiece){
 			case CAR_PIECE_BUMP_FRONT:
 				GetComponentWorldPosition(CAR_BUMP_FRONT, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_BUMPER_FRONT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_BUMPER_FRONT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetBumperDamage(CAR_BUMP_FRONT, VEHBUMPER_FRONT);
-					doubleMoney = true;
-				}
 				if(m_aCarNodes[CAR_BONNET] && Damage.GetPanelStatus(VEHBUMPER_FRONT) == PANEL_STATUS_MISSING){
 			case CAR_PIECE_BONNET:
 					GetComponentWorldPosition(CAR_BONNET, pos);
-					dmgDrawCarCollidingParticles(pos, impulse);
+					dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
 					if(GetModelIndex() != MI_DODO)
-					if(Damage.ApplyDamage(COMPONENT_DOOR_BONNET, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+					if(Damage.ApplyDamage(COMPONENT_DOOR_BONNET, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 						SetDoorDamage(CAR_BONNET, DOOR_BONNET);
-						doubleMoney = true;
-					}
 				}
 				break;
 
 			case CAR_PIECE_BUMP_REAR:
 				GetComponentWorldPosition(CAR_BUMP_REAR, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_BUMPER_REAR, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_BUMPER_REAR, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetBumperDamage(CAR_BUMP_REAR, VEHBUMPER_REAR);
-					doubleMoney = true;
-				}
 				if(m_aCarNodes[CAR_BOOT] && Damage.GetPanelStatus(VEHBUMPER_REAR) == PANEL_STATUS_MISSING){
 			case CAR_PIECE_BOOT:
 					GetComponentWorldPosition(CAR_BOOT, pos);
-					dmgDrawCarCollidingParticles(pos, impulse);
-					if(Damage.ApplyDamage(COMPONENT_DOOR_BOOT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+					dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+					if(Damage.ApplyDamage(COMPONENT_DOOR_BOOT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 						SetDoorDamage(CAR_BOOT, DOOR_BOOT);
-						doubleMoney = true;
-					}
 				}
 				break;
 
 			case CAR_PIECE_DOOR_LF:
 				GetComponentWorldPosition(CAR_DOOR_LF, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if((m_nDoorLock == CARLOCK_NOT_USED || m_nDoorLock == CARLOCK_UNLOCKED) &&
-				   Damage.ApplyDamage(COMPONENT_DOOR_FRONT_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_DOOR_FRONT_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetDoorDamage(CAR_DOOR_LF, DOOR_FRONT_LEFT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_DOOR_RF:
 				GetComponentWorldPosition(CAR_DOOR_RF, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if((m_nDoorLock == CARLOCK_NOT_USED || m_nDoorLock == CARLOCK_UNLOCKED) &&
-				   Damage.ApplyDamage(COMPONENT_DOOR_FRONT_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_DOOR_FRONT_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetDoorDamage(CAR_DOOR_RF, DOOR_FRONT_RIGHT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_DOOR_LR:
 				GetComponentWorldPosition(CAR_DOOR_LR, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if((m_nDoorLock == CARLOCK_NOT_USED || m_nDoorLock == CARLOCK_UNLOCKED) &&
-				   Damage.ApplyDamage(COMPONENT_DOOR_REAR_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_DOOR_REAR_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetDoorDamage(CAR_DOOR_LR, DOOR_REAR_LEFT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_DOOR_RR:
 				GetComponentWorldPosition(CAR_DOOR_RR, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if((m_nDoorLock == CARLOCK_NOT_USED || m_nDoorLock == CARLOCK_UNLOCKED) &&
-				   Damage.ApplyDamage(COMPONENT_DOOR_REAR_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_DOOR_REAR_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetDoorDamage(CAR_DOOR_RR, DOOR_REAR_RIGHT);
-					doubleMoney = true;
-				}
 				break;
 
 			case CAR_PIECE_WING_LF:
 				GetComponentWorldPosition(CAR_WING_LF, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_PANEL_FRONT_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_PANEL_FRONT_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetPanelDamage(CAR_WING_LF, VEHPANEL_FRONT_LEFT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_WING_RF:
 				GetComponentWorldPosition(CAR_WING_RF, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_PANEL_FRONT_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_PANEL_FRONT_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetPanelDamage(CAR_WING_RF, VEHPANEL_FRONT_RIGHT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_WING_LR:
 				GetComponentWorldPosition(CAR_WING_LR, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_PANEL_REAR_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_PANEL_REAR_LEFT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetPanelDamage(CAR_WING_LR, VEHPANEL_REAR_LEFT);
-					doubleMoney = true;
-				}
 				break;
 			case CAR_PIECE_WING_RR:
 				GetComponentWorldPosition(CAR_WING_RR, pos);
-				dmgDrawCarCollidingParticles(pos, impulse);
-				if(Damage.ApplyDamage(COMPONENT_PANEL_REAR_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier)){
+				dmgDrawCarCollidingParticles(pos, impulse*damageMultiplier);
+				if(Damage.ApplyDamage(COMPONENT_PANEL_REAR_RIGHT, impulse*impulseMult, pHandling->fCollisionDamageMultiplier))
 					SetPanelDamage(CAR_WING_RR, VEHPANEL_REAR_RIGHT);
-					doubleMoney = true;
-				}
 				break;
 
 			case CAR_PIECE_WHEEL_LF:
@@ -3385,37 +4186,43 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
 					uint8 oldStatus = Damage.GetPanelStatus(VEHPANEL_WINDSCREEN);
 					SetPanelDamage(CAR_WINDSCREEN, VEHPANEL_WINDSCREEN);
 					if(oldStatus != Damage.GetPanelStatus(VEHPANEL_WINDSCREEN)){
-						DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_WINDSHIELD_CRACK, 0.0f);
-						doubleMoney = true;
+					//	DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_WINDSHIELD_CRACK, 0.0f);
 					}
 				}
 				break;
 			}
-
-			if(m_pDamageEntity && m_pDamageEntity == FindPlayerVehicle() && impulse > 10.0f){
-				int money = (doubleMoney ? 2 : 1) * impulse*pHandling->nMonetaryValue/1000000.0f;
-				money = Min(money, 40);
-				if(money > 2){
-					sprintf(gString, "$%d", money);
-					CWorld::Players[CWorld::PlayerInFocus].m_nMoney += money;
-				}
-			}
 		}
 
-		float damage = (impulse-25.0f)*pHandling->fCollisionDamageMultiplier*0.6f*damageMultiplier;
+		float damage = (impulse-minImpulse)*pHandling->fCollisionDamageMultiplier*0.6f*damageMultiplier;
 
 		if(GetModelIndex() == MI_SECURICA && m_pDamageEntity && m_pDamageEntity->GetStatus() == STATUS_PLAYER)
 			damage *= 7.0f;
 
+		if(GetModelIndex() == MI_RCGOBLIN || GetModelIndex() == MI_RCRAIDER)
+			damage *= 30.0f;
+
 		if(damage > 0.0f){
+			if(damage > 5.0f &&
+			   pDriver &&
+			   m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
+			   (this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
+// TODO(MIAMI): enum
+			   ((CVehicle*)m_pDamageEntity)->pDriver){
+				if(GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR)
+					pDriver->Say(145);
+				else
+					pDriver->Say(144);
+			}
+
 			int oldHealth = m_fHealth;
-			if(this == FindPlayerVehicle()){
+			if(this == FindPlayerVehicle())
 				m_fHealth -= bTakeLessDamage ? damage/6.0f : damage/2.0f;
-			}else{
-				if(damage > 35.0f && pDriver)
-					pDriver->Say(SOUND_PED_CAR_COLLISION);
-				m_fHealth -= bTakeLessDamage ? damage/12.0f : damage/4.0f;
-			}
+			else if(bTakeLessDamage)
+				m_fHealth -= damage/12.0f;
+			else if(m_pDamageEntity && m_pDamageEntity == FindPlayerVehicle())
+				m_fHealth -= damage/1.5f;
+			else
+				m_fHealth -= damage/4.0f;
 			if(m_fHealth <= 0.0f && oldHealth > 0)
 				m_fHealth = 1.0f;
 		}
@@ -3490,15 +4297,16 @@ CAutomobile::dmgDrawCarCollidingParticles(const CVector &pos, float amount)
 void
 CAutomobile::AddDamagedVehicleParticles(void)
 {
+	int i, n;
+
 	if(this == FindPlayerVehicle() && TheCamera.GetLookingForwardFirstPerson())
 		return;
-
-	uint8 engineStatus = Damage.GetEngineStatus();
-	if(engineStatus < ENGINE_STATUS_STEAM1)
+	if(this != FindPlayerVehicle() && (CTimer::GetFrameCounter() + m_randomSeed) & 1)
+		return;
+	if(m_fHealth >= 650.0f)
 		return;
 
-	float fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward()) * 180.0f;
-	CVector direction = 0.5f*m_vecMoveSpeed;
+	CVector direction = 0.85f*m_vecMoveSpeed;
 	CVector damagePos = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()))->m_positions[CAR_POS_HEADLIGHTS];
 
 	switch(Damage.GetDoorStatus(DOOR_BONNET)){
@@ -3516,26 +4324,72 @@ CAutomobile::AddDamagedVehicleParticles(void)
 
 	if(GetModelIndex() == MI_BFINJECT)
 		damagePos = CVector(0.3f, -1.5f, -0.1f);
-
+	else if(GetModelIndex() == MI_CADDY)
+		damagePos = CVector(0.6f, -1.0f, -0.25f);
+	else if(IsRealHeli()){
+		damagePos.x = 0.4f*GetColModel()->boundingBox.max.x;
+		damagePos.y = 0.2f*GetColModel()->boundingBox.min.y;
+		damagePos.z = 0.3f*GetColModel()->boundingBox.max.z;
+	}else
+		damagePos.z += 0.4f*(GetColModel()->boundingBox.max.z-damagePos.z) * DotProduct(GetForward(), m_vecMoveSpeed);
 	damagePos = GetMatrix()*damagePos;
 	damagePos.z += 0.15f;
 
-	if(engineStatus < ENGINE_STATUS_STEAM2){
-		if(fwdSpeed < 90.0f){
-			direction.z += 0.05f;
-			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction, nil, 0.1f);
-		}
-	}else if(engineStatus < ENGINE_STATUS_SMOKE){
-		if(fwdSpeed < 90.0f)
-			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction, nil, 0.0f);
-	}else if(engineStatus < ENGINE_STATUS_ON_FIRE){
-		if(fwdSpeed < 90.0f){
-			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction, nil, 0.0f);
-			CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, 0.3f*direction, nil, 0.0f);
-		}
-	}else if(m_fHealth > 250.0f){
-		if(fwdSpeed < 90.0f)
-			CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, 0.2f*direction, nil, 0.0f);
+	bool electric = pHandling->Transmission.nEngineType == 'E';
+
+	if(electric && m_fHealth < 320.0f && m_fHealth > 1.0f){
+		direction = 0.85f*m_vecMoveSpeed;
+		direction += GetRight() * CGeneral::GetRandomNumberInRange(0.0f, 0.04f) * (1.0f - 2.0f*m_vecMoveSpeed.Magnitude());
+		direction.z += 0.001f;
+		n = (CGeneral::GetRandomNumber() & 7) + 2;
+		for(i = 0; i < n; i++)
+			CParticle::AddParticle(PARTICLE_SPARK_SMALL, damagePos, direction);
+		if(((CTimer::GetFrameCounter() + m_randomSeed) & 7) == 0)
+			CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, 0.8f*m_vecMoveSpeed, nil, 0.1f, 0, 0, 0, 1000);
+	}else if(electric && m_fHealth < 460.0f){
+		direction = 0.85f*m_vecMoveSpeed;
+		direction += GetRight() * CGeneral::GetRandomNumberInRange(0.0f, 0.04f) * (1.0f - 2.0f*m_vecMoveSpeed.Magnitude());
+		direction.z += 0.001f;
+		n = (CGeneral::GetRandomNumber() & 3) + 2;
+		for(i = 0; i < n; i++)
+			CParticle::AddParticle(PARTICLE_SPARK_SMALL, damagePos, direction);
+		if(((CTimer::GetFrameCounter() + m_randomSeed) & 0xF) == 0)
+			CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, 0.8f*m_vecMoveSpeed, nil, 0.1f, 0, 0, 0, 1000);
+	}else if(m_fHealth < 250.0f){
+		// nothing
+	}else if(m_fHealth < 320.0f){
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, 0.8f*direction);
+	}else if(m_fHealth < 390.0f){
+		CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, 0.75f*direction);
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, 0.85f*direction);
+	}else if(m_fHealth < 460.0f){
+		int rnd = CTimer::GetFrameCounter() + m_randomSeed;
+		if(rnd < 10 ||
+		   rnd < 70 && rnd > 25 ||
+		   rnd < 160 && rnd > 100 ||
+		   rnd < 200 && rnd > 175 ||
+		   rnd > 235)
+			return;
+		direction.z += 0.05f*Max(1.0f - 1.6f*m_vecMoveSpeed.Magnitude(), 0.0f);
+		if(electric){
+			// BUG. we had that case already
+			direction = 0.85f*m_vecMoveSpeed;
+			direction += GetRight() * CGeneral::GetRandomNumberInRange(0.0f, 0.04f) * (1.0f - 2.0f*m_vecMoveSpeed.Magnitude());
+			direction.z += 0.001f;
+			n = (CGeneral::GetRandomNumber() & 2) + 2;
+			for(i = 0; i < n; i++)
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, damagePos, direction);
+			if(((CTimer::GetFrameCounter() + m_randomSeed) & 0xF) == 0)
+				CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, 0.8f*m_vecMoveSpeed, nil, 0.1f, 0, 0, 0, 1000);
+		}else{
+			if(TheCamera.GetLookDirection() != LOOKING_FORWARD)
+				CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, 0.75f*direction);
+			else if(((CTimer::GetFrameCounter() + m_randomSeed) & 1) == 0)
+				CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, 0.85f*m_vecMoveSpeed);
+		}
+	}else if(((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 0 ||
+	         ((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 2){
+		CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, 0.9f*direction);
 	}
 }
 
@@ -3547,9 +4401,11 @@ CAutomobile::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
 	static RwRGBA grassCol = { 8, 24, 8, 255 };
 	static RwRGBA gravelCol = { 64, 64, 64, 255 };
 	static RwRGBA mudCol = { 64, 32, 16, 255 };
+	static RwRGBA sandCol = { 170, 165, 140, 255 };
 	static RwRGBA waterCol = { 48, 48, 64, 0 };
 
-	if(!belowEffectSpeed)
+	if(!belowEffectSpeed &&
+	   colpoint->surfaceB != SURFACE_SAND && colpoint->surfaceB != SURFACE_SAND_BEACH)
 		return 0;
 
 	switch(colpoint->surfaceB){
@@ -3568,7 +4424,7 @@ CAutomobile::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
 		for(i = 0; i < 4; i++){
 			dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.06f);
 			CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
-				CGeneral::GetRandomNumberInRange(0.02f, 0.06f), gravelCol);
+				CGeneral::GetRandomNumberInRange(0.05f, 0.09f), gravelCol);
 		}
 		return 1;
 	case SURFACE_MUD_DRY:
@@ -3580,30 +4436,30 @@ CAutomobile::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
 				CGeneral::GetRandomNumberInRange(0.02f, 0.06f), mudCol);
 		}
 		return 0;
+	case SURFACE_SAND:
+	case SURFACE_SAND_BEACH:
+		if(CTimer::GetFrameCounter() & 2 ||
+		   CGeneral::GetRandomNumberInRange(CWeather::WetRoads, 1.01f) > 0.5f)
+			return 0;
+		dir.x = 0.5f*m_vecMoveSpeed.x;
+		dir.y = 0.5f*m_vecMoveSpeed.y;
+		for(i = 0; i < 1; i++){
+			dir.z = CGeneral::GetRandomNumberInRange(0.02f, 0.055f);
+			CParticle::AddParticle(PARTICLE_SAND, colpoint->point, dir, nil,
+				2.0f*m_vecMoveSpeed.Magnitude(), sandCol);
+		}
+		return 0;
 	default:
-		if ( CWeather::WetRoads > 0.01f 
-#ifdef PC_PARTICLE	
-			&& CTimer::GetFrameCounter() & 1
-#endif	
-			)
-		{
-			CParticle::AddParticle(
-#ifdef FIX_BUGS
-				PARTICLE_WHEEL_WATER,
-#else
-				PARTICLE_WATERSPRAY,
-#endif
-				colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
-#ifdef PC_PARTICLE
-				CVector(0.0f, 0.0f, 1.0f),
-#else	
-				CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
-#endif		
-				nil,
-				CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
+		if(CWeather::WetRoads > 0.01f){
+			if(CTimer::GetFrameCounter() & 1)
+				CParticle::AddParticle(
+					PARTICLE_WATERSPRAY,
+					colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
+					CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
+					nil,
+					CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
 			return 0;
 		}
-		
 		return 1;
 	}
 }
@@ -3714,6 +4570,7 @@ inline void ProcessDoorOpenCloseAnimation(CAutomobile *car, uint32 component, eD
 		car->OpenDoor(component, door, 0.0f);
 	}
 }
+
 void
 CAutomobile::ProcessOpenDoor(uint32 component, uint32 anim, float time)
 {
@@ -3734,13 +4591,13 @@ CAutomobile::ProcessOpenDoor(uint32 component, uint32 anim, float time)
 	case ANIM_CAR_QJACK:
 	case ANIM_CAR_OPEN_LHS:
 	case ANIM_CAR_OPEN_RHS:
-		ProcessDoorOpenAnimation(this, component, door, time, 0.66f, 0.8f);
+		ProcessDoorOpenAnimation(this, component, door, time, 0.41f, 0.89f);
 		break;
 	case ANIM_CAR_CLOSEDOOR_LHS:
 	case ANIM_CAR_CLOSEDOOR_LOW_LHS:
 	case ANIM_CAR_CLOSEDOOR_RHS:
 	case ANIM_CAR_CLOSEDOOR_LOW_RHS:
-		ProcessDoorCloseAnimation(this, component, door, time, 0.2f, 0.63f);
+		ProcessDoorCloseAnimation(this, component, door, time, 0.2f, 0.45f);
 		break;
 	case ANIM_CAR_ROLLDOOR:
 	case ANIM_CAR_ROLLDOOR_LOW:
@@ -3779,7 +4636,7 @@ CAutomobile::ProcessOpenDoor(uint32 component, uint32 anim, float time)
 	case ANIM_VAN_GETOUT:
 		ProcessDoorOpenAnimation(this, component, door, time, 0.5f, 0.6f);
 		break;
-	case NUM_ANIMS:
+	case NUM_STD_ANIMS:
 		OpenDoor(component, door, time);
 		break;
 	}
@@ -3819,6 +4676,41 @@ CAutomobile::IsDoorMissing(eDoors door)
 	return Damage.GetDoorStatus(door) == DOOR_STATUS_MISSING;
 }
 
+bool
+CAutomobile::IsDoorReady(uint32 door)
+{
+	switch(door){
+	case CAR_DOOR_RF: return IsDoorReady(DOOR_FRONT_RIGHT);
+	case CAR_DOOR_RR: return IsDoorReady(DOOR_REAR_RIGHT);
+	case CAR_DOOR_LF: return IsDoorReady(DOOR_FRONT_LEFT);
+	case CAR_DOOR_LR: return IsDoorReady(DOOR_REAR_LEFT);
+	default:
+		return false;
+	}
+}
+
+bool
+CAutomobile::IsDoorMissing(uint32 door)
+{
+	switch(door){
+	case CAR_DOOR_RF: return IsDoorMissing(DOOR_FRONT_RIGHT);
+	case CAR_DOOR_RR: return IsDoorMissing(DOOR_REAR_RIGHT);
+	case CAR_DOOR_LF: return IsDoorMissing(DOOR_FRONT_LEFT);
+	case CAR_DOOR_LR: return IsDoorMissing(DOOR_REAR_LEFT);
+	default:
+		return false;
+	}
+}
+
+bool
+CAutomobile::IsOpenTopCar(void)
+{
+	return GetModelIndex() == MI_STINGER ||
+		// component 0 is assumed to be a roof
+		GetModelIndex() == MI_COMET && m_aExtras[0] != 0 && m_aExtras[1] != 0 ||
+		GetModelIndex() == MI_STALLION && m_aExtras[0] != 0 && m_aExtras[1] != 0;
+}
+
 void
 CAutomobile::RemoveRefsToVehicle(CEntity *ent)
 {
@@ -3831,12 +4723,17 @@ CAutomobile::RemoveRefsToVehicle(CEntity *ent)
 void
 CAutomobile::BlowUpCar(CEntity *culprit)
 {
-	int i;
 	RpAtomic *atomic;
 
 	if(!bCanBeDamaged)
 		return;
 
+	if(culprit == FindPlayerPed() || culprit == FindPlayerVehicle()){
+		CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 20;
+		CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 10.0f;
+		CStats::PropertyDestroyed += CGeneral::GetRandomNumber()%6000 + 4000;
+	}
+
 	// explosion pushes vehicle up
 	m_vecMoveSpeed.z += 0.13f;
 	SetStatus(STATUS_WRECKED);
@@ -3866,27 +4763,7 @@ CAutomobile::BlowUpCar(CEntity *culprit)
 
 	TheCamera.CamShake(0.7f, GetPosition().x, GetPosition().y, GetPosition().z);
 
-	// kill driver and passengers
-	if(pDriver){
-		CDarkel::RegisterKillByPlayer(pDriver, WEAPONTYPE_EXPLOSION);
-		if(pDriver->GetPedState() == PED_DRIVING){
-			pDriver->SetDead();
-			if(!pDriver->IsPlayer())
-				pDriver->FlagToDestroyWhenNextProcessed();
-		}else
-			pDriver->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
-	}
-	for(i = 0; i < m_nNumMaxPassengers; i++){
-		if(pPassengers[i]){
-			CDarkel::RegisterKillByPlayer(pPassengers[i], WEAPONTYPE_EXPLOSION);
-			if(pPassengers[i]->GetPedState() == PED_DRIVING){
-				pPassengers[i]->SetDead();
-				if(!pPassengers[i]->IsPlayer())
-					pPassengers[i]->FlagToDestroyWhenNextProcessed();
-			}else
-				pPassengers[i]->SetDie(ANIM_KO_SHOT_FRONT1, 4.0f, 0.0f);
-		}
-	}
+	KillPedsInVehicle();
 
 	bEngineOn = false;
 	bLightsOn = false;
@@ -3916,6 +4793,10 @@ CAutomobile::SetUpWheelColModel(CColModel *colModel)
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
 	CColModel *vehColModel = mi->GetColModel();
 
+	if(GetVehicleAppearance() == VEHICLE_APPEARANCE_HELI ||
+	   GetVehicleAppearance() == VEHICLE_APPEARANCE_PLANE)
+		return false;
+
 	colModel->boundingSphere = vehColModel->boundingSphere;
 	colModel->boundingBox = vehColModel->boundingBox;
 
@@ -3941,10 +4822,12 @@ CAutomobile::SetUpWheelColModel(CColModel *colModel)
 	return true;
 }
 
-// this probably isn't used in III yet
 void
-CAutomobile::BurstTyre(uint8 wheel)
+CAutomobile::BurstTyre(uint8 wheel, bool applyForces)
 {
+	if(GetModelIndex() == MI_RHINO || bTyresDontBurst)
+		return;
+
 	switch(wheel){
 	case CAR_PIECE_WHEEL_LF: wheel = VEHWHEEL_FRONT_LEFT; break;
 	case CAR_PIECE_WHEEL_LR: wheel = VEHWHEEL_REAR_LEFT; break;
@@ -3955,14 +4838,18 @@ CAutomobile::BurstTyre(uint8 wheel)
 	int status = Damage.GetWheelStatus(wheel);
 	if(status == WHEEL_STATUS_OK){
 		Damage.SetWheelStatus(wheel, WHEEL_STATUS_BURST);
+		CStats::TyresPopped++;
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_TYRE_POP, 0.0f);
 
 		if(GetStatus() == STATUS_SIMPLE){
 			SetStatus(STATUS_PHYSICS);
 			CCarCtrl::SwitchVehicleToRealPhysics(this);
 		}
 
-		ApplyMoveForce(GetRight() * m_fMass * CGeneral::GetRandomNumberInRange(-0.03f, 0.03f));
-		ApplyTurnForce(GetRight() * m_fTurnMass * CGeneral::GetRandomNumberInRange(-0.03f, 0.03f), GetForward());
+		if(applyForces){
+			ApplyMoveForce(GetRight() * m_fMass * CGeneral::GetRandomNumberInRange(-0.03f, 0.03f));
+			ApplyTurnForce(GetRight() * m_fTurnMass * CGeneral::GetRandomNumberInRange(-0.03f, 0.03f), GetForward());
+		}
 	}
 }
 
@@ -4008,7 +4895,7 @@ CAutomobile::IsRoomForPedToLeaveCar(uint32 component, CVector *doorOffset)
 
 	CVector dist = doorPos - seatPos;
 
-	// Removing that makes this func. return false for van doors.
+	// Removing that makes thiProcessEntityCollisions func. return false for van doors.
 	doorPos.z += 0.5f;
 	float length = dist.Magnitude();
 	CVector pedPos = seatPos + dist*((length+0.6f)/length);
@@ -4039,10 +4926,16 @@ CAutomobile::PlayCarHorn(void)
 {
 	int r;
 
-	if(m_nCarHornTimer != 0)
+	if (IsAlarmOn() || m_nCarHornTimer != 0)
+		return;
+
+	if (m_nCarHornDelay) {
+		m_nCarHornDelay--;
 		return;
+	}
 
-	r = CGeneral::GetRandomNumber() & 7;
+	m_nCarHornDelay = (CGeneral::GetRandomNumber() & 0x7F) + 150;
+	r = m_nCarHornDelay & 7;
 	if(r < 2){
 		m_nCarHornTimer = 45;
 	}else if(r < 4){
@@ -4064,7 +4957,6 @@ CAutomobile::PlayHornIfNecessary(void)
 			PlayCarHorn();
 }
 
-
 void
 CAutomobile::ResetSuspension(void)
 {
@@ -4107,8 +4999,8 @@ CAutomobile::SetupSuspensionLines(void)
 	}
 
 	// Compress spring somewhat to get normal height on road
-	m_fHeightAboveRoad = -(colModel->lines[0].p0.z + (colModel->lines[0].p1.z - colModel->lines[0].p0.z)*
-	                                                  (1.0f - 1.0f/(8.0f*pHandling->fSuspensionForceLevel)));
+	m_fHeightAboveRoad = m_aSuspensionSpringLength[0]*(1.0f - 1.0f/(4.0f*pHandling->fSuspensionForceLevel))
+			- colModel->lines[0].p0.z + mi->m_wheelScale*0.5f;
 	for(i = 0; i < 4; i++)
 		m_aWheelPosition[i] = mi->m_wheelScale*0.5f - m_fHeightAboveRoad;
 
@@ -4142,13 +5034,16 @@ CAutomobile::BlowUpCarsInPath(void)
 {
 	int i;
 
-	if(m_vecMoveSpeed.Magnitude() > 0.1f)
+	if(m_vecMoveSpeed.Magnitude() > 0.1f && bTankDetonateCars)
 		for(i = 0; i < m_nCollisionRecords; i++)
 			if(m_aCollisionRecords[i] &&
 			   m_aCollisionRecords[i]->IsVehicle() &&
 			   m_aCollisionRecords[i]->GetModelIndex() != MI_RHINO &&
-			   !m_aCollisionRecords[i]->bRenderScorched)
+			   !m_aCollisionRecords[i]->bRenderScorched){
+				if(this == FindPlayerVehicle())
+					CEventList::RegisterEvent(EVENT_EXPLOSION, EVENT_ENTITY_VEHICLE, this, FindPlayerPed(), 2000);
 				((CVehicle*)m_aCollisionRecords[i])->BlowUpCar(this);
+			}
 }
 
 bool
@@ -4250,6 +5145,27 @@ CAutomobile::ProcessSwingingDoor(int32 component, eDoors door)
 	mat.SetRotate(axes[0], axes[1], axes[2]);
 	mat.Translate(pos);
 	mat.UpdateRW();
+
+	// make wind rip off bonnet
+	if(door == DOOR_BONNET && Doors[door].m_nDoorState == DOORST_OPEN &&
+	   DotProduct(m_vecMoveSpeed, GetForward()) > 0.4f){
+#ifdef FIX_BUGS
+		CObject *comp = SpawnFlyingComponent(CAR_BONNET, COMPGROUP_BONNET);
+#else
+		CObject *comp = SpawnFlyingComponent(CAR_BONNET, COMPGROUP_DOOR);
+#endif
+		// make both doors invisible on car
+		SetComponentVisibility(m_aCarNodes[CAR_BONNET], ATOMIC_FLAG_NONE);
+		Damage.SetDoorStatus(DOOR_BONNET, DOOR_STATUS_MISSING);
+
+		if(comp){
+			if(CGeneral::GetRandomNumber() & 1)
+				comp->m_vecMoveSpeed = 0.4f*m_vecMoveSpeed + 0.1f*GetRight() + 0.5f*GetUp();
+			else
+				comp->m_vecMoveSpeed = 0.4f*m_vecMoveSpeed - 0.1f*GetRight() + 0.5f*GetUp();
+			comp->ApplyTurnForce(10.0f*GetUp(), GetForward());
+		}
+	}
 }
 
 void
@@ -4276,6 +5192,19 @@ CAutomobile::Fix(void)
 			mat.UpdateRW();
 		}
 	}
+
+	for(component = 0; component < 4; component++)
+		Damage.SetWheelStatus(component, WHEEL_STATUS_OK);
+
+	if(GetModelIndex() == MI_HUNTER){
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]), 0);
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RB]), 0);
+	}else if(IsRealHeli()){
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LF]), 0);
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RF]), 0);
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_LB]), 0);
+		RpAtomicSetFlags((RpAtomic*)GetFirstObject(m_aCarNodes[CAR_WHEEL_RB]), 0);
+	}
 }
 
 void
@@ -4317,8 +5246,6 @@ GetCurrentAtomicObjectCB(RwObject *object, void *data)
 	return object;
 }
 
-static CColPoint aTempPedColPts[MAX_COLLISION_POINTS];
-
 CObject*
 CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
 {
@@ -4351,6 +5278,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
 	case COMPGROUP_DOOR:
 		obj->SetModelIndexNoCreate(MI_CAR_DOOR);
 		obj->SetCenterOfMass(0.0f, -0.5f, 0.0f);
+		obj->bDrawLast = true;
 		break;
 	case COMPGROUP_BONNET:
 		obj->SetModelIndexNoCreate(MI_CAR_BONNET);
@@ -4377,6 +5305,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
 	RpAtomicSetFrame(atomic, frame);
 	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	obj->AttachToRwObject((RwObject*)atomic);
+	obj->bDontStream = true;
 
 	// init object
 	obj->m_fMass = 10.0f;
@@ -4435,9 +5364,16 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
 		obj->m_fAirResistance = 0.99f;
 	}
 
+	if(GetStatus() == STATUS_WRECKED && IsVisible() && DotProduct(dist, TheCamera.GetPosition() - GetPosition()) > -0.5f){
+		dist = TheCamera.GetPosition() - GetPosition();
+		dist.Normalise();
+		dist.z += 0.3f;
+		ApplyMoveForce(5.0f*dist);
+	}
+
 	if(CCollision::ProcessColModels(obj->GetMatrix(), *obj->GetColModel(),
 			this->GetMatrix(), *this->GetColModel(),
-			aTempPedColPts, nil, nil) > 0)
+			CWorld::m_aTempColPts, nil, nil) > 0)
 		obj->m_pCollidingEntity = this;
 
 	if(bRenderScorched)
@@ -4475,11 +5411,14 @@ CAutomobile::SetPanelDamage(int32 component, ePanels panel, bool noFlyingCompone
 	if(m_aCarNodes[component] == nil)
 		return;
 	if(status == PANEL_STATUS_SMASHED1){
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_WINDSHIELD_CRACK, 0.0f);
 		// show damaged part
 		SetComponentVisibility(m_aCarNodes[component], ATOMIC_FLAG_DAM);
 	}else if(status == PANEL_STATUS_MISSING){
 		if(!noFlyingComponents)
 			SpawnFlyingComponent(component, COMPGROUP_PANEL);
+		else
+			CGlass::CarWindscreenShatters(this, false);
 		// hide both
 		SetComponentVisibility(m_aCarNodes[component], ATOMIC_FLAG_NONE);
 	}
@@ -4515,6 +5454,11 @@ CAutomobile::SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents
 		return;
 	}
 
+	if(!CanDoorsBeDamaged() && status > DOOR_STATUS_SMASHED && door != DOOR_BONNET && door != DOOR_BOOT){
+		Damage.SetDoorStatus(door, DOOR_STATUS_SMASHED);
+		status = DOOR_STATUS_SMASHED;
+	}
+
 	if(door == DOOR_BOOT && status == DOOR_STATUS_SWINGING && pHandling->Flags & HANDLING_NOSWING_BOOT){
 		Damage.SetDoorStatus(DOOR_BOOT, DOOR_STATUS_MISSING);
 		status = DOOR_STATUS_MISSING;
@@ -4611,6 +5555,123 @@ CAutomobile::SetAllTaxiLights(bool set)
 	m_sAllTaxiLights = set;
 }
 
+void
+CAutomobile::TellHeliToGoToCoors(float x, float y, float z, uint8 speed)
+{
+	AutoPilot.m_nCarMission = MISSION_HELI_FLYTOCOORS;
+	AutoPilot.m_vecDestinationCoors.x = x;
+	AutoPilot.m_vecDestinationCoors.y = y;
+	AutoPilot.m_vecDestinationCoors.z = z;
+	AutoPilot.m_nCruiseSpeed = speed;
+	SetStatus(STATUS_PHYSICS);
+
+	if(m_fOrientation == 0.0f){
+		m_fOrientation = CGeneral::GetATanOfXY(GetForward().x, GetForward().y) + TWOPI;
+		while(m_fOrientation > TWOPI) m_fOrientation -= TWOPI;
+	}
+}
+
+void
+CAutomobile::TellPlaneToGoToCoors(float x, float y, float z, uint8 speed)
+{
+	AutoPilot.m_nCarMission = MISSION_HELI_FLYTOCOORS;
+	AutoPilot.m_vecDestinationCoors.x = x;
+	AutoPilot.m_vecDestinationCoors.y = y;
+	AutoPilot.m_vecDestinationCoors.z = z;
+	AutoPilot.m_nCruiseSpeed = speed;
+	SetStatus(STATUS_PHYSICS);
+
+	if(m_fOrientation == 0.0f)
+		m_fOrientation = CGeneral::GetATanOfXY(GetForward().x, GetForward().y);
+}
+
+void
+CAutomobile::PopBoot(void)
+{
+	switch(Damage.GetDoorStatus(DOOR_BOOT)){
+	case DOOR_STATUS_OK:
+	case DOOR_STATUS_SMASHED:
+		Doors[DOOR_BOOT].m_fAngle = Doors[DOOR_BOOT].m_fMinAngle;
+		CMatrix mat(RwFrameGetMatrix(m_aCarNodes[DOOR_BOOT]));
+		CVector pos = mat.GetPosition();
+		float axes[3] = { 0.0f, 0.0f, 0.0f };
+		axes[Doors[DOOR_BOOT].m_nAxis] = Doors[DOOR_BOOT].m_fAngle;
+		mat.SetRotate(axes[0], axes[1], axes[2]);
+		mat.Translate(pos);
+		mat.UpdateRW();
+	}
+}
+
+void
+CAutomobile::PopBootUsingPhysics(void)
+{
+	switch(Damage.GetDoorStatus(DOOR_BOOT))
+	case DOOR_STATUS_OK:
+	case DOOR_STATUS_SMASHED:
+		Damage.SetDoorStatus(DOOR_BOOT, DOOR_STATUS_SWINGING);
+	Doors[DOOR_BOOT].m_fAngle = -2.0f;
+}
+
+void
+CAutomobile::CloseAllDoors(void)
+{
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+	if(!IsDoorMissing(DOOR_FRONT_LEFT))
+		OpenDoor(CAR_DOOR_LF, DOOR_FRONT_LEFT, 0.0f);
+	if(mi->m_numDoors > 1){
+		if(!IsDoorMissing(DOOR_FRONT_RIGHT))
+			OpenDoor(CAR_DOOR_RF, DOOR_FRONT_RIGHT, 0.0f);
+		if(mi->m_numDoors > 2){
+			if(!IsDoorMissing(DOOR_REAR_LEFT))
+				OpenDoor(CAR_DOOR_LR, DOOR_REAR_LEFT, 0.0f);
+			if(!IsDoorMissing(DOOR_REAR_RIGHT))
+				OpenDoor(CAR_DOOR_RR, DOOR_REAR_RIGHT, 0.0f);
+		}
+	}
+}
+
+void
+CAutomobile::KnockPedOutCar(eWeaponType weapon, uint16 door, CPed *ped)
+{
+	AnimationId anim = ANIM_KO_SHOT_FRONT1;
+	if(ped == nil)
+		return;
+
+	ped->m_vehEnterType = door;
+	ped->SetPedState(PED_IDLE);
+	CAnimManager::BlendAnimation(ped->GetClump(), ped->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
+	CPed::PedSetOutCarCB(nil, ped);
+	ped->SetMoveState(PEDMOVE_STILL);
+	if(GetUp().z < 0.0f)
+		ped->SetHeading(CGeneral::LimitRadianAngle(GetForward().Heading() + PI));
+	else
+		ped->SetHeading(GetForward().Heading());
+
+	switch(weapon){
+	case WEAPONTYPE_UNARMED:
+	case WEAPONTYPE_UNIDENTIFIED:
+		ped->m_vecMoveSpeed = m_vecMoveSpeed;
+		ped->m_pCollidingEntity = this;
+		anim = NUM_STD_ANIMS;
+		break;
+
+	case WEAPONTYPE_BASEBALLBAT:
+	case WEAPONTYPE_RAMMEDBYCAR:
+	case WEAPONTYPE_FALL:
+		ped->m_vecMoveSpeed = m_vecMoveSpeed;
+		anim = ANIM_KD_LEFT;
+		ApplyMoveForce(4.0f*GetUp() + 8.0f*GetRight());
+		break;
+	}
+
+	if(weapon != WEAPONTYPE_UNARMED){
+		ped->SetFall(1000, anim, 0);
+		ped->bIsStanding = false;
+		ped->m_headingRate = 0.0f;
+	}
+	ped->m_pMyVehicle = nil;
+}
+
 #ifdef COMPATIBLE_SAVES
 void
 CAutomobile::Save(uint8*& buf)
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index 604bed17..186ed646 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -3,6 +3,7 @@
 #include "Vehicle.h"
 #include "DamageManager.h"
 #include "Door.h"
+#include "Skidmarks.h"
 
 class CObject;
 
@@ -39,16 +40,6 @@ enum {
 	CARWHEEL_REAR_RIGHT
 };
 
-enum eBombType
-{
-	CARBOMB_NONE,
-	CARBOMB_TIMED,
-	CARBOMB_ONIGNITION,
-	CARBOMB_REMOTE,
-	CARBOMB_TIMEDACTIVE,
-	CARBOMB_ONIGNITIONACTIVE,
-};
-
 enum {
 	CAR_DOOR_FLAG_UNKNOWN = 0x0,
 	CAR_DOOR_FLAG_LF = 0x1,
@@ -60,7 +51,6 @@ enum {
 class CAutomobile : public CVehicle
 {
 public:
-	// 0x288
 	CDamageManager Damage;
 	CDoor Doors[6];
 	RwFrame *m_aCarNodes[NUM_CAR_NODES];
@@ -69,22 +59,23 @@ public:
 	float m_aSuspensionSpringRatioPrev[4];
 	float m_aWheelTimer[4];		// set to 4.0 when wheel is touching ground, then decremented
 	float m_auto_unused1;
-	bool m_aWheelSkidmarkMuddy[4];
+	eSkidmarkType m_aWheelSkidmarkType[4];
 	bool m_aWheelSkidmarkBloody[4];
+	bool m_aWheelSkidmarkUnk[4];
 	float m_aWheelRotation[4];
 	float m_aWheelPosition[4];
 	float m_aWheelSpeed[4];
 	uint8 m_auto_unused2;
-	uint8 m_bombType : 3;
 	uint8 bTaxiLight : 1;
-	uint8 bDriverLastFrame  : 1;		// for bombs
 	uint8 bFixedColour : 1;
 	uint8 bBigWheels : 1;
 	uint8 bWaterTight : 1;	// no damage for non-player peds
 	uint8 bNotDamagedUpsideDown : 1;
 	uint8 bMoreResistantToDamage : 1;
-	CEntity *m_pBombRigger;
-	int16 m_auto_unk1;
+	uint8 bTankDetonateCars : 1;
+	uint8 bStuckInSand : 1;
+	uint8 bHeliDestroyed : 1;
+	int16 m_doingBurnout;
 	uint16 m_hydraulicState;
 	uint32 m_nBusDoorTimerEnd;
 	uint32 m_nBusDoorTimerStart;
@@ -92,6 +83,9 @@ public:
 	float m_aSuspensionLineLength[4];
 	float m_fHeightAboveRoad;
 	float m_fTraction;
+	float m_fTireTemperature;
+	float m_fOrientation;	// for heli and plane go-to
+	float m_auto_unk4;	// related to the above
 	float m_fVelocityChangeForAudio;
 	float m_randomValues[6];	// used for what?
 	float m_fFireBlowUpTimer;
@@ -102,6 +96,7 @@ public:
 	float m_weaponDoorTimerRight;
 	float m_fCarGunLR;
 	float m_fCarGunUD;
+	float m_fHeliOrientation;
 	float m_fPropellerRotation;
 	uint8 stuff4[4];
 	uint8 m_nWheelsOnGround;
@@ -135,10 +130,13 @@ public:
 	bool IsDoorFullyOpen(eDoors door);
 	bool IsDoorClosed(eDoors door);
 	bool IsDoorMissing(eDoors door);
+	bool IsDoorReady(uint32 door);
+	bool IsDoorMissing(uint32 door);
+	bool IsOpenTopCar(void);
 	void RemoveRefsToVehicle(CEntity *ent);
 	void BlowUpCar(CEntity *ent);
 	bool SetUpWheelColModel(CColModel *colModel);
-	void BurstTyre(uint8 tyre);
+	void BurstTyre(uint8 tyre, bool applyForces);
 	bool IsRoomForPedToLeaveCar(uint32 component, CVector *doorOffset);
 	float GetHeightAboveRoad(void);
 	void PlayCarHorn(void);
@@ -149,6 +147,7 @@ public:
 	void VehicleDamage(float impulse, uint16 damagedPiece);
 	void ProcessBuoyancy(void);
 	void DoDriveByShootings(void);
+	void DoHoverSuspensionRatios(void);
 	int32 RcbanditCheckHitWheels(void);
 	int32 RcbanditCheck1CarWheels(CPtrList &list);
 	void PlaceOnRoadProperly(void);
@@ -171,6 +170,11 @@ public:
 	void SetBumperDamage(int32 component, ePanels panel, bool noFlyingComponents = false);
 	void SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents = false);
 
+	void TellHeliToGoToCoors(float x, float y, float z, uint8 speed);
+	void TellPlaneToGoToCoors(float x, float y, float z, uint8 speed);
+	void SetHeliOrientation(float orient) { m_fHeliOrientation = orient; }
+	void ClearHeliOrientation(void) { m_fHeliOrientation = -1.0f; }
+
 	void Fix(void);
 	void SetComponentVisibility(RwFrame *frame, uint32 flags);
 	void SetupModelNodes(void);
@@ -179,6 +183,12 @@ public:
 	void HideAllComps(void);
 	void ShowAllComps(void);
 	void ReduceHornCounter(void);
+
+	void PopBoot(void);
+	void PopBootUsingPhysics(void);
+	void CloseAllDoors(void);
+	void KnockPedOutCar(eWeaponType weapon, uint16 door, CPed *ped);
+
 #ifdef COMPATIBLE_SAVES
 	virtual void Save(uint8*& buf);
 	virtual void Load(uint8*& buf);
@@ -188,8 +198,6 @@ public:
 	static void SetAllTaxiLights(bool set);
 };
 
-VALIDATE_SIZE(CAutomobile, 0x5A8);
-
 inline uint8 GetCarDoorFlag(int32 carnode) {
 	switch (carnode) {
 	case CAR_DOOR_LF:
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
new file mode 100644
index 00000000..05f088bf
--- /dev/null
+++ b/src/vehicles/Bike.cpp
@@ -0,0 +1,2927 @@
+#include "common.h"
+#include "General.h"
+#include "Pad.h"
+#include "DMAudio.h"
+#include "Clock.h"
+#include "Timecycle.h"
+#include "ZoneCull.h"
+#include "Camera.h"
+#include "Darkel.h"
+#include "Rubbish.h"
+#include "Explosion.h"
+#include "Particle.h"
+#include "ParticleObject.h"
+#include "Shadows.h"
+#include "PointLights.h"
+#include "Coronas.h"
+#include "SpecialFX.h"
+#include "WaterLevel.h"
+#include "Floater.h"
+#include "World.h"
+#include "SurfaceTable.h"
+#include "Weather.h"
+#include "Record.h"
+#include "CarCtrl.h"
+#include "CarAI.h"
+#include "Script.h"
+#include "Stats.h"
+#include "Replay.h"
+#include "AnimManager.h"
+#include "RpAnimBlend.h"
+#include "AnimBlendAssociation.h"
+#include "Ped.h"
+#include "PlayerPed.h"
+#include "DamageManager.h"
+#include "Vehicle.h"
+#include "Automobile.h"
+#include "Bike.h"
+#include "Debug.h"
+
+//--MIAMI: done except for TODOs
+// BUGS: bikes get stuck in sand for some reason
+
+// TODO: maybe put this somewhere else
+inline void
+GetRelativeMatrix(RwMatrix *mat, RwFrame *frm, RwFrame *end)
+{
+	*mat = *RwFrameGetMatrix(frm);
+	frm = RwFrameGetParent(frm);
+	while(frm){
+		RwMatrixTransform(mat, RwFrameGetMatrix(frm), rwCOMBINEPOSTCONCAT);
+		frm = RwFrameGetParent(frm);
+		if(frm == end)
+			frm = nil;
+	}
+}
+
+#define FAKESUSPENSION (99999.992f)
+
+CBike::CBike(int32 id, uint8 CreatedBy)
+ : CVehicle(CreatedBy)
+{
+	int i;
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
+	switch(id){
+	case MI_ANGEL:
+	case MI_FREEWAY:
+		m_bikeAnimType = ASSOCGRP_BIKE_HARLEY;
+		break;
+	case MI_PIZZABOY:
+	case MI_FAGGIO:
+		m_bikeAnimType = ASSOCGRP_BIKE_VESPA;
+		break;
+	case MI_PCJ600:
+		m_bikeAnimType = ASSOCGRP_BIKE_STANDARD;
+		break;
+	case MI_SANCHEZ:
+		m_bikeAnimType = ASSOCGRP_BIKE_DIRT;
+		break;
+	default: assert(0 && "invalid bike model ID");
+	}
+	m_vehType = VEHICLE_TYPE_BIKE;
+
+	m_fFireBlowUpTimer = 0.0f;
+	m_doingBurnout = 0;
+	m_bike_flag01 = false;
+
+	SetModelIndex(id);
+
+	pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
+	pBikeHandling = mod_HandlingManager.GetBikePointer((eHandlingId)mi->m_handlingId);
+	pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId);
+
+	m_bike_unused1 = 20.0f;
+	m_bike_unused2 = 0;
+
+	mi->ChooseVehicleColour(m_currentColour1, m_currentColour2);
+
+	m_fRearForkLength = 0.0f;
+	m_fFrontForkY = 0.0;
+	m_fFrontForkZ = 0.0;
+	m_fFrontForkSlope = Tan(DEGTORAD(mi->m_bikeSteerAngle));
+
+	m_fMass = pHandling->fMass;
+	m_fTurnMass = pHandling->fTurnMass;
+	m_vecCentreOfMass = pHandling->CentreOfMass;
+	m_vecCentreOfMass.z = 0.1f;
+	m_fAirResistance = pHandling->Dimension.x*pHandling->Dimension.z/m_fMass;
+	m_fElasticity = 0.05f;
+	m_fBuoyancy = pHandling->fBuoyancy;
+
+	m_fSteerAngle = 0.0f;
+	m_fWheelAngle = 0.0f;
+	m_fLeanLRAngle = 0.0f;
+	m_fLeanLRAngle2 = 0.0f;
+	m_fGasPedal = 0.0f;
+	m_fBrakePedal = 0.0f;
+	m_fLeanInput = 0.0f;
+	m_fPedLeanAmountLR = 0.0f;
+	m_fPedLeanAmountUD = 0.0f;
+	m_pSetOnFireEntity = nil;
+	m_pBombRigger = nil;
+	m_fGasPedalAudio = 0.0f;
+	m_bike_flag02 = false;
+	bWaterTight = false;
+	bIsBeingPickedUp = false;
+	bIsStanding = false;
+	bExtraSpeed = false;
+	bIsOnFire = false;
+	m_bike_flag80 = false;
+
+	m_fTireTemperature = 0.0f;
+	m_fBrakeDestabilization = 0.0f;
+	field_490 = 0;
+
+	for(i = 0; i < 2; i++){
+		m_aWheelRotation[i] = 0.0f;
+		m_aWheelSpeed[i] = 0.0f;
+		m_aWheelState[i] = WHEEL_STATE_NORMAL;
+		m_aWheelSkidmarkType[i] = SKIDMARK_NORMAL;
+		m_aWheelSkidmarkBloody[i] = false;
+		m_aWheelSkidmarkUnk[0] = false;
+		m_wheelStatus[i] = WHEEL_STATUS_OK;
+	}
+
+	for(i = 0; i < 4; i++){
+		m_aGroundPhysical[i] = nil;
+		m_aGroundOffset[i] = CVector(0.0f, 0.0f, 0.0f);
+		m_aSuspensionSpringRatioPrev[i] = m_aSuspensionSpringRatio[i] = 1.0f;
+		m_aWheelTimer[i] = 0.0f;
+	}
+
+	m_nWheelsOnGround = 0;
+	m_nDriveWheelsOnGround = 0;
+	m_nDriveWheelsOnGroundPrev = 0;
+	m_fHeightAboveRoad = 0.0f;
+	m_fTraction = 1.0f;
+
+	CColModel *colModel = mi->GetColModel();
+	if(colModel->lines == nil){
+		colModel->lines = (CColLine*)RwMalloc(4*sizeof(CColLine));
+		colModel->numLines = 4;
+	}
+	// BUG? this would make more sense in the if above
+	colModel->lines[0].p0.z = FAKESUSPENSION;
+
+	SetupSuspensionLines();
+
+	AutoPilot.m_nCarMission = MISSION_NONE;
+	AutoPilot.m_nTempAction = TEMPACT_NONE;
+	AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
+	AutoPilot.m_bStayInCurrentLevel = false;
+
+	SetStatus(STATUS_SIMPLE);
+	bUseCollisionRecords = true;
+	m_nNumPassengers = 0;
+	bIsVan = false;
+	bIsBus = false;
+	bIsBig = false;
+	bLowVehicle = false;
+	bPedPhysics = false;
+
+	bLeanMatrixClean = false;
+	m_leanMatrix = GetMatrix();
+}
+
+void
+CBike::SetModelIndex(uint32 id)
+{
+	CVehicle::SetModelIndex(id);
+	SetupModelNodes();
+}
+
+#define SAND_SLOWDOWN (0.02f)
+CVector vecTestResistance(0.9995f, 0.9f, 0.95f);
+float fDAxisX = 1.0f;
+float fDAxisXExtra = 100.0f;
+float fDAxisY = 1000.0f;
+float fInAirXRes = 0.88f;
+float fFlySpeedMult = -0.6f;
+
+void
+CBike::ProcessControl(void)
+{
+	int i;
+	float wheelRot;
+	float acceleration = 0.0f;
+	bool bBalancedByRider = false;
+	bool bStuckInSand = false;
+	float brake = 0.0f;
+	CColModel *colModel = GetColModel();
+	float wheelScale = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()))->m_wheelScale;
+	bWarnedPeds = false;
+	bLeanMatrixClean = false;
+	m_doingBurnout = 0;
+	bExtraSpeed = false;
+	bRestingOnPhysical = false;
+
+	if(CReplay::IsPlayingBack())
+		return;
+
+	ProcessCarAlarm();
+
+	ActivateBombWhenEntered();
+
+	CRubbish::StirUp(this);
+
+	UpdateClumpAlpha();
+
+	AutoPilot.m_bSlowedDownBecauseOfCars = false;
+	AutoPilot.m_bSlowedDownBecauseOfPeds = false;
+
+	switch(GetStatus()){
+	case STATUS_PLAYER:
+		bBalancedByRider = true;
+		bIsBeingPickedUp = false;
+		if(FindPlayerPed()->GetPedState() != PED_EXIT_CAR && FindPlayerPed()->GetPedState() != PED_DRAG_FROM_CAR){
+			ProcessControlInputs(0);
+
+			if(m_fLeanInput < 0.0f){
+				m_vecCentreOfMass.y = pHandling->CentreOfMass.y + pBikeHandling->fLeanBakCOM*m_fLeanInput;
+				CVector com = m_vecCentreOfMass;
+#ifdef FIX_BUGS
+				// center of mass has to have world space orientation. unfortunately we can't do wheelies
+				// at high speed then, flipping y here is like riding south without this fix where wheelies work
+				com.y = -com.y;
+				com = Multiply3x3(GetMatrix(), com);
+#endif
+				if(m_fBrakePedal == 0.0f && !bIsHandbrakeOn || m_nWheelsOnGround == 0){
+					if(GetModelIndex() == MI_SANCHEZ){
+						float force = m_fLeanInput*m_fTurnMass*pBikeHandling->fLeanBackForce*Min(m_vecMoveSpeed.Magnitude(), 0.1f);
+						force *= 0.7f*m_fGasPedal + 0.3f;
+						ApplyTurnForce(-force*CTimer::GetTimeStep()*GetUp(), com+GetForward());
+					}else{
+						float force = m_fLeanInput*m_fTurnMass*pBikeHandling->fLeanBackForce*Min(m_vecMoveSpeed.Magnitude(), 0.1f);
+						force *= 0.5f*m_fGasPedal + 0.5f;
+						ApplyTurnForce(-force*CTimer::GetTimeStep()*GetUp(), com+GetForward());
+					}
+				}
+			}else{
+				m_vecCentreOfMass.y = pHandling->CentreOfMass.y + pBikeHandling->fLeanFwdCOM*m_fLeanInput;
+				CVector com = m_vecCentreOfMass;
+#ifdef FIX_BUGS
+				// see above
+				com.y = -com.y;
+				com = Multiply3x3(GetMatrix(), com);
+#endif
+				if(m_fBrakePedal < 0.0f || m_nWheelsOnGround == 0){
+					float force = m_fLeanInput*m_fTurnMass*pBikeHandling->fLeanFwdForce*Min(m_vecMoveSpeed.Magnitude(), 0.1f);
+					ApplyTurnForce(-force*CTimer::GetTimeStep()*GetUp(), com+GetForward());
+				}
+			}
+
+			PruneReferences();
+
+			if(GetStatus() == STATUS_PLAYER && !CRecordDataForChase::IsRecording())
+				DoDriveByShootings();
+
+			if(m_aSuspensionSpringRatio[0] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[0].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[1] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[1].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[2] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[2].surfaceB) == ADHESIVE_SAND ||
+			   m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){
+				CVector parallelSpeed = m_vecMoveSpeed - DotProduct(m_vecMoveSpeed, GetUp())*GetUp();
+				if(m_fGasPedal > 0.3f){
+					if(parallelSpeed.MagnitudeSqr() < SQR(0.3f))
+						bStuckInSand = true;
+					parallelSpeed -= DotProduct(parallelSpeed, GetForward())*GetForward();
+				}
+				ApplyMoveForce(parallelSpeed * -CTimer::GetTimeStep()*SAND_SLOWDOWN*m_fMass);
+			}
+		}
+		if(CPad::GetPad(0)->WeaponJustDown())
+			ActivateBomb();
+		break;
+
+	case STATUS_PLAYER_PLAYBACKFROMBUFFER:
+		bBalancedByRider = true;
+		break;
+
+	case STATUS_SIMPLE:
+		CCarAI::UpdateCarAI(this);
+		CPhysical::ProcessControl();
+		CCarCtrl::UpdateCarOnRails(this);
+
+		m_nWheelsOnGround = 2;
+		m_nDriveWheelsOnGroundPrev = m_nDriveWheelsOnGround;
+		m_nDriveWheelsOnGround = 2;
+
+		pHandling->Transmission.CalculateGearForSimpleCar(AutoPilot.m_fMaxTrafficSpeed/50.0f, m_nCurrentGear);
+
+		wheelRot = ProcessWheelRotation(WHEEL_STATE_NORMAL, GetForward(), m_vecMoveSpeed, 0.5f*wheelScale);
+		for(i = 0; i < 2; i++)
+			m_aWheelRotation[i] += wheelRot;
+
+		PlayHornIfNecessary();
+		ReduceHornCounter();
+		bVehicleColProcessed = false;
+		bAudioChangingGear = false;
+		m_bike_flag80 = false;
+		// that's all we do for simple vehicles
+		return;
+
+	case STATUS_PHYSICS:
+		CCarAI::UpdateCarAI(this);
+		CCarCtrl::SteerAICarWithPhysics(this);
+		PlayHornIfNecessary();
+
+		bBalancedByRider = true;
+		m_bike_flag80 = false;
+
+		if(bIsBeingCarJacked){
+			m_fGasPedal = 0.0f;
+			m_fBrakePedal = 1.0f;
+			bIsHandbrakeOn = true;
+		}else
+			bIsBeingPickedUp = false;
+		break;
+
+	case STATUS_ABANDONED:
+		m_fBrakePedal = 0.0f;
+		if(m_vecMoveSpeed.MagnitudeSqr() < SQR(0.1f) || bIsStanding)
+			bIsHandbrakeOn = true;
+		else	
+			bIsHandbrakeOn = false;
+
+		m_fGasPedal = 0.0f;
+#ifdef FIX_BUGS
+		if(!IsAlarmOn())
+#endif
+			m_nCarHornTimer = 0;
+
+		bBalancedByRider = (pDriver || pPassengers[0] || bIsBeingCarJacked) && !bIsStanding;
+		m_fPedLeanAmountLR = 0.0f;
+		m_fPedLeanAmountUD = 0.0f;
+		m_bike_flag80 = false;
+
+		if(bIsBeingCarJacked){
+			m_fGasPedal = 0.0f;
+			m_fBrakePedal = 1.0f;
+			bIsHandbrakeOn = true;
+		}
+		break;
+
+	case STATUS_WRECKED:
+		m_fBrakePedal = 0.05f;
+		bIsHandbrakeOn = true;
+
+		m_fSteerAngle = 0.0f;
+		m_fGasPedal = 0.0f;
+#ifdef FIX_BUGS
+		if(!IsAlarmOn())
+#endif
+			m_nCarHornTimer = 0;
+
+		bBalancedByRider = false;
+		m_bike_flag80 = false;
+		m_fPedLeanAmountLR = 0.0f;
+		m_fPedLeanAmountUD = 0.0f;
+		break;
+
+	case STATUS_PLAYER_DISABLED:
+		if(m_vecMoveSpeed.MagnitudeSqr() < SQR(0.1f)){
+			m_fBrakePedal = 1.0f;
+			bIsHandbrakeOn = true;
+		}else{
+			m_fBrakePedal = 0.0f;
+			bIsHandbrakeOn = false;
+		}
+
+		m_fSteerAngle = 0.0f;
+		m_fGasPedal = 0.0f;
+#ifdef FIX_BUGS
+		if(!IsAlarmOn())
+#endif
+			m_nCarHornTimer = 0;
+
+		bBalancedByRider = true;
+		m_bike_flag80 = false;
+		break;
+	}
+
+	if(bIsStanding)
+		if(Abs(GetRight().z) > 0.35f || Abs(GetForward().z) > 0.5f)
+			bIsStanding = false;
+
+	if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
+		float fDx = fDAxisX;
+		CVector res = vecTestResistance;
+		CVector localTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
+
+		if(GetStatus() == STATUS_PLAYER){
+			if(m_aWheelTimer[BIKESUSP_F1] == 0.0f && m_aWheelTimer[BIKESUSP_F2] == 0.0f){
+				fDx = fDAxisXExtra;
+				if(!(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f) &&
+				   GetForward().z > 0.0f)
+					res.x -= Max(0.25f*Abs(pBikeHandling->fWheelieAng-GetForward().z), 0.07f);
+				else
+					res.x = fInAirXRes;
+			}else if(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f){
+				fDx = fDAxisXExtra;
+				if(GetForward().z < 0.0f)
+					res.x *= Max(0.3f*Abs(pBikeHandling->fStoppieAng-GetForward().z), 0.1f) + 0.9f;
+			}
+		}
+
+		res.x *= 1.0f/(fDx*SQR(localTurnSpeed.x) + 1.0f);
+		res.y *= 1.0f/(fDAxisY*SQR(localTurnSpeed.y) + 1.0f);
+		res.x = Pow(res.x, CTimer::GetTimeStep());
+		res.y = Pow(res.y, CTimer::GetTimeStep());
+		float turnX = localTurnSpeed.x*(res.x - 1.0f);
+		float turnY = localTurnSpeed.y*(res.y - 1.0f);
+
+		res = -GetUp() * turnY * m_fTurnMass;
+		ApplyTurnForce(res, GetRight() + Multiply3x3(GetMatrix(), m_vecCentreOfMass));
+
+		res = GetUp() * turnX * m_fTurnMass;
+		ApplyTurnForce(res, GetForward() + Multiply3x3(GetMatrix(), m_vecCentreOfMass));
+
+		if(GetStatus() != STATUS_PLAYER)
+			m_vecCentreOfMass = pHandling->CentreOfMass;
+	}else{
+		m_vecCentreOfMass = pHandling->CentreOfMass;
+		m_vecCentreOfMass.z = pBikeHandling->fNoPlayerCOMz;
+	}
+
+	// Skip physics if object is found to have been static recently
+	bool skipPhysics = false;
+	if(!bIsStuck && (GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED) && !bIsBeingPickedUp){
+		bool makeStatic = false;
+		float moveSpeedLimit, turnSpeedLimit, distanceLimit;
+
+		if(!bVehicleColProcessed &&
+		   m_vecMoveSpeed.IsZero() &&
+		// BUG? m_aSuspensionSpringRatioPrev[3] is checked twice in the game. also, why 3?
+		   m_aSuspensionSpringRatioPrev[3] != 1.0f)
+			makeStatic = true;
+
+		if(GetStatus() == STATUS_WRECKED){
+			moveSpeedLimit = 0.006f;
+			turnSpeedLimit = 0.0015f;
+			distanceLimit = 0.015f;
+		}else{
+			moveSpeedLimit = 0.003f;
+			turnSpeedLimit = 0.0009f;
+			distanceLimit = 0.005f;
+		}
+
+		m_vecMoveSpeedAvg = (m_vecMoveSpeedAvg + m_vecMoveSpeed)/2.0f;
+		m_vecTurnSpeedAvg = (m_vecTurnSpeedAvg + m_vecTurnSpeed)/2.0f;
+
+		if(m_vecMoveSpeedAvg.MagnitudeSqr() <= sq(moveSpeedLimit*CTimer::GetTimeStep()) &&
+		   m_vecTurnSpeedAvg.MagnitudeSqr() <= sq(turnSpeedLimit*CTimer::GetTimeStep()) &&
+		   m_fDistanceTravelled < distanceLimit &&
+		   makeStatic){
+			m_nStaticFrames++;
+
+			if(m_nStaticFrames > 10 || makeStatic)
+				if(!CCarCtrl::MapCouldMoveInThisArea(GetPosition().x, GetPosition().y)){
+					if(!makeStatic || m_nStaticFrames > 10)
+						m_nStaticFrames = 10;
+
+					skipPhysics = true;
+
+					m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+					m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+				}
+		}else
+			m_nStaticFrames = 0;
+	}
+
+	// Postpone
+	for(i = 0; i < 4; i++)
+		if(m_aGroundPhysical[i]){
+			bRestingOnPhysical = true;
+			if(!CWorld::bForceProcessControl && m_aGroundPhysical[i]->bIsInSafePosition){
+				bWasPostponed = true;
+				return;
+			}
+		}
+
+	if(bRestingOnPhysical){
+		skipPhysics = false;
+		m_nStaticFrames = 0;
+	}
+
+	VehicleDamage();
+
+	if(skipPhysics){
+		bHasContacted = false;
+		bIsInSafePosition = false;
+		bWasPostponed = false;
+		bHasHitWall = false;
+		m_nCollisionRecords = 0;
+		bHasCollided = false;
+		bVehicleColProcessed = false;
+		bAudioChangingGear = false;
+		m_nDamagePieceType = 0;
+		m_fDamageImpulse = 0.0f;
+		m_pDamageEntity = nil;
+		m_vecTurnFriction = CVector(0.0f, 0.0f, 0.0f);
+		m_vecMoveFriction = CVector(0.0f, 0.0f, 0.0f);
+// missing. BUG?
+//		m_fTireTemperature = 1.0f;
+
+		if(bIsStanding && m_fWheelAngle < DEGTORAD(20.0f))
+			m_fWheelAngle += DEGTORAD(1.0f)*CTimer::GetTimeStep();
+		if(bIsStanding){
+			float f = Pow(0.97f, CTimer::GetTimeStep());
+			m_fLeanLRAngle2 = m_fLeanLRAngle2*f - (Asin(clamp(GetRight().z,-1.0f,1.0f))+DEGTORAD(15.0f))*(1.0f-f);
+			m_fLeanLRAngle = m_fLeanLRAngle2;
+		}
+	}else{
+
+		// This has to be done if ProcessEntityCollision wasn't called
+		if(!bVehicleColProcessed){
+			CMatrix mat(GetMatrix());
+			bIsStuck = false;
+			bHasContacted = false;
+			bIsInSafePosition = false;
+			bWasPostponed = false;
+			bHasHitWall = false;
+			m_fDistanceTravelled = 0.0f;
+			m_bIsVehicleBeingShifted = false;
+			bSkipLineCol = false;
+			ApplyMoveSpeed();
+			ApplyTurnSpeed();
+			for(i = 0; CheckCollision() && i < 5; i++){
+				GetMatrix() = mat;
+				ApplyMoveSpeed();
+				ApplyTurnSpeed();
+			}
+			bIsInSafePosition = true;
+			bIsStuck = false;			
+		}
+
+		if(!(bBalancedByRider || bIsBeingPickedUp || bIsStanding)){
+			if(GetRight().z < 0.0f){
+				if(m_fSteerAngle > -DEGTORAD(25.0f))
+					m_fSteerAngle -= DEGTORAD(0.5f)*CTimer::GetTimeStep();
+			}else{
+				if(m_fSteerAngle < DEGTORAD(25.0f))
+					m_fSteerAngle += DEGTORAD(0.5f)*CTimer::GetTimeStep();
+			}
+		}
+
+		// Lean forward speed up
+		float savedAirResistance = m_fAirResistance;
+		if(GetStatus() == STATUS_PLAYER && pDriver){
+			CAnimBlendAssociation *assoc = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_FWD);
+			if(assoc && assoc->blendAmount > 0.5f &&
+			   assoc->currentTime > 0.06f && assoc->currentTime < 0.14f){
+				m_fAirResistance *= 0.6f;
+				if(m_fGasPedal > 0.5f && DotProduct(m_vecMoveSpeed, GetForward()) > 0.25f){
+					ApplyMoveForce(0.2f*m_fMass*GRAVITY*CTimer::GetTimeStep()*GetForward());
+					bExtraSpeed = true;
+				}
+			}
+		}
+
+		CPhysical::ProcessControl();
+		m_fAirResistance = savedAirResistance;
+
+		ProcessBuoyancy();
+
+		// Rescale spring ratios, i.e. subtract wheel radius
+		for(i = 0; i < 4; i++){
+			// wheel radius in relation to suspension line
+			float wheelRadius = 1.0f - m_aSuspensionSpringLength[i]/m_aSuspensionLineLength[i];
+			// rescale such that 0.0 is fully compressed and 1.0 is fully extended
+			m_aSuspensionSpringRatio[i] = (m_aSuspensionSpringRatio[i]-wheelRadius)/(1.0f-wheelRadius);
+		}
+
+		int rnd = 0;
+		float fwdSpeed = Abs(DotProduct(m_vecMoveSpeed, GetForward()));
+		CVector contactPoints[4];	// relative to model
+		CVector contactSpeeds[4];	// speed at contact points
+		CVector springDirections[4];	// normalized, in model space
+
+		for(i = 0; i < 4; i++){
+			// Set spring under certain circumstances
+			if(m_wheelStatus[i/2] == WHEEL_STATUS_MISSING)
+				m_aSuspensionSpringRatio[i] = 1.0f;
+			else if(m_wheelStatus[i/2] == WHEEL_STATUS_BURST){
+				// wheel more bumpy the faster we are
+				if(i == BIKESUSP_F1 || BIKESUSP_R1)
+					rnd = CGeneral::GetRandomNumberInRange(0, (uint16)(40*fwdSpeed) + 98) < 100;
+				if(rnd){
+					m_aSuspensionSpringRatio[i] += 0.3f*(m_aSuspensionLineLength[i]-m_aSuspensionSpringLength[i])/m_aSuspensionSpringLength[i];
+					if(m_aSuspensionSpringRatio[i] > 1.0f)
+						m_aSuspensionSpringRatio[i] = 1.0f;
+				}
+			}
+
+			// get points and directions if spring is compressed
+			if(m_aSuspensionSpringRatio[i] < 1.0f){
+				contactPoints[i] = m_aWheelColPoints[i].point - GetPosition();
+				springDirections[i] = Multiply3x3(GetMatrix(), colModel->lines[i].p1 - colModel->lines[i].p0);
+				springDirections[i].Normalise();
+			}
+		}
+
+		m_aWheelSkidmarkType[0] = m_aWheelSkidmarkType[1] = SKIDMARK_NORMAL;
+		m_aWheelSkidmarkUnk[0] = m_aWheelSkidmarkUnk[1] = false;
+
+		// Make springs push up vehicle
+		for(i = 0; i < 4; i++){
+			if(m_aSuspensionSpringRatio[i] < 1.0f){
+				float bias = pHandling->fSuspensionBias;
+				if(i == BIKESUSP_R1 || i == BIKESUSP_R2)
+					bias = 1.0f - bias;
+
+				if(m_aWheelColPoints[i].normal.z > 0.35f)
+					ApplySpringCollisionAlt(pHandling->fSuspensionForceLevel,
+						springDirections[i], contactPoints[i],
+						m_aSuspensionSpringRatio[i], bias, m_aWheelColPoints[i].normal);
+				else
+					ApplySpringCollision(pHandling->fSuspensionForceLevel,
+						springDirections[i], contactPoints[i],
+						m_aSuspensionSpringRatio[i], bias);
+
+				if(m_aWheelColPoints[i].surfaceB == SURFACE_GRASS ||
+				   m_aWheelColPoints[i].surfaceB == SURFACE_MUD_DRY){
+					if(i < 2)
+						m_aWheelSkidmarkType[0] = SKIDMARK_MUDDY;
+					else
+						m_aWheelSkidmarkType[1] = SKIDMARK_MUDDY;
+				}else if(m_aWheelColPoints[i].surfaceB == SURFACE_SAND ||
+				         m_aWheelColPoints[i].surfaceB == SURFACE_SAND_BEACH){
+					if(i < 2){
+						m_aWheelSkidmarkType[0] = SKIDMARK_SANDY;
+						m_aWheelSkidmarkUnk[0] = true;
+					}else{
+						m_aWheelSkidmarkType[1] = SKIDMARK_SANDY;
+						m_aWheelSkidmarkUnk[1] = true;
+					}
+				}
+			}else{
+				contactPoints[i] = Multiply3x3(GetMatrix(), colModel->lines[i].p1);
+			}
+		}
+
+		// Get speed at contact points
+		for(i = 0; i < 4; i++){
+			contactSpeeds[i] = GetSpeed(contactPoints[i]);
+			if(m_aGroundPhysical[i]){
+				// subtract movement of physical we're standing on
+				contactSpeeds[i] -= m_aGroundPhysical[i]->GetSpeed(m_aGroundOffset[i]);
+#ifndef FIX_BUGS
+				// this shouldn't be reset because we still need it below
+				m_aGroundPhysical[i] = nil;
+#endif
+			}
+		}
+
+		CVector normal;
+		if(m_aSuspensionSpringRatio[0] < 1.0f || m_aSuspensionSpringRatio[1] < 1.0f){
+			normal = m_aSuspensionSpringRatio[0] < 1.0f ? m_aWheelColPoints[0].normal : m_aWheelColPoints[1].normal;
+			if(normal.z > 0.35f)
+				springDirections[0] = -normal;
+			normal = m_aSuspensionSpringRatio[1] < 1.0f ? m_aWheelColPoints[1].normal : m_aWheelColPoints[0].normal;
+			if(normal.z > 0.35f)
+				springDirections[1] = -normal;
+		}
+		if(m_aSuspensionSpringRatio[2] < 1.0f || m_aSuspensionSpringRatio[3] < 1.0f){
+			normal = m_aSuspensionSpringRatio[2] < 1.0f ? m_aWheelColPoints[2].normal : m_aWheelColPoints[3].normal;
+			if(normal.z > 0.35f)
+				springDirections[2] = -normal;
+			normal = m_aSuspensionSpringRatio[3] < 1.0f ? m_aWheelColPoints[3].normal : m_aWheelColPoints[2].normal;
+			if(normal.z > 0.35f)
+				springDirections[3] = -normal;
+		}
+
+		// game has dead code here if m_vecMoveSpeed.Magnitude() < 0.01f
+
+		// dampen springs
+		for(i = 0; i < 4; i++)
+			if(m_aSuspensionSpringRatio[i] < 1.0f)
+				ApplySpringDampening(pHandling->fSuspensionDampingLevel,
+					springDirections[i], contactPoints[i], contactSpeeds[i]);
+
+		// Get speed at contact points again
+		for(i = 0; i < 4; i++){
+			contactSpeeds[i] = GetSpeed(contactPoints[i]);
+			if(m_aGroundPhysical[i]){
+				// subtract movement of physical we're standing on
+				contactSpeeds[i] -= m_aGroundPhysical[i]->GetSpeed(m_aGroundOffset[i]);
+				m_aGroundPhysical[i] = nil;
+			}
+		}
+
+		bool gripCheat = true;
+		fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward());
+		if(!CVehicle::bCheat3)
+			gripCheat = false;
+		float acceleration = pHandling->Transmission.CalculateDriveAcceleration(m_fGasPedal, m_nCurrentGear, m_fChangeGearTime, fwdSpeed, gripCheat);
+		acceleration /= m_fForceMultiplier;
+
+		brake = m_fBrakePedal * pHandling->fBrakeDeceleration * CTimer::GetTimeStep();
+		bool neutralHandling = GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && (pHandling->Flags & HANDLING_NEUTRALHANDLING);
+		float brakeBiasFront = neutralHandling ? 1.0f : 2.0f*pHandling->fBrakeBias;
+		float brakeBiasRear  = neutralHandling ? 1.0f : 2.0f*(1.0f-pHandling->fBrakeBias);
+		float tractionBiasFront = neutralHandling ? 1.0f : 2.0f*pHandling->fTractionBias;
+		float tractionBiasRear  = neutralHandling ? 1.0f : 2.0f-tractionBiasFront;
+
+		// Count how many wheels are touching the ground
+
+		m_nWheelsOnGround = 0;
+		m_nDriveWheelsOnGroundPrev = m_nDriveWheelsOnGround;
+		m_nDriveWheelsOnGround = 0;
+
+		for(i = 0; i < 4; i++){
+			if(m_aSuspensionSpringRatio[i] < 1.0f)
+				m_aWheelTimer[i] = 4.0f;
+			else
+				m_aWheelTimer[i] = Max(m_aWheelTimer[i]-CTimer::GetTimeStep(), 0.0f);
+
+			if(m_aWheelTimer[i] > 0.0f){
+				m_nWheelsOnGround++;
+				if(i == BIKESUSP_R1 || i == BIKESUSP_R2)
+					m_nDriveWheelsOnGround = 1;
+				if(m_nWheelsOnGround == 1)
+					m_vecAvgSurfaceNormal = m_aWheelColPoints[i].normal;
+				else
+					m_vecAvgSurfaceNormal += m_aWheelColPoints[i].normal;
+			}
+		}
+
+		if(m_nWheelsOnGround == 0)
+			m_vecAvgSurfaceNormal = CVector(0.0f, 0.0f, 1.0f);
+		else{
+			m_vecAvgSurfaceNormal /= m_nWheelsOnGround;
+			if(DotProduct(m_vecAvgSurfaceNormal, GetUp()) < -0.5f)
+				m_vecAvgSurfaceNormal *= -1.0f;
+		}
+
+		// Find contact points for wheel processing
+		int frontLine = m_aSuspensionSpringRatio[BIKESUSP_F1] < m_aSuspensionSpringRatio[BIKESUSP_F2] ?
+			BIKESUSP_F1 : BIKESUSP_F2;
+		CVector frontContact(0.0f,
+			colModel->lines[BIKESUSP_F1].p0.y,
+			colModel->lines[BIKESUSP_F1].p0.z - m_aSuspensionSpringRatio[frontLine]*m_aSuspensionSpringLength[BIKESUSP_F1] - 0.5f*wheelScale);
+		frontContact = Multiply3x3(GetMatrix(), frontContact);
+
+		int rearLine = m_aSuspensionSpringRatio[BIKESUSP_R1] < m_aSuspensionSpringRatio[BIKESUSP_R2] ?
+			BIKESUSP_R1 : BIKESUSP_R2;
+		CVector rearContact(0.0f,
+			colModel->lines[BIKESUSP_R1].p0.y,
+			colModel->lines[BIKESUSP_R1].p0.z - m_aSuspensionSpringRatio[rearLine]*m_aSuspensionSpringLength[BIKESUSP_R1] - 0.5f*wheelScale);
+		rearContact = Multiply3x3(GetMatrix(), rearContact);
+
+		float traction = 0.004f * m_fTraction;
+		traction *= pHandling->fTractionMultiplier / 4.0f;
+
+		// Turn wheel
+		if(GetStatus() == STATUS_PLAYER || !bIsStanding || bIsBeingPickedUp){
+			if(Abs(m_vecMoveSpeed.x) < 0.01f && Abs(m_vecMoveSpeed.y) < 0.01f && m_fSteerAngle == 0.0f){
+				m_fWheelAngle *= Pow(0.96f, CTimer::GetTimeStep());
+			}else{
+				float f;
+				if(fwdSpeed > 0.01f && m_aWheelTimer[BIKESUSP_F1] > 0.0f && m_aWheelTimer[BIKESUSP_F2] > 0.0f && GetStatus() == STATUS_PLAYER){
+					CColPoint point;
+					point.surfaceA = SURFACE_WHEELBASE;
+					point.surfaceB = SURFACE_TARMAC;
+					float steer = CSurfaceTable::GetAdhesiveLimit(point)*4.0f*pBikeHandling->fSpeedSteer*traction;
+					if(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB) == ADHESIVE_LOOSE ||
+					   CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB) == ADHESIVE_SAND)
+						steer *= pBikeHandling->fSlipSteer;
+					f = Asin(Min(steer/SQR(fwdSpeed), 1.0))/DEGTORAD(pHandling->fSteeringLock);
+					if(m_fSteerAngle < 0.0f && m_fLeanLRAngle < 0.0f &&
+					   m_fSteerAngle > 0.0f && m_fLeanLRAngle > 0.0f)
+						f *= 2.0f;
+					f = Min(f, 1.0f);
+				}else{
+					f = 1.0f;
+				}
+				if(GetStatus() != STATUS_PLAYER)
+					f = 1.0f;
+				m_fWheelAngle = m_fSteerAngle*f;
+			}
+		}else if(m_fWheelAngle < DEGTORAD(20.0f))
+			m_fWheelAngle += DEGTORAD(1.5f)*CTimer::GetTimeStep();
+
+		static float fThrust;
+		static tWheelState WheelState[2];
+		CVector initialMoveSpeed = m_vecMoveSpeed;
+		bool rearWheelsFirst = !!(pHandling->Flags & HANDLING_REARWHEEL_1ST);
+
+		// Process front wheel - first try
+
+		if(!rearWheelsFirst){
+			if(m_aWheelTimer[BIKESUSP_F1] > 0.0f || m_aWheelTimer[BIKESUSP_F2] > 0.0f){
+				// Wheel on ground
+				eBikeWheelSpecial spec;
+				if(m_aWheelTimer[BIKESUSP_R1] > 0.0f || m_aWheelTimer[BIKESUSP_R2] > 0.0f)
+					spec = BIKE_WHEELSPEC_0;
+				else
+					spec = BIKE_WHEELSPEC_2;
+				CVector wheelFwd = Multiply3x3(GetMatrix(), CVector(-Sin(m_fWheelAngle), Cos(m_fWheelAngle), 0.0f));
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[frontLine].normal)*m_aWheelColPoints[frontLine].normal;
+				wheelFwd.Normalise();
+				CVector wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[frontLine].normal);
+				wheelRight.Normalise();
+
+				fThrust = 0.0f;
+				m_aWheelColPoints[frontLine].surfaceA = SURFACE_WHEELBASE;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[frontLine])*traction;
+				float adhesionDestab = 1.0f;
+				if(m_fBrakeDestabilization > 0.0f)
+					switch(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[frontLine].surfaceB)){
+					case ADHESIVE_HARD:
+					case ADHESIVE_LOOSE:
+						adhesionDestab = 0.9f;
+						break;
+					case ADHESIVE_ROAD:
+						adhesionDestab = 0.7f;
+						break;
+					}
+				if(GetStatus() == STATUS_PLAYER)
+					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[frontLine].surfaceB);
+				if(m_wheelStatus[BIKEWHEEL_FRONT] == WHEEL_STATUS_BURST)
+					adhesion *= 0.4f;
+				WheelState[BIKEWHEEL_FRONT] = m_aWheelState[BIKEWHEEL_FRONT];
+				CVector contactSpeed = GetSpeed(frontContact);
+				ProcessBikeWheel(wheelFwd, wheelRight,
+					contactSpeed, frontContact,
+					2, fThrust,
+					brake*brakeBiasFront,
+					adhesion*tractionBiasFront, adhesionDestab,
+					BIKEWHEEL_FRONT,
+					&m_aWheelSpeed[BIKEWHEEL_FRONT],
+					&WheelState[BIKEWHEEL_FRONT],
+					spec,
+					m_wheelStatus[BIKEWHEEL_FRONT]);
+				if(bStuckInSand && (WheelState[BIKEWHEEL_FRONT] == WHEEL_STATE_SPINNING || WheelState[BIKEWHEEL_FRONT] == WHEEL_STATE_SKIDDING))
+					WheelState[BIKEWHEEL_FRONT] = WHEEL_STATE_NORMAL;
+			}else{
+				// Wheel in the air
+				m_aWheelSpeed[BIKEWHEEL_FRONT] *= 0.95f;
+				m_aWheelRotation[BIKEWHEEL_FRONT] += m_aWheelSpeed[BIKEWHEEL_FRONT];
+			}
+		}
+
+		// Process rear wheel
+
+		if(m_aWheelTimer[BIKESUSP_R1] > 0.0f || m_aWheelTimer[BIKESUSP_R2] > 0.0f){
+			// Wheel on ground
+			float rearBrake = brake;
+			float rearTraction = traction;
+
+			CVector wheelFwd = GetForward();
+			CVector wheelRight = GetRight();
+			wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[rearLine].normal)*m_aWheelColPoints[rearLine].normal;
+			wheelFwd.Normalise();
+			wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[rearLine].normal);
+			wheelRight.Normalise();
+
+			if(bIsHandbrakeOn){
+#ifdef FIX_BUGS
+				// Not sure if this is needed, but brake usually has timestep as a factor
+				rearBrake = 20000.0f * CTimer::GetTimeStepFix();
+#else
+				rearBrake = 20000.0f;
+#endif
+				m_fTireTemperature = 1.0f;
+			}else if(m_doingBurnout){
+				rearBrake = 0.0f;
+				rearTraction = 0.0f;
+				ApplyTurnForce(contactPoints[BIKESUSP_R1], -0.0007f*m_fTurnMass*m_fSteerAngle*GetRight()*CTimer::GetTimeStep());
+			}else if(m_fTireTemperature < 1.0f && m_fGasPedal > 0.75f){
+				rearTraction *= m_fTireTemperature;
+				ApplyTurnForce(contactPoints[BIKESUSP_R1], (1.0f-m_fTireTemperature)*-0.0007f*m_fTurnMass*m_fSteerAngle*GetRight()*CTimer::GetTimeStep());
+			}
+
+			if(fThrust > 0.0f && brake > 0.0f)
+				brake = 0.0f;	// only affects next front wheel. is this intended?
+			fThrust = acceleration;
+			m_aWheelColPoints[rearLine].surfaceA = SURFACE_WHEELBASE;
+			float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[rearLine])*rearTraction;
+			float adhesionDestab = 1.0f;
+			if(m_fBrakeDestabilization > 0.0f)
+				switch(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[rearLine].surfaceB)){
+				case ADHESIVE_HARD:
+				case ADHESIVE_LOOSE:
+					adhesionDestab = 0.9f;
+					break;
+				case ADHESIVE_ROAD:
+					adhesionDestab = 0.7f;
+					break;
+				}
+			if(GetStatus() == STATUS_PLAYER)
+				adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[rearLine].surfaceB);
+			if(m_wheelStatus[BIKEWHEEL_REAR] == WHEEL_STATUS_BURST)
+				adhesion *= 0.4f;
+			WheelState[BIKEWHEEL_REAR] = m_aWheelState[BIKEWHEEL_REAR];
+			CVector contactSpeed = GetSpeed(rearContact);
+			ProcessBikeWheel(wheelFwd, wheelRight,
+				contactSpeed, rearContact,
+				2, fThrust,
+				rearBrake*brakeBiasRear,
+				adhesion*tractionBiasRear, adhesionDestab,
+				BIKEWHEEL_REAR,
+				&m_aWheelSpeed[BIKEWHEEL_REAR],
+				&WheelState[BIKEWHEEL_REAR],
+				BIKE_WHEELSPEC_1,
+				m_wheelStatus[BIKEWHEEL_REAR]);
+			if(bStuckInSand && (WheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SPINNING || WheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SKIDDING))
+				WheelState[BIKEWHEEL_REAR] = WHEEL_STATE_NORMAL;
+		}else{
+			// Wheel in the air
+			if(bIsHandbrakeOn)
+				m_aWheelSpeed[BIKEWHEEL_REAR] = 0.0f;
+			else{
+				if(acceleration > 0.0f){
+					if(m_aWheelSpeed[BIKEWHEEL_REAR] < 2.0f)
+						m_aWheelSpeed[BIKEWHEEL_REAR] -= 0.2f;
+				}else{
+					if(m_aWheelSpeed[BIKEWHEEL_REAR] > -2.0f)
+						m_aWheelSpeed[BIKEWHEEL_REAR] += 0.1f;
+				}
+			}
+			m_aWheelRotation[BIKEWHEEL_REAR] += m_aWheelSpeed[BIKEWHEEL_REAR];
+		}
+
+		if(m_doingBurnout && m_aWheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SPINNING){
+			m_fTireTemperature += 0.001f*CTimer::GetTimeStep();
+			if(m_fTireTemperature > 3.0f)
+				m_fTireTemperature = 3.0f;
+		}else if(m_fTireTemperature > 1.0f){
+			m_fTireTemperature = (m_fTireTemperature - 1.0f)*Pow(0.995f, CTimer::GetTimeStep()) + 1.0f;
+		}
+
+		// Process front wheel - second try
+
+		if(rearWheelsFirst){
+			if(m_aWheelTimer[BIKESUSP_F1] > 0.0f || m_aWheelTimer[BIKESUSP_F2] > 0.0f){
+				// Wheel on ground
+				eBikeWheelSpecial spec;
+				if(m_aWheelTimer[BIKESUSP_R1] > 0.0f || m_aWheelTimer[BIKESUSP_R2] > 0.0f)
+					spec = BIKE_WHEELSPEC_0;
+				else
+					spec = BIKE_WHEELSPEC_2;
+				CVector wheelFwd = GetMatrix() * CVector(-Sin(m_fWheelAngle), Cos(m_fWheelAngle), 0.0f);
+				wheelFwd -= DotProduct(wheelFwd, m_aWheelColPoints[frontLine].normal)*m_aWheelColPoints[frontLine].normal;
+				wheelFwd.Normalise();
+				CVector wheelRight = CrossProduct(wheelFwd, m_aWheelColPoints[frontLine].normal);
+				wheelRight.Normalise();
+
+				fThrust = 0.0f;
+				m_aWheelColPoints[frontLine].surfaceA = SURFACE_WHEELBASE;
+				float adhesion = CSurfaceTable::GetAdhesiveLimit(m_aWheelColPoints[frontLine])*traction;
+				float adhesionDestab = 1.0f;
+				if(m_fBrakeDestabilization > 0.0f)
+					switch(CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[frontLine].surfaceB)){
+					case ADHESIVE_HARD:
+					case ADHESIVE_LOOSE:
+						adhesionDestab = 0.9f;
+						break;
+					case ADHESIVE_ROAD:
+						adhesionDestab = 0.7f;
+						break;
+					}
+				if(GetStatus() == STATUS_PLAYER)
+					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[frontLine].surfaceB);
+				if(m_wheelStatus[BIKEWHEEL_FRONT] == WHEEL_STATUS_BURST)
+					adhesion *= 0.4f;
+				WheelState[BIKEWHEEL_FRONT] = m_aWheelState[BIKEWHEEL_FRONT];
+				CVector contactSpeed = GetSpeed(frontContact);
+				ProcessBikeWheel(wheelFwd, wheelRight,
+					contactSpeed, frontContact,
+					2, fThrust,
+					brake*brakeBiasFront,
+					adhesion*tractionBiasFront, adhesionDestab,
+					BIKEWHEEL_FRONT,
+					&m_aWheelSpeed[BIKEWHEEL_FRONT],
+					&WheelState[BIKEWHEEL_FRONT],
+					spec,
+					m_wheelStatus[BIKEWHEEL_FRONT]);
+				if(bStuckInSand && (WheelState[BIKEWHEEL_FRONT] == WHEEL_STATE_SPINNING || WheelState[BIKEWHEEL_FRONT] == WHEEL_STATE_SKIDDING))
+					WheelState[BIKEWHEEL_FRONT] = WHEEL_STATE_NORMAL;
+			}else{
+				// Wheel in the air
+				m_aWheelSpeed[BIKEWHEEL_FRONT] *= 0.95f;
+				m_aWheelRotation[BIKEWHEEL_FRONT] += m_aWheelSpeed[BIKEWHEEL_FRONT];
+			}
+		}
+
+		// Process leaning
+		float idleAngle = 0.0f;
+		if(pDriver){
+			CAnimBlendAssociation *assoc = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_STILL);
+			if(assoc)
+				idleAngle = DEGTORAD(10.0f) * assoc->blendAmount;
+		}
+		if(bBalancedByRider || bIsBeingPickedUp){
+			m_vecAvgSurfaceRight = CrossProduct(GetForward(), m_vecAvgSurfaceNormal);
+			m_vecAvgSurfaceRight.Normalise();
+			float lean;
+			if(m_nWheelsOnGround == 0)
+				lean = -m_fSteerAngle/DEGTORAD(pHandling->fSteeringLock)*0.5f*GRAVITY*CTimer::GetTimeStep();
+			else
+				lean = DotProduct(m_vecMoveSpeed-initialMoveSpeed, m_vecAvgSurfaceRight);
+			lean /= GRAVITY*Max(CTimer::GetTimeStep(), 0.01f);
+			if(m_wheelStatus[BIKEWHEEL_FRONT] == WHEEL_STATUS_BURST)
+				lean = clamp(lean, -0.4f*pBikeHandling->fMaxLean, 0.4f*pBikeHandling->fMaxLean);
+			else
+				lean = clamp(lean, -pBikeHandling->fMaxLean, pBikeHandling->fMaxLean);
+			float f = Pow(pBikeHandling->fDesLean, CTimer::GetTimeStep());
+			m_fLeanLRAngle2 = (Asin(lean) - idleAngle)*(1.0f-f) + m_fLeanLRAngle2*f;
+		}else{
+			if(bIsStanding){
+				float f = Pow(0.97f, CTimer::GetTimeStep());
+				m_fLeanLRAngle2 = m_fLeanLRAngle2*f - (Asin(GetRight().z) + DEGTORAD(15.0f) + idleAngle)*(1.0f-f);
+			}else{
+				float f = Pow(0.95f, CTimer::GetTimeStep());
+				m_fLeanLRAngle2 = m_fLeanLRAngle2*f;
+			}
+		}
+		m_fLeanLRAngle = m_fLeanLRAngle2;
+
+		// Destabilize steering when braking
+		if((m_aSuspensionSpringRatio[BIKESUSP_F1] < 1.0f || m_aSuspensionSpringRatio[BIKESUSP_F2] < 1.0f) &&
+		   m_fBrakePedal - m_fGasPedal > 0.9f &&
+		   fwdSpeed > 0.02f &&
+		   !bIsHandbrakeOn){
+			m_fBrakeDestabilization += CGeneral::GetRandomNumberInRange(0.5f, 1.0f)*0.2f*CTimer::GetTimeStep();
+			if(m_aSuspensionSpringRatio[BIKESUSP_R1] < 1.0f || m_aSuspensionSpringRatio[BIKESUSP_R2] < 1.0f){
+				// BUG: this clamp makes no sense and the arguments seem swapped too
+				ApplyTurnForce(contactPoints[BIKESUSP_R1],
+					m_fTurnMass*Sin(m_fBrakeDestabilization)*clamp(fwdSpeed, 0.5f, 0.2f)*0.013f*GetRight()*CTimer::GetTimeStep());
+			}else{
+				// BUG: this clamp makes no sense and the arguments seem swapped too
+				ApplyTurnForce(contactPoints[BIKESUSP_R1],
+					m_fTurnMass*Sin(m_fBrakeDestabilization)*clamp(fwdSpeed, 0.5f, 0.2f)*0.003f*GetRight()*CTimer::GetTimeStep());
+			}
+		}else
+			m_fBrakeDestabilization = 0.0f;
+
+		// Update wheel positions from suspension
+		float frontWheelPos = colModel->lines[frontLine].p0.z;
+		if(m_aSuspensionSpringRatio[frontLine] > 0.0f)
+			frontWheelPos -= m_aSuspensionSpringRatio[frontLine]*m_aSuspensionSpringLength[frontLine];
+		m_aWheelPosition[BIKEWHEEL_FRONT] += (frontWheelPos - m_aWheelPosition[BIKEWHEEL_FRONT])*0.75f;
+
+		float rearWheelPos = colModel->lines[rearLine].p0.z;
+		if(m_aSuspensionSpringRatio[rearLine] > 0.0f)
+			rearWheelPos -= m_aSuspensionSpringRatio[rearLine]*m_aSuspensionSpringLength[rearLine];
+		m_aWheelPosition[BIKEWHEEL_REAR] += (rearWheelPos - m_aWheelPosition[BIKEWHEEL_REAR])*0.75f;
+
+		for(i = 0; i < 2; i++)
+			m_aWheelState[i] = WheelState[i];
+		// never spin when moving backwards
+		if(m_fGasPedal < 0.0f && m_aWheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SPINNING)
+			m_aWheelState[BIKEWHEEL_REAR] = WHEEL_STATE_NORMAL;
+
+		// Process horn
+
+		if(GetStatus() != STATUS_PLAYER){
+#ifdef FIX_BUGS
+			if(!IsAlarmOn())
+#endif
+				ReduceHornCounter();
+		}else{
+#ifdef FIX_BUGS
+			if(!IsAlarmOn())
+#endif
+			{
+				if(Pads[0].GetHorn())
+					m_nCarHornTimer = 1;
+				else
+					m_nCarHornTimer = 0;
+			}
+		}
+	}
+
+	if(m_fHealth < 250.0f && GetStatus() != STATUS_WRECKED){
+		// Car is on fire
+
+		CVector damagePos, fireDir;
+
+		// move fire forward if in first person
+		if(this == FindPlayerVehicle() && TheCamera.GetLookingForwardFirstPerson()){
+			damagePos = CVector(0.0f, 1.2f, -0.4f);
+			fireDir = CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.01125f, 0.09f));
+		}else{
+			damagePos = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()))->m_positions[CAR_POS_BACKSEAT];
+			damagePos.z -= 0.3f;
+			fireDir = CGeneral::GetRandomNumberInRange(0.02025f, 0.09f) * GetRight();
+			fireDir -= CGeneral::GetRandomNumberInRange(0.02025f, 0.18f) * GetForward();
+			fireDir.z = CGeneral::GetRandomNumberInRange(0.00225f, 0.018f);
+		}
+
+		damagePos = GetMatrix()*damagePos;
+		CParticle::AddParticle(PARTICLE_CARFLAME, damagePos, fireDir,
+			nil, 0.9f);
+
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, CVector(0.0f, 0.0f, 0.0f), nil, 0.5f);
+
+		damagePos.x += CGeneral::GetRandomNumberInRange(-0.5625f, 0.5625f),
+		damagePos.y += CGeneral::GetRandomNumberInRange(-0.5625f, 0.5625f),
+		damagePos.z += CGeneral::GetRandomNumberInRange(0.5625f, 2.25f);
+		CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, damagePos, CVector(0.0f, 0.0f, 0.0f));
+
+		// Blow up car after 5 seconds
+		m_fFireBlowUpTimer += CTimer::GetTimeStepInMilliseconds();
+		if(m_fFireBlowUpTimer > 5000.0f)
+			BlowUpCar(m_pSetOnFireEntity);
+	}else
+		m_fFireBlowUpTimer = 0.0f;
+
+	ProcessDelayedExplosion();
+
+	// Find out how much to shake the pad depending on suspension and ground surface
+
+	float suspShake = 0.0f;
+	float surfShake = 0.0f;
+	float speedsq = m_vecMoveSpeed.MagnitudeSqr();
+	for(i = 0; i < 4; i++){
+		float suspChange = m_aSuspensionSpringRatioPrev[i] - m_aSuspensionSpringRatio[i];
+		if(suspChange > 0.3f && (i == BIKESUSP_F1 || i == BIKESUSP_R1) && speedsq > 0.04f){
+			if(GetStatus() == STATUS_PLAYER || GetStatus() == STATUS_PHYSICS){
+				if(m_wheelStatus[i] == WHEEL_STATUS_BURST)
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_JUMP_2, suspChange);
+				else
+					DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_JUMP, suspChange);
+				if(suspChange > suspShake)
+					suspShake = suspChange;
+			}
+		}
+
+		if(this == FindPlayerVehicle()){
+			uint8 surf = m_aWheelColPoints[i].surfaceB;
+			if(surf == SURFACE_GRAVEL || surf == SURFACE_WATER || surf == SURFACE_HEDGE){
+				if(surfShake < 0.2f)
+					surfShake = 0.3f;
+			}else if(surf == SURFACE_MUD_DRY || surf == SURFACE_SAND || surf == SURFACE_SAND_BEACH){
+				if(surfShake < 0.1f)
+					surfShake = 0.2f;
+			}else if(surf == SURFACE_GRASS){
+				if(surfShake < 0.05f)
+					surfShake = 0.1f;
+			}
+
+// BUG: this only observes one of the wheels
+			TheCamera.m_bVehicleSuspenHigh = Abs(suspChange) > 0.05f;
+		}
+
+		m_aSuspensionSpringRatioPrev[i] = m_aSuspensionSpringRatio[i];
+		m_aSuspensionSpringRatio[i] = 1.0f;
+	}
+
+	// Shake pad
+
+	if((suspShake > 0.0f || surfShake > 0.0f) && GetStatus() == STATUS_PLAYER){
+		float speed = m_vecMoveSpeed.MagnitudeSqr();
+		if(speed > sq(0.1f)){
+			speed = Sqrt(speed);
+			if(suspShake > 0.0f){
+				uint8 freq = Min(200.0f*suspShake*speed*2000.0f/m_fMass + 100.0f, 250.0f);
+				CPad::GetPad(0)->StartShake(20000.0f*CTimer::GetTimeStep()/freq, freq);
+			}else{
+				uint8 freq = Min(200.0f*surfShake*speed*2000.0f/m_fMass + 40.0f, 150.0f);
+				CPad::GetPad(0)->StartShake(5000.0f*CTimer::GetTimeStep()/freq, freq);
+			}
+		}
+	}
+
+	bVehicleColProcessed = false;
+	bAudioChangingGear = false;
+
+	if(!bWarnedPeds)
+		CCarCtrl::ScanForPedDanger(this);
+
+	if(bInfiniteMass){
+		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+		m_vecTurnSpeed = CVector(0.0f, 0.0f, 0.0f);
+		m_vecMoveFriction = CVector(0.0f, 0.0f, 0.0f);
+		m_vecTurnFriction = CVector(0.0f, 0.0f, 0.0f);
+	}else if(!skipPhysics &&
+	         (acceleration == 0.0f && brake == 0.0f || GetStatus() == STATUS_WRECKED)){
+		if(Abs(m_vecMoveSpeed.x) < 0.005f &&
+		   Abs(m_vecMoveSpeed.y) < 0.005f &&
+		   Abs(m_vecMoveSpeed.z) < 0.005f){
+			m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
+			m_vecTurnSpeed.z = 0.0f;
+		}
+	}
+
+	// Balance bike
+	if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
+		float onSideness = clamp(DotProduct(GetRight(), m_vecAvgSurfaceNormal), -1.0f, 1.0f);
+		CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
+		// Keep bike upright
+		if(bBalancedByRider){
+			ApplyTurnForce(-0.07f*onSideness*m_fTurnMass*GetUp()*CTimer::GetTimeStep(), worldCOM+GetRight());
+			bIsStanding = false;
+		}else
+			ApplyTurnForce(-0.1f*onSideness*m_fTurnMass*GetUp()*CTimer::GetTimeStep(), worldCOM+GetRight());
+
+		// Wheelie/Stoppie stabilization
+		if(GetStatus() == STATUS_PLAYER){
+			if(m_aWheelTimer[BIKESUSP_F1] == 0.0f && m_aWheelTimer[BIKESUSP_F2] == 0.0f && GetForward().z > 0.0 &&
+			   !(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f)){
+				// Wheelie
+				float wheelie = pBikeHandling->fWheelieAng - GetForward().z;
+				if(wheelie > 0.15f)
+					// below wheelie angle
+					wheelie = Max(0.3f - wheelie, 0.0f);
+				else if(wheelie < -0.08f)
+					// above wheelie angle
+					wheelie = Min(-0.15f - wheelie, 0.0f);
+				float wheelieStab = pBikeHandling->fWheelieStabMult * Min(m_vecMoveSpeed.Magnitude(), 0.1f) * wheelie;
+				ApplyTurnForce(0.5f*CTimer::GetTimeStep()*wheelieStab*m_fTurnMass*GetUp(), worldCOM+GetForward());
+				ApplyTurnForce(0.5f*CTimer::GetTimeStep()*m_fWheelAngle*pBikeHandling->fWheelieSteer*m_fTurnMass*GetRight(), worldCOM+GetForward());
+			}else if(m_aWheelTimer[BIKESUSP_R1] == 0.0f && m_aWheelTimer[BIKESUSP_R2] == 0.0f && GetForward().z < 0.0 &&
+			         !(m_aWheelTimer[BIKESUSP_F1] == 0.0f && m_aWheelTimer[BIKESUSP_F2] == 0.0f)){
+				// Stoppie
+				float stoppie = pBikeHandling->fStoppieAng - GetForward().z;
+				if(stoppie > 0.15f)
+					// below stoppie angle
+					stoppie = Max(0.3f - stoppie, 0.0f);
+				else if(stoppie < -0.15f)
+					// above stoppie angle
+					stoppie = Min(-0.3f - stoppie, 0.0f);
+				float speed = m_vecMoveSpeed.Magnitude();
+				float stoppieStab = pBikeHandling->fStoppieStabMult * Min(speed, 0.1f) * stoppie;
+				ApplyTurnForce(0.5f*CTimer::GetTimeStep()*stoppieStab*m_fTurnMass*GetUp(), worldCOM+GetForward());
+				ApplyTurnForce(0.5f*Min(5.0f*speed,1.0f)*CTimer::GetTimeStep()*m_fWheelAngle*pBikeHandling->fWheelieSteer*m_fTurnMass*GetRight(), worldCOM+GetForward());
+			}
+		}
+	}
+}
+
+void
+CBike::Teleport(CVector pos)
+{
+	CWorld::Remove(this);
+
+	SetPosition(pos);
+	SetOrientation(0.0f, 0.0f, 0.0f);
+	SetMoveSpeed(0.0f, 0.0f, 0.0f);
+	SetTurnSpeed(0.0f, 0.0f, 0.0f);
+
+	ResetSuspension();
+
+	CWorld::Add(this);
+}
+
+void
+CBike::PreRender(void)
+{
+	int i;
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+
+	// Wheel particles
+
+	if(m_aWheelState[BIKEWHEEL_REAR] != WHEEL_STATE_NORMAL &&
+	   m_aWheelColPoints[BIKESUSP_R2].surfaceB != SURFACE_WATER && m_aWheelTimer[BIKESUSP_R2] > 0.0f){
+		static float smokeSize = 0.2f;
+		CVector groundPos = m_aWheelColPoints[BIKESUSP_R2].point;
+		if(m_aSuspensionSpringRatioPrev[BIKESUSP_R1] < 1.0f)
+			groundPos = (groundPos + m_aWheelColPoints[BIKESUSP_R1].point)/2.0f;
+		groundPos += Sin(m_fLeanLRAngle) * 0.8f*GetColModel()->boundingBox.min.z * GetRight();
+		CParticle::AddParticle(PARTICLE_RUBBER_SMOKE,
+			groundPos + CVector(0.0f, 0.0f, 0.25f), CVector(0.0f, 0.0f, 0.0f),
+			nil, smokeSize);
+
+		CSkidmarks::RegisterOne((uintptr)this, groundPos, GetForward().x, GetForward().y,
+			m_aWheelSkidmarkType[BIKEWHEEL_REAR], &m_aWheelSkidmarkBloody[BIKEWHEEL_REAR]);
+
+		if(m_aWheelState[BIKEWHEEL_REAR] == WHEEL_STATE_SPINNING &&
+		   (CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[BIKESUSP_R2].surfaceB) == ADHESIVE_HARD ||
+		    CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[BIKESUSP_R2].surfaceB) == ADHESIVE_ROAD)){
+			CParticle::AddParticle(PARTICLE_BURNINGRUBBER_SMOKE,
+				groundPos + CVector(0.0f, 0.0f, 0.25f),
+				CVector(0.0f, 0.0f, 0.0f));
+			CParticle::AddParticle(PARTICLE_BURNINGRUBBER_SMOKE,
+				groundPos + CVector(0.0f, 0.0f, 0.25f),
+				CVector(0.0f, 0.0f, 0.05f));
+		}
+	}else if(m_aWheelSkidmarkBloody[BIKEWHEEL_REAR] || m_aWheelSkidmarkUnk[BIKEWHEEL_REAR]){
+		CVector groundPos = m_aWheelColPoints[BIKESUSP_R2].point;
+		groundPos += Sin(m_fLeanLRAngle) * 0.8f*GetColModel()->boundingBox.min.z * GetRight();
+
+		CSkidmarks::RegisterOne((uintptr)this, groundPos, GetForward().x, GetForward().y,
+			m_aWheelSkidmarkType[BIKEWHEEL_REAR], &m_aWheelSkidmarkBloody[BIKEWHEEL_REAR]);
+	}
+
+	// Process lights
+
+	// Turn lights on/off
+	bool shouldLightsBeOn = 
+		CClock::GetHours() > 20 ||
+		CClock::GetHours() > 19 && CClock::GetMinutes() > (m_randomSeed & 0x3F) ||
+		CClock::GetHours() < 7 ||
+		CClock::GetHours() < 8 && CClock::GetMinutes() < (m_randomSeed & 0x3F) ||
+		m_randomSeed/50000.0f < CWeather::Foggyness ||
+		m_randomSeed/50000.0f < CWeather::WetRoads;
+	if(shouldLightsBeOn != bLightsOn && GetStatus() != STATUS_WRECKED){
+		if(GetStatus() == STATUS_ABANDONED){
+			// Turn off lights on abandoned vehicles only when we they're far away
+			if(bLightsOn &&
+			   Abs(TheCamera.GetPosition().x - GetPosition().x) + Abs(TheCamera.GetPosition().y - GetPosition().y) > 100.0f)
+				bLightsOn = false;
+		}else
+			bLightsOn = shouldLightsBeOn;
+	}
+
+	// Actually render the lights
+	bool alarmOn = false;
+	bool alarmOff = false;
+	if(IsAlarmOn()){
+		if(CTimer::GetTimeInMilliseconds() & 0x100)
+			alarmOn = true;
+		else
+			alarmOff = true;
+	}
+	if(bEngineOn && bLightsOn || alarmOn || alarmOff){
+		CalculateLeanMatrix();
+		CVector lookVector = GetPosition() - TheCamera.GetPosition();
+		float camDist = lookVector.Magnitude();
+		if(camDist != 0.0f)
+			lookVector *= 1.0f/camDist;
+		else
+			lookVector = CVector(1.0f, 0.0f, 0.0f);
+
+		// 1.0 if directly behind car, -1.0 if in front
+		float behindness = DotProduct(lookVector, GetForward());
+		// 0.0 if behind car, PI if in front
+		float angle = Abs(PI/2.0f - Acos(Abs(behindness)));
+
+		// Headlight
+
+		CMatrix mat;
+		CVector headLightPos = mi->m_positions[CAR_POS_HEADLIGHTS];
+#ifdef FIX_BUGS
+		if(GetModelIndex() == MI_FAGGIO || GetModelIndex() == MI_PIZZABOY)
+#else
+		if(GetModelIndex() == 152)	// this is the bobcat in VC
+#endif
+		{
+			mat.SetUnity();
+			mat.RotateZ(m_fWheelAngle);
+			mat = m_leanMatrix * mat;
+		}else
+			mat = m_leanMatrix;
+		CVector light = mat * headLightPos;
+		if(behindness < 0.0f){
+			// In front of bike
+			float intensity = -0.5f*behindness + 0.3f;
+			float size = 1.0f - behindness;
+
+			if(behindness < -0.97f && camDist < 30.0f){
+				// Directly in front and not too far away
+				if(pHandling->Flags & HANDLING_HALOGEN_LIGHTS){
+					CCoronas::RegisterCorona((uintptr)this + 6, 150, 150, 195, 255,
+						light, 1.2f, 45.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_HEADLIGHT, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, angle);
+				}else{
+					CCoronas::RegisterCorona((uintptr)this + 6, 160, 160, 140, 255,
+						light, 1.2f, 45.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_HEADLIGHT, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, angle);
+				}
+			}
+
+			if(alarmOff){
+				CCoronas::RegisterCorona((uintptr)this, 0, 0, 0, 0,
+					light, size, 0.0f,
+					CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+					CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
+			}else{
+				if(pHandling->Flags & HANDLING_HALOGEN_LIGHTS){
+					CCoronas::RegisterCorona((uintptr)this + 1, 190*intensity, 190*intensity, 255*intensity, 255,
+						light, size, 50.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
+				}else{
+					CCoronas::RegisterCorona((uintptr)this + 1, 210*intensity, 210*intensity, 195*intensity, 255,
+						light, size, 50.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
+				}
+			}
+		}else{
+			CCoronas::UpdateCoronaCoors((uintptr)this, light, 50.0f*TheCamera.LODDistMultiplier, angle);
+		}
+
+		// bright light
+		CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->FrontLights + BRIGHTLIGHT_FRONT);
+
+		// Taillight
+
+		CVector tailLightPos = mi->m_positions[CAR_POS_TAILLIGHTS];
+		light = m_leanMatrix * tailLightPos;
+
+		// Taillight corona
+		if(behindness > 0.0f){
+			// Behind car
+			float intensity = 0.4f*behindness + 0.4f;
+			float size = (behindness + 1.0f)/2.0f;
+
+			if(m_fGasPedal < 0.0f){
+				// reversing
+				// no lights in this case
+			}else{
+				if(m_fBrakePedal > 0.0f){
+					intensity += 0.4f;
+					size += 0.3f;
+				}
+
+				if(alarmOff){
+					CCoronas::RegisterCorona((uintptr)this + 14, 0, 0, 0, 0,
+						light, size, 0.0f,
+						CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
+				}else{
+					CCoronas::RegisterCorona((uintptr)this + 14, 128*intensity, 0, 0, 255,
+						light, size, 50.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_STREAK, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, angle);
+				}
+			}
+		}else{
+			CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, angle);
+		}
+
+		// bright light
+		CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->RearLights + BRIGHTLIGHT_REAR);
+
+		// Light shadows
+		if(!alarmOff){
+			CVector pos = GetPosition();
+			CVector2D fwd(GetForward());
+			fwd.Normalise();
+			float f = headLightPos.y + 6.0f;
+			pos += CVector(f*fwd.x, f*fwd.y, 2.0f);
+
+// TODO(MIAMI):
+//			CShadows::StoreCarLightShadow(this, (uintptr)this + 22, gpShadowExplosionTex, &pos,
+//				7.0f*fwd.x, 7.0f*fwd.y, 3.5f*fwd.y, -3.5f*fwd.x, 45, 45, 45, 7.0f);
+
+			f = (tailLightPos.y - 2.5f) - (headLightPos.y + 6.0f);
+			pos += CVector(f*fwd.x, f*fwd.y, 0.0f);
+// TODO(MIAMI):
+//			CShadows::StoreCarLightShadow(this, (uintptr)this + 25, gpShadowExplosionTex, &pos,
+//				3.0f, 0.0f, 0.0f, -3.0f, 35, 0, 0, 4.0f);
+		}
+
+		if(this == FindPlayerVehicle() && !alarmOff){
+			CPointLights::AddLight(CPointLights::LIGHT_DIRECTIONAL, GetPosition(), GetForward(),
+				20.0f, 1.0f, 1.0f, 1.0f,
+				FindPlayerVehicle()->m_vecMoveSpeed.MagnitudeSqr2D() < sq(0.45f) ? CPointLights::FOG_NORMAL : CPointLights::FOG_NONE,
+				false);
+			CVector pos = GetPosition() - 4.0f*GetForward();
+			if(m_fBrakePedal > 0.0f)
+				CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f),
+					10.0f, 1.0f, 0.0f, 0.0f,
+					CPointLights::FOG_NONE, false);
+			else
+				CPointLights::AddLight(CPointLights::LIGHT_POINT, pos, CVector(0.0f, 0.0f, 0.0f),
+					7.0f, 0.6f, 0.0f, 0.0f,
+					CPointLights::FOG_NONE, false);
+		}
+	}else if(GetStatus() != STATUS_ABANDONED && GetStatus() != STATUS_WRECKED){
+		// Lights off
+		CalculateLeanMatrix();
+
+		CVector tailLightPos = mi->m_positions[CAR_POS_TAILLIGHTS];
+		CVector light = m_leanMatrix * tailLightPos;
+
+		if(m_fBrakePedal > 0.0f || m_fGasPedal < 0.0f){
+			CVector lookVector = GetPosition() - TheCamera.GetPosition();
+			lookVector.Normalise();
+			float behindness = DotProduct(lookVector, GetForward());
+			if(behindness > 0.0f){
+				if(m_fGasPedal < 0.0f){
+					// reversing
+					// no lights in this case
+				}else{
+					// braking
+					CCoronas::RegisterCorona((uintptr)this + 14, 120, 0, 0, 255,
+						light, 1.2f, 50.0f*TheCamera.LODDistMultiplier,
+						CCoronas::TYPE_STAR, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
+						CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, 0.0f);
+					CBrightLights::RegisterOne(light, GetUp(), GetRight(), GetForward(), pHandling->RearLights + BRIGHTLIGHT_REAR);
+				}
+			}else{
+				CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, 0.0f);
+			}
+		}else{
+			CCoronas::UpdateCoronaCoors((uintptr)this + 14, light, 50.0f*TheCamera.LODDistMultiplier, 0.0f);
+		}
+	}
+
+
+	// Wheel particles
+
+	float fwdSpeed = DotProduct(m_vecMoveSpeed, GetForward())*180.0f;
+	int drawParticles = Abs(fwdSpeed) < 90.0f;
+	int susp = BIKESUSP_F1;
+	for(i = 0; i < 2; i++){
+		if(i == BIKEWHEEL_REAR)
+			susp = BIKESUSP_R1;
+
+		static float speedSq;
+		// Sparks for friction of burst wheels
+		if(m_wheelStatus[i] == WHEEL_STATUS_BURST && m_aSuspensionSpringRatioPrev[susp] < 1.0f &&
+		   (speedSq = m_vecMoveSpeed.MagnitudeSqr(), speedSq > SQR(0.1f)) &&
+		   m_aWheelColPoints[susp].surfaceB != SURFACE_GRASS &&
+		   m_aWheelColPoints[susp].surfaceB != SURFACE_MUD_DRY &&
+		   m_aWheelColPoints[susp].surfaceB != SURFACE_SAND &&
+		   m_aWheelColPoints[susp].surfaceB != SURFACE_SAND_BEACH){
+			CVector normalSpeed = m_aWheelColPoints[susp].normal * DotProduct(m_aWheelColPoints[susp].normal, m_vecMoveSpeed);
+			CVector frictionSpeed = m_vecMoveSpeed - normalSpeed;
+			CVector sparkDir = 0.25f*frictionSpeed;
+			CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
+
+			if(speedSq > 0.04f)
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
+			if(speedSq > 0.16f){
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, m_aWheelColPoints[susp].point, sparkDir);
+			}
+		}else if(m_aSuspensionSpringRatioPrev[i] < 1.0f &&
+		         (fwdSpeed > 0.2f || m_aWheelState[i] == WHEEL_STATE_SPINNING)){
+			if(m_aWheelColPoints[susp].surfaceB == SURFACE_GRASS ||
+			   m_aWheelColPoints[susp].surfaceB == SURFACE_MUD_DRY ||
+			   m_aWheelColPoints[susp].surfaceB == SURFACE_SAND ||
+			   m_aWheelColPoints[susp].surfaceB == SURFACE_SAND_BEACH)
+				AddWheelDirtAndWater(&m_aWheelColPoints[susp], drawParticles);
+		}
+	}
+
+	AddDamagedVehicleParticles();
+//TODO(MIAMI): StoreShadowForVehicle once we have it
+
+	CMatrix mat;
+	CVector pos;
+	CColModel *colModel = mi->GetColModel();
+
+	// Wheel rotation
+	CVector frontWheelFwd = Multiply3x3(GetMatrix(), CVector(-Sin(m_fSteerAngle), Cos(m_fSteerAngle), 0.0f));
+	CVector rearWheelFwd = GetForward();
+	if(m_aWheelTimer[BIKESUSP_F1] > 0.0f || m_aWheelTimer[BIKESUSP_F2] > 0.0f){
+		float springRatio = Min(m_aSuspensionSpringRatioPrev[BIKESUSP_F1], m_aSuspensionSpringRatioPrev[BIKESUSP_F2]);
+		CVector contactPoint(0.0f,
+			(colModel->lines[BIKESUSP_F1].p0.y - colModel->lines[BIKESUSP_F2].p0.y)/2.0f,
+			colModel->lines[BIKESUSP_F1].p0.z - m_aSuspensionSpringLength[BIKESUSP_F1]*springRatio - 0.5f*mi->m_wheelScale);
+		CVector contactSpeed = GetSpeed(contactPoint);
+		// Why is wheel state always normal?
+		m_aWheelSpeed[BIKEWHEEL_FRONT] = ProcessWheelRotation(WHEEL_STATE_NORMAL, frontWheelFwd, contactSpeed, 0.5f*mi->m_wheelScale);
+		m_aWheelRotation[BIKEWHEEL_FRONT] += m_aWheelSpeed[BIKEWHEEL_FRONT];
+	}
+	if(m_aWheelTimer[BIKESUSP_R1] > 0.0f || m_aWheelTimer[BIKESUSP_R2] > 0.0f){
+		float springRatio = Min(m_aSuspensionSpringRatioPrev[BIKESUSP_R1], m_aSuspensionSpringRatioPrev[BIKESUSP_R2]);
+		CVector contactPoint(0.0f,
+			(colModel->lines[BIKESUSP_R1].p0.y - colModel->lines[BIKESUSP_R2].p0.y)/2.0f,
+			colModel->lines[BIKESUSP_R1].p0.z - m_aSuspensionSpringLength[BIKESUSP_R1]*springRatio - 0.5f*mi->m_wheelScale);
+		CVector contactSpeed = GetSpeed(contactPoint);
+		m_aWheelSpeed[BIKEWHEEL_REAR] = ProcessWheelRotation(m_aWheelState[BIKEWHEEL_REAR], rearWheelFwd, contactSpeed, 0.5f*mi->m_wheelScale);
+		m_aWheelRotation[BIKEWHEEL_REAR] += m_aWheelSpeed[BIKEWHEEL_REAR];
+	}
+
+	// Front fork
+	if(m_aBikeNodes[BIKE_FORKS_FRONT]){
+		mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_FORKS_FRONT]));
+		pos = mat.GetPosition();
+
+		RwMatrix rwrot;
+		// TODO: this looks like some weird ctor we don't have
+		CMatrix rot;
+		rot.m_attachment = &rwrot;
+		rot.SetUnity();
+		rot.UpdateRW();
+
+		// Make rotation matrix with front fork as axis
+		CVector forkAxis(0.0f, Sin(DEGTORAD(mi->m_bikeSteerAngle)), -Cos(DEGTORAD(mi->m_bikeSteerAngle)));
+		forkAxis.Normalise();	// as if that's not already the case
+		CQuaternion quat;
+		quat.Set((RwV3d*)&forkAxis, -m_fWheelAngle);
+		quat.Get(rot.m_attachment);
+		rot.Update();
+
+		// Transform fork
+		mat.SetUnity();
+		mat = mat * rot;
+		mat.Translate(pos);
+		mat.UpdateRW();
+
+		if(m_aBikeNodes[BIKE_HANDLEBARS]){
+			// Transform handle
+			mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_HANDLEBARS]));
+			pos = mat.GetPosition();
+			if(GetStatus() == STATUS_ABANDONED || GetStatus() == STATUS_WRECKED){
+				mat.SetUnity();
+				mat = mat * rot;
+				mat.Translate(pos);
+			}else
+				mat.SetTranslate(mat.GetPosition());
+			mat.UpdateRW();
+		}
+	}
+
+	// Rear fork
+	if(m_aBikeNodes[BIKE_FORKS_REAR]){
+		float sine = (m_aWheelPosition[BIKEWHEEL_REAR] - m_aWheelBasePosition[BIKEWHEEL_REAR])/m_fRearForkLength;
+		mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_FORKS_REAR]));
+		pos = mat.GetPosition();
+		mat.SetRotate(-Asin(sine), 0.0f, 0.0f);
+		mat.Translate(pos);
+		mat.UpdateRW();
+	}
+
+	// Front wheel
+	mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_WHEEL_FRONT]));
+	pos.x = mat.GetPosition().x;
+	pos.z = m_aWheelPosition[BIKEWHEEL_FRONT] - m_fFrontForkZ;
+	float y = (colModel->lines[BIKESUSP_F1].p0.y+colModel->lines[BIKESUSP_F2].p0.y)/2.0f - m_fFrontForkY;
+	pos.y = y - (m_aWheelPosition[BIKEWHEEL_FRONT] - m_aWheelBasePosition[BIKEWHEEL_FRONT])*m_fFrontForkSlope;
+	if(m_wheelStatus[BIKEWHEEL_FRONT] == WHEEL_STATUS_BURST)
+		mat.SetRotate(m_aWheelRotation[BIKEWHEEL_FRONT], 0.0f, 0.05f*Sin(m_aWheelRotation[BIKEWHEEL_FRONT]));
+	else
+		mat.SetRotateX(m_aWheelRotation[BIKEWHEEL_FRONT]);
+	mat.Translate(pos);
+	mat.UpdateRW();
+	// and mudguard
+	mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_MUDGUARD]));
+	mat.SetTranslateOnly(pos);
+	mat.UpdateRW();
+
+	// Rear wheel
+	mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_WHEEL_REAR]));
+	pos = mat.GetPosition();
+	if(m_wheelStatus[BIKEWHEEL_REAR] == WHEEL_STATUS_BURST)
+		mat.SetRotate(m_aWheelRotation[BIKEWHEEL_REAR], 0.0f, 0.07f*Sin(m_aWheelRotation[BIKEWHEEL_REAR]));
+	else
+		mat.SetRotateX(m_aWheelRotation[BIKEWHEEL_REAR]);
+	mat.Translate(pos);
+	mat.UpdateRW();
+
+	// Chassis
+	if(m_aBikeNodes[BIKE_CHASSIS]){
+		mat.Attach(RwFrameGetMatrix(m_aBikeNodes[BIKE_CHASSIS]));
+		pos = mat.GetPosition();
+		pos.z = (1.0f - Cos(m_fLeanLRAngle)) * (0.9*colModel->boundingBox.min.z);
+		mat.SetRotateX(-0.05f*Abs(m_fLeanLRAngle));
+		mat.RotateY(m_fLeanLRAngle);
+		mat.Translate(pos);
+		mat.UpdateRW();
+	}
+
+	// Exhaust smoke
+	if(bEngineOn && !(pHandling->Flags & HANDLING_NO_EXHAUST) && fwdSpeed < 130.0f){
+		CVector exhaustPos = mi->m_positions[CAR_POS_EXHAUST];
+		CVector pos1, pos2, dir;
+
+		if(exhaustPos != CVector(0.0f, 0.0f, 0.0f)){
+			dir.z = 0.0f;
+			if(fwdSpeed < 10.0f){
+				CVector steerFwd(-Sin(m_fSteerAngle), Cos(m_fSteerAngle), 0.0f);
+				steerFwd = Multiply3x3(GetMatrix(), steerFwd);
+				float r = CGeneral::GetRandomNumberInRange(-0.06f, -0.03f);
+				dir.x = steerFwd.x * r;
+				dir.y = steerFwd.y * r;
+			}else{
+				dir.x = m_vecMoveSpeed.x;
+				dir.y = m_vecMoveSpeed.y;
+			}
+
+			bool dblExhaust = false;
+			pos1 = GetMatrix() * exhaustPos;
+			if(pHandling->Flags & HANDLING_DBL_EXHAUST){
+				dblExhaust = true;
+				pos2 = exhaustPos;
+				pos2.x = -pos2.x;
+				pos2 = GetMatrix() * pos2;
+			}
+
+			static float fumesLimit = 2.0f;
+			if(CGeneral::GetRandomNumberInRange(1.0f, 3.0f)*(m_fGasPedal+1.1f) > fumesLimit){
+				CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos1, dir);
+				if(dblExhaust)
+					CParticle::AddParticle(PARTICLE_EXHAUST_FUMES, pos2, dir);
+
+				if(GetStatus() == STATUS_PLAYER && (CTimer::GetFrameCounter()&3) == 0 &&
+				   CWeather::Rain == 0.0f){
+					CVector camDist = GetPosition() - TheCamera.GetPosition();
+					if(DotProduct(GetForward(), camDist) > 0.0f ||
+					   TheCamera.GetLookDirection() == LOOKING_LEFT ||
+					   TheCamera.GetLookDirection() == LOOKING_RIGHT){
+						if(dblExhaust)
+							pos1 = 0.5f*pos1 + 0.5f*pos2;
+
+						if(TheCamera.GetLookDirection() == LOOKING_LEFT ||
+						   TheCamera.GetLookDirection() == LOOKING_RIGHT)
+							pos1 -= 0.2f*GetForward();
+
+						CParticle::AddParticle(PARTICLE_HEATHAZE, pos1, CVector(0.0f, 0.0f, 0.0f));
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CBike::Render(void)
+{
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+
+	m_nSetPieceExtendedRangeTime = CTimer::GetTimeInMilliseconds() + 3000;
+	mi->SetVehicleColour(m_currentColour1, m_currentColour2);
+	CEntity::Render();
+}
+
+int32
+CBike::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
+{
+	int i;
+	CColModel *colModel;
+
+	if(GetStatus() != STATUS_SIMPLE)
+		bVehicleColProcessed = true;
+
+	colModel = GetColModel();
+
+	int numWheelCollisions = 0;
+	float prevRatios[4] = { 0.0f, 0.0f, 0.0f, 0.0f};
+	for(i = 0; i < 4; i++)
+		prevRatios[i] = m_aSuspensionSpringRatio[i];
+
+	if(m_bIsVehicleBeingShifted || bSkipLineCol || ent->IsPed() ||
+	   GetModelIndex() == MI_DODO && ent->IsVehicle())
+		colModel->numLines = 0;
+
+	int numCollisions = CCollision::ProcessColModels(GetMatrix(), *colModel,
+		ent->GetMatrix(), *ent->GetColModel(),
+		colpoints,
+		m_aWheelColPoints, m_aSuspensionSpringRatio);
+
+	// m_aSuspensionSpringRatio are now set to the point where the tyre touches ground.
+	// In ProcessControl these will be re-normalized to ignore the tyre radius.
+	if(colModel->numLines){
+		for(i = 0; i < 4; i++){
+			if(m_aSuspensionSpringRatio[i] < 1.0f && m_aSuspensionSpringRatio[i] < prevRatios[i]){
+				numWheelCollisions++;
+
+				// wheel is touching a physical
+				if(ent->IsVehicle() || ent->IsObject()){
+					CPhysical *phys = (CPhysical*)ent;
+
+					m_aGroundPhysical[i] = phys;
+					phys->RegisterReference((CEntity**)&m_aGroundPhysical[i]);
+					m_aGroundOffset[i] = m_aWheelColPoints[i].point - phys->GetPosition();
+				}
+
+				m_nSurfaceTouched = m_aWheelColPoints[i].surfaceB;
+				if(ent->IsBuilding())
+					m_pCurGroundEntity = ent;
+			}
+		}
+	}else
+		colModel->numLines = 4;
+
+	if(numCollisions > 0 || numWheelCollisions > 0){
+		AddCollisionRecord(ent);
+		if(!ent->IsBuilding())
+			((CPhysical*)ent)->AddCollisionRecord(this);
+
+		if(numCollisions > 0)
+			if(ent->IsBuilding() ||
+			   ent->IsObject() && ((CPhysical*)ent)->bInfiniteMass)
+				bHasHitWall = true;
+	}
+
+	return numCollisions;
+}
+
+static int16 nLastControlInput;
+static float fMouseCentreRange = 0.35f;
+static float fMouseSteerSens = -0.0035f;
+static float fMouseCentreMult = 0.975f;
+
+void
+CBike::ProcessControlInputs(uint8 pad)
+{
+	float speed = DotProduct(m_vecMoveSpeed, GetForward());
+
+	if(CPad::GetPad(pad)->GetExitVehicle())
+		bIsHandbrakeOn = true;
+	else
+		bIsHandbrakeOn = !!CPad::GetPad(pad)->GetHandBrake();
+
+	// Steer left/right
+#ifdef FIX_BUGS
+	if(CCamera::m_bUseMouse3rdPerson && !CVehicle::m_bDisableMouseSteering){
+		if(CPad::GetPad(pad)->GetMouseX() != 0.0f){
+			m_fSteerInput += fMouseSteerSens*CPad::GetPad(pad)->GetMouseX();
+			nLastControlInput = 2;
+			if(Abs(m_fSteerInput) < fMouseCentreRange)
+				m_fSteerInput *= Pow(fMouseCentreMult, CTimer::GetTimeStep());
+		}else if(CPad::GetPad(pad)->GetSteeringLeftRight() || nLastControlInput != 2){
+			// mouse hasn't move, steer with pad like below
+			m_fSteerInput += (-CPad::GetPad(pad)->GetSteeringLeftRight()/128.0f - m_fSteerInput)*
+				0.2f*CTimer::GetTimeStep();
+			nLastControlInput = 0;
+		}
+	}else
+#endif
+	{
+		m_fSteerInput += (-CPad::GetPad(pad)->GetSteeringLeftRight()/128.0f - m_fSteerInput)*
+			0.2f*CTimer::GetTimeStep();
+		nLastControlInput = 0;
+	}
+	m_fSteerInput = clamp(m_fSteerInput, -1.0f, 1.0f);
+
+	// Lean forward/backward
+	float updown = -CPad::GetPad(pad)->GetSteeringUpDown()/128.0f + CPad::GetPad(pad)->GetCarGunUpDown()/128.0f;
+	m_fLeanInput += (updown - m_fLeanInput)*0.2f*CTimer::GetTimeStep();
+	m_fLeanInput = clamp(m_fLeanInput, -1.0f, 1.0f);
+
+	// Accelerate/Brake
+	float acceleration = (CPad::GetPad(pad)->GetAccelerate() - CPad::GetPad(pad)->GetBrake())/255.0f;
+	if(GetModelIndex() == MI_DODO && acceleration < 0.0f)
+		acceleration *= 0.3f;
+	if(Abs(speed) < 0.01f){
+		// standing still, go into direction we want
+		if(CPad::GetPad(pad)->GetAccelerate() > 150.0f && CPad::GetPad(pad)->GetBrake() > 150.0f){
+			m_fGasPedal = CPad::GetPad(pad)->GetAccelerate()/255.0f;
+			m_fBrakePedal = CPad::GetPad(pad)->GetBrake()/255.0f;
+			m_doingBurnout = 1;
+		}else{
+			m_fGasPedal = acceleration;
+			m_fBrakePedal = 0.0f;
+		}
+	}else{
+#if 1
+		// simpler than the code below
+		if(speed * acceleration < 0.0f){
+			// if opposite directions, have to brake first
+			m_fGasPedal = 0.0f;
+			m_fBrakePedal = Abs(acceleration);
+		}else{
+			// accelerating in same direction we were already going
+			m_fGasPedal = acceleration;
+			m_fBrakePedal = 0.0f;
+		}
+#else
+		if(speed < 0.0f){
+			// moving backwards currently
+			if(acceleration < 0.0f){
+				// still go backwards
+				m_fGasPedal = acceleration;
+				m_fBrakePedal = 0.0f;
+			}else{
+				// want to go forwards, so brake
+				m_fGasPedal = 0.0f;
+				m_fBrakePedal = acceleration;
+			}
+		}else{
+			// moving forwards currently
+			if(acceleration < 0.0f){
+				// want to go backwards, so brake
+				m_fGasPedal = 0.0f;
+				m_fBrakePedal = -acceleration;
+			}else{
+				// still go forwards
+				m_fGasPedal = acceleration;
+				m_fBrakePedal = 0.0f;
+			}
+		}
+#endif
+	}
+
+	// Actually turn wheels
+	static float fValue;	// why static?
+	if(m_fSteerInput < 0.0f)
+		fValue = -sq(m_fSteerInput);
+	else
+		fValue = sq(m_fSteerInput);
+	m_fSteerAngle = DEGTORAD(pHandling->fSteeringLock) * fValue;
+
+	if(bComedyControls){
+		if(((CTimer::GetTimeInMilliseconds() >> 10) & 0xF) < 12)
+			m_fGasPedal = 1.0f;
+		if((((CTimer::GetTimeInMilliseconds() >> 10)+6) & 0xF) < 12)
+			m_fBrakePedal = 0.0f;
+		bIsHandbrakeOn = false;
+		if(CTimer::GetTimeInMilliseconds() & 0x800)
+			m_fSteerAngle += 0.08f;
+		else
+			m_fSteerAngle -= 0.03f;
+	}
+
+	// Brake if player isn't in control
+	// BUG: game always uses pad 0 here
+	if(CPad::GetPad(pad)->ArePlayerControlsDisabled()){
+		m_fBrakePedal = 1.0f;
+		bIsHandbrakeOn = true;
+		m_fGasPedal = 0.0f;
+
+		FindPlayerPed()->KeepAreaAroundPlayerClear();
+
+		// slow down car immediately
+		speed = m_vecMoveSpeed.Magnitude();
+		if(speed > 0.28f)
+			m_vecMoveSpeed *= 0.28f/speed;
+	}
+}
+
+void
+CBike::ProcessBuoyancy(void)
+{
+	int i;
+	CVector impulse, point;
+
+	if(mod_Buoyancy.ProcessBuoyancy(this, m_fBuoyancy, &point, &impulse)){
+		bTouchingWater = true;
+		ApplyMoveForce(impulse);
+		ApplyTurnForce(impulse, point);
+
+		float timeStep = Max(CTimer::GetTimeStep(), 0.01f);
+		float impulseRatio = impulse.z / (GRAVITY * m_fMass * timeStep);
+		float waterResistance = Pow(1.0f - 0.05f*impulseRatio, CTimer::GetTimeStep());
+		m_vecMoveSpeed *= waterResistance;
+		m_vecTurnSpeed *= waterResistance;
+
+		if(impulseRatio > 0.8f ||
+		   impulseRatio > 0.4f && (m_aSuspensionSpringRatio[0] == 1.0f ||
+		                           m_aSuspensionSpringRatio[1] == 1.0f ||
+		                           m_aSuspensionSpringRatio[2] == 1.0f ||
+		                           m_aSuspensionSpringRatio[3] == 1.0f)){
+			bIsInWater = true;
+			bIsDrowning = true;
+			if(m_vecMoveSpeed.z < -0.1f)
+				m_vecMoveSpeed.z = -0.1f;
+
+			if(pDriver){
+				pDriver->bIsInWater = true;
+				if(pDriver->IsPlayer() || !bWaterTight){
+					if(m_aSuspensionSpringRatio[0] < 1.0f ||
+					   m_aSuspensionSpringRatio[1] < 1.0f ||
+					   m_aSuspensionSpringRatio[2] < 1.0f ||
+					   m_aSuspensionSpringRatio[3] < 1.0f)
+						pDriver->InflictDamage(nil, WEAPONTYPE_DROWNING, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
+					else
+						KnockOffRider(WEAPONTYPE_DROWNING, 0, pDriver, false);
+				}
+			}
+			for(i = 0; i < m_nNumMaxPassengers; i++)
+				if(pPassengers[i]){
+					pPassengers[i]->bIsInWater = true;
+					if(pPassengers[i]->IsPlayer() || !bWaterTight){
+						if(m_aSuspensionSpringRatio[0] < 1.0f ||
+						   m_aSuspensionSpringRatio[1] < 1.0f ||
+						   m_aSuspensionSpringRatio[2] < 1.0f ||
+						   m_aSuspensionSpringRatio[3] < 1.0f)
+							pPassengers[i]->InflictDamage(nil, WEAPONTYPE_DROWNING, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
+						else
+							KnockOffRider(WEAPONTYPE_DROWNING, 0, pPassengers[i], false);
+					}
+				}
+		}else{
+			bIsInWater = false;
+			bIsDrowning = false;
+		}
+	}else{
+		bIsInWater = false;
+		bIsDrowning = false;
+		bTouchingWater = false;
+	}
+}
+
+void
+CBike::DoDriveByShootings(void)
+{
+	CAnimBlendAssociation *anim;
+	CPlayerInfo* playerInfo = ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed();
+	if (playerInfo && !playerInfo->m_bDriveByAllowed)
+		return;
+
+	CWeapon *weapon = pDriver->GetWeapon();
+	if(CWeaponInfo::GetWeaponInfo(weapon->m_eWeaponType)->m_nWeaponSlot != 5)
+		return;
+
+	weapon->Update(pDriver->m_audioEntityId, nil);
+
+	bool lookingLeft = false;
+	bool lookingRight = false;
+	if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN ||
+	   TheCamera.m_bObbeCinematicCarCamOn){
+		if(CPad::GetPad(0)->GetLookLeft())
+			lookingLeft = true;
+		if(CPad::GetPad(0)->GetLookRight())
+			lookingRight = true;
+	}else{
+		if(TheCamera.Cams[TheCamera.ActiveCam].LookingLeft)
+			lookingLeft = true;
+		if(TheCamera.Cams[TheCamera.ActiveCam].LookingRight)
+			lookingRight = true;
+	}
+
+	if(lookingLeft || lookingRight || CPad::GetPad(0)->GetCarGunFired()){
+		if(lookingLeft){
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
+			if(anim == nil || anim->blendDelta < 0.0f)
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_RHS);
+		}else if(lookingRight){
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
+			if(anim == nil || anim->blendDelta < 0.0f)
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_LHS);
+		}else{
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
+			if(anim == nil || anim->blendDelta < 0.0f)
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), m_bikeAnimType, ANIM_BIKE_DRIVEBY_FT);
+		}
+
+		if (!anim || !anim->IsRunning()) {
+			if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
+				weapon->FireFromCar(this, lookingLeft, lookingRight);
+				weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
+			}
+		}
+	}else{
+		weapon->Reload();
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_RHS);
+		if(anim)
+			anim->blendDelta = -1000.0f;
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_LHS);
+		if(anim)
+			anim->blendDelta = -1000.0f;
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_BIKE_DRIVEBY_FT);
+		if(anim)
+			anim->blendDelta = -1000.0f;
+	}
+}
+
+void
+CBike::VehicleDamage(void)
+{
+	float impulse = m_fDamageImpulse;
+	float colSpeed = 800.0f*impulse/m_fMass;
+	if(GetStatus() == STATUS_PLAYER)
+		colSpeed *= 0.65f;
+	else if(VehicleCreatedBy == MISSION_VEHICLE)
+		colSpeed *= 0.4f;
+
+	if(!bCanBeDamaged)
+		return;
+
+	if(GetStatus() == STATUS_PLAYER && CStats::GetPercentageProgress() >= 100.0f)
+		impulse *= 0.5f;
+
+	if(bIsStanding && impulse > 20.0f)
+		bIsStanding = false;
+
+	// Inflict damage on the driver and passenger
+	if(pDriver && pDriver->GetPedState() == PED_DRIVING && colSpeed > 10.0f){
+		float fwd = 0.6f;
+		if(Abs(DotProduct(m_vecDamageNormal, GetForward())) > 0.85f){
+			float u = Max(DotProduct(m_vecDamageNormal, CVector(0.0f, 0.0f, 1.0f)), 0.0f);
+			if(u < 0.85f)
+				u = 0.0f;
+			fwd += 7.0f * SQR(u);
+		}
+		float up = 0.05f;
+
+		if(GetModelIndex() == MI_SANCHEZ){
+			fwd *= 0.65f;
+			up *= 0.75f;
+		}
+
+		float total = fwd*Abs(DotProduct(m_vecDamageNormal, GetForward())) +
+			0.45f*Abs(DotProduct(m_vecDamageNormal, GetRight())) +
+			up*Max(DotProduct(m_vecDamageNormal, GetUp()), 0.0f);
+		float damage = (total - 1.5f*Max(DotProduct(m_vecDamageNormal, GetUp()), 0.0f))*colSpeed;
+
+		if(pDriver->IsPlayer() && CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer())
+			damage = 0.0f;
+
+		if(damage > 75.0f){
+			int dir = -10;
+			if(pDriver){
+				dir = pDriver->GetLocalDirection(-m_vecDamageNormal);
+				if(pDriver->m_fHealth > 0.0f)
+					pDriver->InflictDamage(m_pDamageEntity, WEAPONTYPE_RAMMEDBYCAR, 0.05f*damage, PEDPIECE_TORSO, dir);
+				if(pDriver && pDriver->GetPedState() == PED_DRIVING)
+					KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, dir, pDriver, false);
+			}
+			if(pPassengers[0]){
+				dir = pPassengers[0]->GetLocalDirection(-m_vecDamageNormal);
+				if(pPassengers[0]->m_fHealth > 0.0f)
+					pPassengers[0]->InflictDamage(m_pDamageEntity, WEAPONTYPE_RAMMEDBYCAR, 0.05f*damage, PEDPIECE_TORSO, dir);
+				if(pPassengers[0] && pPassengers[0]->GetPedState() == PED_DRIVING)
+					KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, dir, pPassengers[0], false);
+			}
+		}
+	}
+
+	if(impulse > 25.0f && GetStatus() != STATUS_WRECKED){
+		float damage = (impulse-25.0f)*pHandling->fCollisionDamageMultiplier;
+		if(damage > 0.0f){
+			if(damage > 5.0f &&
+			   pDriver &&
+			   m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
+			   (this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
+			   ((CVehicle*)m_pDamageEntity)->pDriver)
+// TODO(MIAMI): enum
+					pDriver->Say(144);
+
+			int oldHealth = m_fHealth;
+			if(this == FindPlayerVehicle())
+				m_fHealth -= bTakeLessDamage ? damage/6.0f : damage/2.0f;
+			else if(bTakeLessDamage)
+				m_fHealth -= damage/12.0f;
+			else if(m_pDamageEntity && m_pDamageEntity == FindPlayerVehicle())
+				m_fHealth -= damage/1.5f;
+			else
+				m_fHealth -= damage/4.0f;
+			if(m_fHealth <= 0.0f && oldHealth > 0)
+				m_fHealth = 1.0f;
+		}
+	}
+
+	if(m_fHealth < 250.0f){
+		// Car is on fire
+		if(!bIsOnFire){
+			// Set engine on fire and remember who did this
+			bIsOnFire = true;
+			m_fFireBlowUpTimer = 0.0f;
+			m_pSetOnFireEntity = m_pDamageEntity;
+			if(m_pSetOnFireEntity)
+				m_pSetOnFireEntity->RegisterReference(&m_pSetOnFireEntity);
+		}
+	}
+}
+
+void
+CBike::AddDamagedVehicleParticles(void)
+{
+	if(this == FindPlayerVehicle() && TheCamera.GetLookingForwardFirstPerson())
+		return;
+	if(this != FindPlayerVehicle() && (CTimer::GetFrameCounter() + m_randomSeed) & 1)
+		return;
+	if(m_fHealth >= 650.0f)
+		return;
+
+	CVector direction = 0.5f*m_vecMoveSpeed;
+	CVector damagePos = ((CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()))->GetFrontSeatPosn();
+
+	damagePos.z -= 0.4f;
+	damagePos = GetMatrix()*damagePos;
+
+	CalculateLeanMatrix();
+
+	if(m_fHealth < 250.0f){
+		// fire, done in processControl
+	}else if(m_fHealth < 320.0f){
+		direction *= 0.2f;
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE2, damagePos, direction + 0.02f*m_leanMatrix.GetRight());
+	}else if(m_fHealth < 390.0f){
+		if(((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 0 ||
+		   ((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 2)
+			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.05f*m_leanMatrix.GetRight());
+		direction *= 0.3f;
+		CParticle::AddParticle(PARTICLE_ENGINE_SMOKE, damagePos, direction + 0.04f*m_leanMatrix.GetRight());
+	}else if(m_fHealth < 460.0f){
+		int rnd = CTimer::GetFrameCounter() + m_randomSeed;
+		if(rnd < 10 ||
+		   rnd < 70 && rnd > 25 ||
+		   rnd < 160 && rnd > 100 ||
+		   rnd < 200 && rnd > 175 ||
+		   rnd > 235)
+			return;
+		direction.z += 0.05f;
+		if(TheCamera.GetLookDirection() != LOOKING_FORWARD){
+			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.08f*m_leanMatrix.GetRight(), nil, 0.1f, 0, 0, 0, 1000);
+		}else if(((CTimer::GetFrameCounter() + m_randomSeed) & 1) == 0){
+			direction = 0.8f*m_vecMoveSpeed;
+			CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos, direction + 0.07f*m_leanMatrix.GetRight(), nil, 0.1f, 0, 0, 0, 1000);
+		}
+	}else if(((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 0 ||
+	         ((CTimer::GetFrameCounter() + m_randomSeed) & 3) == 2){
+		CParticle::AddParticle(PARTICLE_ENGINE_STEAM, damagePos + 0.06f*m_leanMatrix.GetRight(), direction);
+	}
+}
+
+int32
+CBike::AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed)
+{
+	int i;
+	CVector dir;
+	static float minSize = 0.02f;
+	static float maxSize = 0.04f;
+	static RwRGBA grassCol = { 8, 24, 8, 255 };
+	static RwRGBA gravelCol = { 64, 64, 64, 255 };
+	static RwRGBA mudCol = { 64, 32, 16, 255 };
+	static RwRGBA sandCol = { 170, 165, 140, 255 };
+	static RwRGBA waterCol = { 48, 48, 64, 0 };
+
+	if(!belowEffectSpeed &&
+	   colpoint->surfaceB != SURFACE_SAND && colpoint->surfaceB != SURFACE_SAND_BEACH)
+		return 0;
+
+	switch(colpoint->surfaceB){
+	case SURFACE_GRASS:
+		dir.x = -0.05f*m_vecMoveSpeed.x;
+		dir.y = -0.05f*m_vecMoveSpeed.y;
+		for(i = 0; i < 4; i++){
+			dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
+			CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
+				CGeneral::GetRandomNumberInRange(minSize, maxSize), grassCol);
+		}
+		return 0;
+	case SURFACE_GRAVEL:
+		dir.x = -0.05f*m_vecMoveSpeed.x;
+		dir.y = -0.05f*m_vecMoveSpeed.y;
+		for(i = 0; i < 4; i++){
+			dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
+			CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
+				CGeneral::GetRandomNumberInRange(minSize, maxSize), gravelCol);
+		}
+		return 1;
+	case SURFACE_MUD_DRY:
+		dir.x = -0.05f*m_vecMoveSpeed.x;
+		dir.y = -0.05f*m_vecMoveSpeed.y;
+		for(i = 0; i < 4; i++){
+			dir.z = CGeneral::GetRandomNumberInRange(0.03f, 0.04f);
+			CParticle::AddParticle(PARTICLE_WHEEL_DIRT, colpoint->point, dir, nil,
+				CGeneral::GetRandomNumberInRange(minSize, maxSize), mudCol);
+		}
+		return 0;
+	case SURFACE_SAND:
+	case SURFACE_SAND_BEACH:
+		if(CTimer::GetFrameCounter() & 2)
+			return 0;
+		dir.x = 0.75f*m_vecMoveSpeed.x;
+		dir.y = 0.75f*m_vecMoveSpeed.y;
+		for(i = 0; i < 1; i++){
+			dir.z = CGeneral::GetRandomNumberInRange(0.02f, 0.055f);
+			CParticle::AddParticle(PARTICLE_SAND, colpoint->point, dir, nil,
+				0.8f*m_vecMoveSpeed.Magnitude(), sandCol);
+		}
+		return 0;
+	default:
+		if(CWeather::WetRoads > 0.01f){
+			CParticle::AddParticle(
+				PARTICLE_WATERSPRAY,
+				colpoint->point + CVector(0.0f, 0.0f, 0.25f+0.25f),
+				CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.005f, 0.04f)),
+				nil,
+				CGeneral::GetRandomNumberInRange(0.1f, 0.5f), waterCol);
+			return 0;
+		}	
+		return 1;
+	}
+
+	return 0;
+}
+
+void
+CBike::GetComponentWorldPosition(int32 component, CVector &pos)
+{
+	if(m_aBikeNodes[component] == nil){
+		printf("BikeNode missing: %d %d\n", GetModelIndex(), component);
+		return;
+	}
+	RwMatrix *ltm = RwFrameGetLTM(m_aBikeNodes[component]);
+	pos = *RwMatrixGetPos(ltm);
+}
+
+bool
+CBike::IsComponentPresent(int32 component)
+{
+	return m_aBikeNodes[component] != nil;
+}
+
+void
+CBike::SetComponentRotation(int32 component, CVector rotation)
+{
+	CMatrix mat(RwFrameGetMatrix(m_aBikeNodes[component]));
+	CVector pos = mat.GetPosition();
+	// BUG: all these set the whole matrix
+	mat.SetRotateX(DEGTORAD(rotation.x));
+	mat.SetRotateY(DEGTORAD(rotation.y));
+	mat.SetRotateZ(DEGTORAD(rotation.z));
+	mat.Translate(pos);
+	mat.UpdateRW();
+}
+
+bool
+CBike::IsDoorReady(eDoors door)
+{
+	return true;
+}
+
+bool
+CBike::IsDoorFullyOpen(eDoors door)
+{
+	return false;
+}
+
+bool
+CBike::IsDoorClosed(eDoors door)
+{
+	return false;
+}
+
+bool
+CBike::IsDoorMissing(eDoors door)
+{
+	return true;
+}
+
+void
+CBike::RemoveRefsToVehicle(CEntity *ent)
+{
+	int i;
+	for(i = 0; i < 4; i++)
+		if(m_aGroundPhysical[i] == ent)
+			m_aGroundPhysical[i] = nil;
+}
+
+void
+CBike::BlowUpCar(CEntity *culprit)
+{
+	if(!bCanBeDamaged)
+		return;
+
+#ifdef FIX_BUGS
+	// taken from CAutomobile. maybe tweak values?
+	if(culprit == FindPlayerPed() || culprit == FindPlayerVehicle()){
+		CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 20;
+		CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 10.0f;
+		CStats::PropertyDestroyed += CGeneral::GetRandomNumber()%6000 + 4000;
+	}
+#endif
+
+	// explosion pushes vehicle up
+	m_vecMoveSpeed.z += 0.13f;
+	SetStatus(STATUS_WRECKED);
+	bRenderScorched = true;
+
+	m_fHealth = 0.0f;
+	m_nBombTimer = 0;
+
+	TheCamera.CamShake(0.7f, GetPosition().x, GetPosition().y, GetPosition().z);
+
+	KillPedsInVehicle();
+
+	bEngineOn = false;
+	bLightsOn = false;
+	ChangeLawEnforcerState(false);
+
+	CExplosion::AddExplosion(this, culprit, EXPLOSION_CAR, GetPosition(), 0);
+	CDarkel::RegisterCarBlownUpByPlayer(this);
+}
+
+bool
+CBike::SetUpWheelColModel(CColModel *colModel)
+{
+	RwMatrix *mat = RwMatrixCreate();
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+	CColModel *vehColModel = mi->GetColModel();
+
+	colModel->boundingSphere = vehColModel->boundingSphere;
+	colModel->boundingBox = vehColModel->boundingBox;
+
+	GetRelativeMatrix(mat, m_aBikeNodes[BIKE_WHEEL_FRONT], m_aBikeNodes[BIKE_CHASSIS]);
+	colModel->spheres[0].Set(0.5f*mi->m_wheelScale, *RwMatrixGetPos(mat), SURFACE_RUBBER, CAR_PIECE_WHEEL_LF);
+	GetRelativeMatrix(mat, m_aBikeNodes[BIKE_WHEEL_REAR], m_aBikeNodes[BIKE_CHASSIS]);
+	colModel->spheres[1].Set(0.5f*mi->m_wheelScale, *RwMatrixGetPos(mat), SURFACE_RUBBER, CAR_PIECE_WHEEL_LR);
+	colModel->numSpheres = 2;
+#ifdef FIX_BUGS
+	RwMatrixDestroy(mat);
+#endif
+	return true;
+}
+
+float fBikeBurstForceMult = 0.02f;
+float fBikeBurstFallSpeed = 0.3f;
+float fBikeBurstFallSpeedPlayer = 0.55f;
+
+void
+CBike::BurstTyre(uint8 wheel, bool applyForces)
+{
+	if(bTyresDontBurst)
+		return;
+
+	switch(wheel){
+	case CAR_PIECE_WHEEL_LF: wheel = BIKEWHEEL_FRONT; break;
+	case CAR_PIECE_WHEEL_LR: wheel = BIKEWHEEL_REAR; break;
+	}
+
+	if(m_wheelStatus[wheel] == WHEEL_STATUS_OK){
+		m_wheelStatus[wheel] = WHEEL_STATUS_BURST;
+#ifdef FIX_BUGS
+		CStats::TyresPopped++;
+#endif
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_TYRE_POP, 0.0f);
+
+		if(GetStatus() == STATUS_SIMPLE){
+			SetStatus(STATUS_PHYSICS);
+			CCarCtrl::SwitchVehicleToRealPhysics(this);
+		}
+
+		if(applyForces){
+			ApplyMoveForce(GetRight() * m_fMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f));
+			ApplyTurnForce(GetRight() * m_fTurnMass * CGeneral::GetRandomNumberInRange(-0.02f, 0.02f), GetForward());
+		}
+
+#ifdef FIX_SIGNIFICANT_BUGS
+		// This code checks piece types originally so it is never triggered
+		// as we have converted them to wheel indices above already.
+		if(pDriver){
+			if(wheel == BIKEWHEEL_FRONT && (m_aSuspensionSpringRatioPrev[BIKESUSP_F1] < 1.0f || m_aSuspensionSpringRatioPrev[BIKESUSP_F2] < 1.0f) ||
+			   wheel == BIKEWHEEL_REAR && (m_aSuspensionSpringRatioPrev[BIKESUSP_R1] < 1.0f || m_aSuspensionSpringRatioPrev[BIKESUSP_R2] < 1.0f)){
+				float speedSq = m_vecMoveSpeed.MagnitudeSqr();
+				if(speedSq > fBikeBurstFallSpeed &&
+				   (GetStatus() != STATUS_PLAYER || speedSq > fBikeBurstFallSpeedPlayer)){
+					if(wheel == BIKEWHEEL_FRONT){
+						KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, 0, pDriver, false);
+						if(pPassengers[0])
+							KnockOffRider(WEAPONTYPE_RAMMEDBYCAR, 0, pPassengers[0], false);
+					}else
+						ApplyTurnForce(2.0f*fBikeBurstForceMult*m_fTurnMass*GetRight(), GetForward());
+				}
+			}
+		}
+#endif
+	}
+}
+
+bool
+CBike::IsRoomForPedToLeaveCar(uint32 component, CVector *doorOffset)
+{
+	CColPoint colpoint;
+	CEntity *ent;
+	colpoint.point = CVector(0.0f, 0.0f, 0.0f);
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+
+	CVector seatPos = mi->GetFrontSeatPosn();
+	if(component == CAR_DOOR_RR || component == CAR_DOOR_LR)
+		seatPos = mi->m_positions[CAR_POS_BACKSEAT];
+	if(component == CAR_DOOR_LF || component == CAR_DOOR_LR)
+		seatPos.x = -seatPos.x;
+	seatPos = GetMatrix() * seatPos;
+
+	CVector doorPos = CPed::GetPositionToOpenCarDoor(this, component);
+	if(doorOffset){
+		CVector off = *doorOffset;
+		if(component == CAR_DOOR_RF || component == CAR_DOOR_RR)
+			off.x = -off.x;
+		doorPos += Multiply3x3(GetMatrix(), off);
+	}
+
+	if(GetUp().z < 0.0f){
+		seatPos.z += 0.5f;
+		doorPos.z += 0.5f;
+	}
+
+	CVector dist = doorPos - seatPos;
+
+	// Removing that makes thiProcessEntityCollisions func. return false for van doors.
+	doorPos.z += 0.5f;
+	float length = dist.Magnitude();
+	CVector pedPos = seatPos + dist*((length+0.6f)/length);
+
+	if(!CWorld::GetIsLineOfSightClear(seatPos, pedPos, true, false, false, true, false, false))
+		return false;
+	if(CWorld::TestSphereAgainstWorld(doorPos, 0.6f, this, true, true, false, true, false, false))
+		return false;
+	if(CWorld::ProcessVerticalLine(doorPos, 1000.0f, colpoint, ent, true, false, false, true, false, false, nil))
+		if(colpoint.point.z > doorPos.z && colpoint.point.z < doorPos.z + 0.6f)
+			return false;
+	float upperZ = colpoint.point.z;
+	if(!CWorld::ProcessVerticalLine(doorPos, -1000.0f, colpoint, ent, true, false, false, true, false, false, nil))
+		return false;
+	if(upperZ != 0.0f && upperZ < colpoint.point.z)
+		return false;
+	return true;
+}
+
+float
+CBike::GetHeightAboveRoad(void)
+{
+	return m_fHeightAboveRoad;
+}
+
+void
+CBike::PlayCarHorn(void)
+{
+	int r;
+
+	if (IsAlarmOn() || m_nCarHornTimer != 0)
+		return;
+
+	if (m_nCarHornDelay) {
+		m_nCarHornDelay--;
+		return;
+	}
+
+	m_nCarHornDelay = (CGeneral::GetRandomNumber() & 0x7F) + 150;
+	r = m_nCarHornDelay & 7;
+	if(r < 2){
+		m_nCarHornTimer = 45;
+	}else if(r < 4){
+		if(pDriver)
+			pDriver->Say(SOUND_PED_CAR_COLLISION);
+		m_nCarHornTimer = 45;
+	}else{
+		if(pDriver)
+			pDriver->Say(SOUND_PED_CAR_COLLISION);
+	}
+}
+
+void
+CBike::KnockOffRider(eWeaponType weapon, uint8 direction, CPed *ped, bool bGetBackOn)
+{
+	AnimationId anim = ANIM_KO_SHOT_FRONT1;
+	if(ped == nil)
+		return;
+
+	if(!ped->IsPlayer()){
+		if(bGetBackOn){
+			if(ped->m_pedStats->m_temper > ped->m_pedStats->m_fear &&
+			   ped->CharCreatedBy != MISSION_CHAR && ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE &&
+			   FindPlayerPed()->m_carInObjective == ped->m_pMyVehicle &&
+			   !CTheScripts::IsPlayerOnAMission())
+				ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, ped->m_pMyVehicle);
+			else if(ped->m_pedStats->m_temper > ped->m_pedStats->m_fear &&
+			   ped->CharCreatedBy != MISSION_CHAR && ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE &&
+			   !CTheScripts::IsPlayerOnAMission())
+				ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, ped->m_pMyVehicle);
+			else if(ped->m_pedStats->m_temper <= ped->m_pedStats->m_fear &&
+			   ped->CharCreatedBy != MISSION_CHAR && ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE &&
+			   !CTheScripts::IsPlayerOnAMission()){
+				ped->SetObjective(OBJ_47, ped->m_pMyVehicle);
+				ped->m_nPathDir = CGeneral::GetRandomNumberInRange(0, 8);
+			}
+		}else if(ped->m_leader == nil){
+			if(pDriver == ped)
+				ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, this);
+			else
+				ped->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, this);
+		}
+	}
+
+	if(ped->IsPed()){
+		CAnimBlendAssociation *assoc;
+		for(assoc = RpAnimBlendClumpGetFirstAssociation(ped->GetClump(), ASSOC_DRIVING);
+		    assoc;
+		    assoc = RpAnimBlendGetNextAssociation(assoc))
+			assoc->flags |= ASSOC_DELETEFADEDOUT;
+	}
+
+	ped->SetPedState(PED_IDLE);
+	CAnimManager::BlendAnimation(ped->GetClump(), ped->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
+	ped->m_vehEnterType = CAR_DOOR_LF;
+	CPed::PedSetOutCarCB(nil, ped);
+	ped->SetMoveState(PEDMOVE_STILL);
+	if(GetUp().z < 0.0f)
+		ped->SetHeading(CGeneral::LimitRadianAngle(GetForward().Heading() + PI));
+	else
+		ped->SetHeading(GetForward().Heading());
+
+	switch(weapon){
+	case WEAPONTYPE_UNARMED:
+	case WEAPONTYPE_UNIDENTIFIED:
+		ped->m_vecMoveSpeed = m_vecMoveSpeed;
+		ped->m_pCollidingEntity = this;
+		anim = NUM_STD_ANIMS;
+		break;
+
+	case WEAPONTYPE_BASEBALLBAT:
+	default:
+		switch(direction){
+		case 0:
+			anim = ANIM_BIKE_FALL_R;
+			ped->m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.1f);
+			if(m_vecMoveSpeed.MagnitudeSqr() < SQR(0.3f))
+				ped->ApplyMoveForce(5.0f*GetUp() - 6.0f*GetForward());
+			ped->m_pCollidingEntity = this;
+			break;
+		case 1:
+		case 2:
+			if(m_vecMoveSpeed.MagnitudeSqr() > SQR(0.3f)){
+				anim = ANIM_KO_SPIN_R;
+				ped->m_vecMoveSpeed = 0.3f*m_vecMoveSpeed;
+				ped->ApplyMoveForce(5.0f*GetUp() + 6.0f*GetRight());
+			}else{
+				anim = ANIM_KD_LEFT;
+				ped->m_vecMoveSpeed = m_vecMoveSpeed;
+				ped->ApplyMoveForce(4.0f*GetUp() + 8.0f*GetRight());
+			}
+			// BUG or is it intentionally missing?
+			//ped->m_pCollidingEntity = this;
+			break;
+		case 3:
+			if(m_vecMoveSpeed.MagnitudeSqr() > SQR(0.3f)){
+				anim = ANIM_KO_SPIN_L;
+				ped->m_vecMoveSpeed = 0.3f*m_vecMoveSpeed;
+				ped->ApplyMoveForce(5.0f*GetUp() - 6.0f*GetRight());
+			}else{
+				anim = ANIM_KD_RIGHT;
+				ped->m_vecMoveSpeed = m_vecMoveSpeed;
+				ped->ApplyMoveForce(4.0f*GetUp() - 8.0f*GetRight());
+			}
+			// BUG or is it intentionally missing?
+			//ped->m_pCollidingEntity = this;
+			break;
+		}
+		break;
+
+	case WEAPONTYPE_DROWNING:{
+		RwRGBA color;
+		anim = ANIM_FALL_FALL;
+		ped->m_vecMoveSpeed *= 0.2f;
+		ped->m_vecMoveSpeed.z = 0.0f;
+		ped->m_pCollidingEntity = this;
+		color.red = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed_Obj())*0.45f*255;
+		color.green = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen_Obj())*0.45f*255;
+		color.blue = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue_Obj())*0.45f*255;
+		color.alpha = CGeneral::GetRandomNumberInRange(0, 48) + 48;
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLASH, 0.0f);
+		CVector splashPos = ped->GetPosition() + 2.2f*ped->m_vecMoveSpeed;
+		float waterZ = 0.0f;
+		if(CWaterLevel::GetWaterLevel(splashPos, &waterZ, false))
+			splashPos.z = waterZ;
+		CParticleObject::AddObject(POBJECT_PED_WATER_SPLASH, splashPos, CVector(0.0f, 0.0f, 0.1f),
+			0.0f, 200, color, true);
+		break;
+	}
+
+	case WEAPONTYPE_FALL: {
+		ped->m_vecMoveSpeed = ped->m_pMyVehicle->m_vecMoveSpeed;
+		float forceXY = -0.6*m_fDamageImpulse * ped->m_fMass / m_fMass;
+		ped->ApplyMoveForce(m_vecDamageNormal.x*forceXY, m_vecDamageNormal.y*forceXY,
+			CGeneral::GetRandomNumberInRange(3.0f, 7.0f));
+		ped->m_pCollidingEntity = this;
+		switch(direction){
+		case 0: anim = ANIM_KO_SKID_BACK; break;
+		case 1: anim = ANIM_KD_RIGHT; break;
+		case 2: anim = ANIM_KO_SKID_FRONT; break;
+		case 3: anim = ANIM_KD_LEFT; break;
+		}
+		if(m_nWheelsOnGround == 0)
+			ped->b158_4 = true;
+		break;
+	}
+
+	case WEAPONTYPE_RAMMEDBYCAR: {
+		ped->m_vecMoveSpeed = ped->m_pMyVehicle->m_vecMoveSpeed;
+		static float minForceZ = 8.0f;
+		static float maxForceZ = 15.0f;
+		float forceXY = -0.6*m_fDamageImpulse * ped->m_fMass / m_fMass;
+		ped->ApplyMoveForce(m_vecDamageNormal.x*forceXY, m_vecDamageNormal.y*forceXY,
+			CGeneral::GetRandomNumberInRange(minForceZ, maxForceZ));
+		ped->m_pCollidingEntity = this;
+		switch(direction){
+		case 0: anim = ANIM_KO_SKID_BACK; break;
+		case 1: anim = ANIM_KD_RIGHT; break;
+		case 2: anim = ANIM_KO_SKID_FRONT; break;
+		case 3: anim = ANIM_KD_LEFT; break;
+		}
+		ped->b158_4 = true;
+		if(ped->IsPlayer())
+			ped->Say(SOUND_PED_DAMAGE);
+		break;
+	}
+	}
+
+	if(weapon == WEAPONTYPE_DROWNING){
+		ped->bIsStanding = false;
+		ped->bWasStanding = false;
+		ped->bIsInTheAir = true;
+		ped->bIsInWater = true;
+		ped->bTouchingWater = true;
+		CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_FALL_FALL, 4.0f);
+	}else if(weapon != WEAPONTYPE_UNARMED){
+		if(ped->m_fHealth > 0.0f)
+			ped->SetFall(1000, anim, 0);
+		else
+			ped->SetDie(anim);
+		ped->bIsStanding = false;
+	}
+
+	CEntity *ent = CWorld::TestSphereAgainstWorld(ped->GetPosition()+CVector(0.0f, 0.0, 0.5f), 0.4f, nil, true, false, false, false, false, false);
+	if(ent == nil)
+		ent = CWorld::TestSphereAgainstWorld(ped->GetPosition()+CVector(0.0f, 0.0, 0.8f), 0.4f, nil, true, false, false, false, false, false);
+	if(ent == nil)
+		ent = CWorld::TestSphereAgainstWorld(ped->GetPosition()+CTimer::GetTimeStep()*ped->m_vecMoveSpeed+CVector(0.0f, 0.0, 0.5f), 0.4f, nil, true, false, false, false, false, false);
+	if(ent == nil)
+		ent = CWorld::TestSphereAgainstWorld(ped->GetPosition()+CTimer::GetTimeStep()*ped->m_vecMoveSpeed+CVector(0.0f, 0.0, 0.8f), 0.4f, nil, true, false, false, false, false, false);
+	if(ent){
+		CColPoint point;
+		ent = nil;
+		if(CWorld::ProcessVerticalLine(ped->GetPosition(), ped->GetPosition().z-2.0f, point, ent, true, false, false, false, false, false, nil)){
+			if(ped->m_pMyVehicle == nil){
+				ped->m_pMyVehicle = this;
+				ped->PositionPedOutOfCollision();
+				ped->m_pMyVehicle = nil;
+			}else
+				ped->PositionPedOutOfCollision();
+		}else
+			ped->GetMatrix().Translate(CVector(0.0f, 0.0f, -2.0f));
+		ped->m_pCollidingEntity = ped->m_pMyVehicle;
+		ped->b158_4 = true;
+		ped->bHeadStuckInCollision = true;
+	}else if(weapon == WEAPONTYPE_RAMMEDBYCAR){
+		if(CWorld::TestSphereAgainstWorld(ped->GetPosition()+CVector(0.0f, 0.0, 1.3f), 0.6f, nil, true, false, false, false, false, false) == nil)
+			ped->GetMatrix().Translate(CVector(0.0f, 0.0f, 0.5f));
+	}
+	ped->m_pMyVehicle = nil;
+}
+
+void
+CBike::PlayHornIfNecessary(void)
+{
+	if(AutoPilot.m_bSlowedDownBecauseOfPeds ||
+	   AutoPilot.m_bSlowedDownBecauseOfCars)
+		PlayCarHorn();
+}
+
+void
+CBike::ResetSuspension(void)
+{
+	int i;
+	for(i = 0; i < 2; i++){
+		m_aWheelRotation[i] = 0.0f;
+		m_aWheelState[i] = WHEEL_STATE_NORMAL;
+	}
+	for(i = 0; i < 4; i++){
+		m_aSuspensionSpringRatio[i] = 1.0f;
+		m_aWheelTimer[i] = 0.0f;
+	}
+}
+
+void
+CBike::SetupSuspensionLines(void)
+{
+	int i;
+	CVector posn;
+	float suspOffset = 0.0f;
+	RwFrame *node = nil;
+	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
+	CColModel *colModel = mi->GetColModel();
+	RwMatrix *mat = RwMatrixCreate();
+
+	bool initialized = colModel->lines[0].p0.z != FAKESUSPENSION;
+
+	for(i = 0; i < 4; i++){
+		if(initialized){
+			posn = colModel->lines[i].p0;
+			if(i < 2)
+				posn.z = m_aWheelBasePosition[0];
+			else
+				posn.z = m_aWheelBasePosition[1];
+		}else{
+			switch(i){
+			case BIKESUSP_F1:
+				node = m_aBikeNodes[BIKE_WHEEL_FRONT];
+				suspOffset = 0.25f*mi->m_wheelScale;
+				break;
+			case BIKESUSP_F2:
+				node = m_aBikeNodes[BIKE_WHEEL_FRONT];
+				suspOffset = -0.25f*mi->m_wheelScale;
+				break;
+			case BIKESUSP_R1:
+				node = m_aBikeNodes[BIKE_WHEEL_REAR];
+				suspOffset = 0.25f*mi->m_wheelScale;
+				break;
+			case BIKESUSP_R2:
+				node = m_aBikeNodes[BIKE_WHEEL_REAR];
+				suspOffset = -0.25f*mi->m_wheelScale;
+				break;
+			}
+
+			GetRelativeMatrix(mat, node, node);
+			posn = *RwMatrixGetPos(mat);
+			if(i == BIKESUSP_F1)
+				m_aWheelBasePosition[BIKEWHEEL_FRONT] = posn.z;
+			else if(i == BIKESUSP_R1){
+				m_aWheelBasePosition[BIKEWHEEL_REAR] = posn.z;
+
+				GetRelativeMatrix(mat, m_aBikeNodes[BIKE_FORKS_REAR], m_aBikeNodes[BIKE_FORKS_REAR]);
+				float dz = posn.z - RwMatrixGetPos(mat)->z;
+				float dy = posn.y - RwMatrixGetPos(mat)->y;
+				m_fRearForkLength = Sqrt(SQR(dy) + SQR(dz));
+				assert(m_fRearForkLength != 0.0f);	// we want to divide by this
+			}
+			posn.y += suspOffset;
+		}
+
+		// uppermost wheel position
+		posn.z += pHandling->fSuspensionUpperLimit;
+		colModel->lines[i].p0 = posn;
+
+		// lowermost wheel position
+		posn.z += pHandling->fSuspensionLowerLimit - pHandling->fSuspensionUpperLimit;
+		// lowest point on tyre
+		posn.z -= mi->m_wheelScale*0.5f;
+		colModel->lines[i].p1 = posn;
+
+		// this is length of the spring at rest
+		m_aSuspensionSpringLength[i] = pHandling->fSuspensionUpperLimit - pHandling->fSuspensionLowerLimit;
+		m_aSuspensionLineLength[i] = colModel->lines[i].p0.z - colModel->lines[i].p1.z;
+	}
+
+	if(!initialized){
+		GetRelativeMatrix(mat, m_aBikeNodes[BIKE_FORKS_FRONT], m_aBikeNodes[BIKE_FORKS_FRONT]);
+		m_fFrontForkY = RwMatrixGetPos(mat)->y;
+		m_fFrontForkZ = RwMatrixGetPos(mat)->z;
+	}
+
+	// Compress spring somewhat to get normal height on road
+	m_fHeightAboveRoad = m_aSuspensionSpringLength[0]*(1.0f - 1.0f/(4.0f*pHandling->fSuspensionForceLevel))
+			- colModel->lines[0].p0.z + mi->m_wheelScale*0.5f;
+	for(i = 0; i < 2; i++)
+		m_aWheelPosition[i] = mi->m_wheelScale*0.5f - m_fHeightAboveRoad;
+
+	// adjust col model to include suspension lines
+	if(colModel->boundingBox.min.z > colModel->lines[0].p1.z)
+		colModel->boundingBox.min.z = colModel->lines[0].p1.z;
+	float radius = Max(colModel->boundingBox.min.Magnitude(), colModel->boundingBox.max.Magnitude());
+	if(colModel->boundingSphere.radius < radius)
+		colModel->boundingSphere.radius = radius;
+
+#ifdef FIX_BUGS
+	RwMatrixDestroy(mat);
+#endif
+}
+
+void
+CBike::CalculateLeanMatrix(void)
+{
+	if(bLeanMatrixClean)
+		return;
+
+	CMatrix mat;
+	mat.SetRotateX(-0.05f*Abs(m_fLeanLRAngle));
+	mat.RotateY(m_fLeanLRAngle);
+	m_leanMatrix = GetMatrix();
+	m_leanMatrix = m_leanMatrix * mat;
+	// place wheel back on ground
+	m_leanMatrix.GetPosition() += GetUp()*(1.0f-Cos(m_fLeanLRAngle))*GetColModel()->boundingBox.min.z;
+	bLeanMatrixClean = true;
+}
+
+void
+CBike::GetCorrectedWorldDoorPosition(CVector &pos, CVector p1, CVector p2)
+{
+	CVector &fwd = GetForward();
+	CVector rightWorld = CrossProduct(fwd, CVector(0.0f, 0.0f, 1.0f));
+	CVector upWorld = CrossProduct(rightWorld, fwd);
+	CColModel *colModel = GetColModel();
+	float onSide = DotProduct(GetUp(), rightWorld);
+	float diff = Max(colModel->boundingBox.max.z-colModel->boundingBox.max.x, 0.0f);
+	pos = CVector(0.0f, 0.0f, 0.0f);
+	float y = p2.y - p1.y;
+	float x = onSide*diff + p2.x + p1.x;
+	float z = p2.z - p1.z;
+	pos = x*rightWorld + y*fwd + z*upWorld + GetPosition();
+}
+
+void
+CBike::Fix(void)
+{
+	bIsDamaged = false;
+	bIsOnFire = false;
+	m_wheelStatus[0] = WHEEL_STATUS_OK;
+	m_wheelStatus[1] = WHEEL_STATUS_OK;
+}
+
+void
+CBike::SetupModelNodes(void)
+{
+	int i;
+	for(i = 0; i < BIKE_NUM_NODES; i++)
+		m_aBikeNodes[i] = nil;
+	CClumpModelInfo::FillFrameArray(GetClump(), m_aBikeNodes);
+}
+
+void
+CBike::ReduceHornCounter(void)
+{
+	if(m_nCarHornTimer != 0)
+		m_nCarHornTimer--;
+}
diff --git a/src/vehicles/Bike.h b/src/vehicles/Bike.h
index 4e7e5a0e..34d2074a 100644
--- a/src/vehicles/Bike.h
+++ b/src/vehicles/Bike.h
@@ -1,6 +1,7 @@
 #pragma once
 
-// some miami bike leftovers
+#include "Vehicle.h"
+#include "Skidmarks.h"
 
 enum eBikeNodes {
 	BIKE_NODE_NONE,
@@ -12,4 +13,123 @@ enum eBikeNodes {
 	BIKE_MUDGUARD,
 	BIKE_HANDLEBARS,
 	BIKE_NUM_NODES
-};
\ No newline at end of file
+};
+
+enum {
+	BIKEWHEEL_FRONT,
+	BIKEWHEEL_REAR,
+};
+
+enum {
+	BIKESUSP_F1,
+	BIKESUSP_F2,
+	BIKESUSP_R1,
+	BIKESUSP_R2,
+};
+
+class CBike : public CVehicle
+{
+public:
+	RwFrame *m_aBikeNodes[BIKE_NUM_NODES];
+	bool bLeanMatrixClean;
+	CMatrix m_leanMatrix;
+	CVector m_vecAvgSurfaceNormal;
+	CVector m_vecAvgSurfaceRight;
+	tBikeHandlingData *pBikeHandling;
+	AssocGroupId m_bikeAnimType;
+	uint8 m_wheelStatus[2];
+	CColPoint m_aWheelColPoints[4];
+	float m_aSuspensionSpringRatio[4];
+	float m_aSuspensionSpringRatioPrev[4];
+	float m_aWheelTimer[4];
+	float m_bike_unused1;
+	eSkidmarkType m_aWheelSkidmarkType[2];
+	bool m_aWheelSkidmarkBloody[2];
+	bool m_aWheelSkidmarkUnk[2];
+	float m_aWheelRotation[2];
+	float m_aWheelSpeed[2];
+	float m_aWheelPosition[2];
+	float m_aWheelBasePosition[2];
+	float m_aSuspensionSpringLength[4];
+	float m_aSuspensionLineLength[4];
+	float m_fHeightAboveRoad;
+	float m_fTraction;
+	float m_fRearForkLength;
+	float m_fFrontForkY;
+	float m_fFrontForkZ;
+	float m_fFrontForkSlope;
+	float m_fWheelAngle;
+	float m_fLeanLRAngle;
+	float m_fLeanLRAngle2;
+	float m_fLeanInput;
+	float m_fPedLeanAmountLR;
+	float m_fPedLeanAmountUD;
+	uint8 m_bike_unused2;
+	uint8 unused[3];	// looks like padding..but for what?
+	uint8 m_bike_flag01 : 1;
+	uint8 m_bike_flag02 : 1;
+	uint8 bWaterTight : 1;
+	uint8 bIsBeingPickedUp : 1;
+	uint8 bIsStanding : 1;
+	uint8 bExtraSpeed : 1;	// leaning forward
+	uint8 bIsOnFire : 1;
+	uint8 m_bike_flag80 : 1;
+	int16 m_doingBurnout;
+	float m_fTireTemperature;
+	float m_fBrakeDestabilization;
+	uint32 field_490;
+	float m_fFireBlowUpTimer;
+	CPhysical *m_aGroundPhysical[4];
+	CVector m_aGroundOffset[4];
+	CEntity *m_pSetOnFireEntity;
+	uint8 m_nWheelsOnGround;
+	uint8 m_nDriveWheelsOnGround;
+	uint8 m_nDriveWheelsOnGroundPrev;
+	float m_fGasPedalAudio;
+	tWheelState m_aWheelState[2];
+
+	CBike(int32 id, uint8 CreatedBy);
+
+	// from CEntity
+	void SetModelIndex(uint32 id);
+	void ProcessControl(void);
+	void Teleport(CVector v);
+	void PreRender(void);
+	void Render(void);
+
+	// from CPhysical
+	int32 ProcessEntityCollision(CEntity *ent, CColPoint *colpoints);
+
+	// from CVehicle
+	void ProcessControlInputs(uint8);
+	void GetComponentWorldPosition(int32 component, CVector &pos);
+	bool IsComponentPresent(int32 component);
+	void SetComponentRotation(int32 component, CVector rotation);
+	bool IsDoorReady(eDoors door);
+	bool IsDoorFullyOpen(eDoors door);
+	bool IsDoorClosed(eDoors door);
+	bool IsDoorMissing(eDoors door);
+	void RemoveRefsToVehicle(CEntity *ent);
+	void BlowUpCar(CEntity *ent);
+	bool SetUpWheelColModel(CColModel *colModel);
+	void BurstTyre(uint8 tyre, bool applyForces);
+	bool IsRoomForPedToLeaveCar(uint32 component, CVector *doorOffset);
+	float GetHeightAboveRoad(void);
+	void PlayCarHorn(void);
+
+	void KnockOffRider(eWeaponType weapon, uint8 direction, CPed *ped, bool bGetBackOn);
+	void VehicleDamage(void);
+	void ProcessBuoyancy(void);
+	void DoDriveByShootings(void);
+	void AddDamagedVehicleParticles(void);
+	int32 AddWheelDirtAndWater(CColPoint *colpoint, uint32 belowEffectSpeed);
+	void PlayHornIfNecessary(void);
+	void ResetSuspension(void);
+	void SetupSuspensionLines(void);
+	void CalculateLeanMatrix(void);
+	void GetCorrectedWorldDoorPosition(CVector &pos, CVector p1, CVector p2);
+
+	void Fix(void);
+	void SetupModelNodes(void);
+	void ReduceHornCounter(void);
+};
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp
index 0ed7876a..2da58ed7 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -3,6 +3,7 @@
 #include "General.h"
 #include "Timecycle.h"
 #include "HandlingMgr.h"
+#include "CarAI.h"
 #include "CarCtrl.h"
 #include "RwHelper.h"
 #include "ModelIndices.h"
@@ -18,17 +19,20 @@
 #include "Pools.h"
 #include "Pad.h"
 #include "Boat.h"
+#include "AnimBlendAssociation.h"
+#include "RpAnimBlend.h"
+#include "Record.h"
 
 #define INVALID_ORIENTATION (-9999.99f)
 
 float fShapeLength = 0.4f;
 float fShapeTime = 0.05f;
-float fRangeMult = 0.75f; //0.6f; // 0.75f gta 3
+float fRangeMult = 0.6f;
 float fTimeMult;
 
-float MAX_WAKE_LENGTH = 50.0f;
-float MIN_WAKE_INTERVAL = 1.0f;
-float WAKE_LIFETIME = 400.0f;
+float CBoat::MAX_WAKE_LENGTH = 50.0f;
+float CBoat::MIN_WAKE_INTERVAL = 2.0f;
+float CBoat::WAKE_LIFETIME = 150.0f;
 
 CBoat *CBoat::apFrameWakeGeneratingBoats[4];
 
@@ -96,7 +100,7 @@ CBoat::CBoat(int mi, uint8 owner) : CVehicle(owner)
 void
 CBoat::SetModelIndex(uint32 id)
 {
-	CEntity::SetModelIndex(id);
+	CVehicle::SetModelIndex(id);
 	SetupModelNodes();
 }
 
@@ -109,9 +113,6 @@ CBoat::GetComponentWorldPosition(int32 component, CVector &pos)
 void
 CBoat::ProcessControl(void)
 {
-	if(m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
-		return;
-
 	bool onLand = m_fDamageImpulse > 0.0f && m_vecDamageNormal.z > 0.1f;
 
 	PruneWakeTrail();
@@ -151,10 +152,14 @@ CBoat::ProcessControl(void)
 		ProcessControlInputs(0);
 		if(GetModelIndex() == MI_PREDATOR)
 			DoFixedMachineGuns();
+
+		if (!CRecordDataForChase::IsRecording())
+			DoDriveByShootings();
 		break;
 	case STATUS_SIMPLE:
 		m_bIsAnchored = false;
 		m_fOrientation = INVALID_ORIENTATION;
+		CCarAI::UpdateCarAI(this);
 		CPhysical::ProcessControl();
 		bBoatInWater = true;
 		bPropellerInWater = true;
@@ -163,7 +168,8 @@ CBoat::ProcessControl(void)
 	case STATUS_PHYSICS:
 		m_bIsAnchored = false;
 		m_fOrientation = INVALID_ORIENTATION;
-		CCarCtrl::SteerAIBoatWithPhysics(this);
+		CCarAI::UpdateCarAI(this);
+		CCarCtrl::SteerAICarWithPhysics(this);
 		break;
 	case STATUS_ABANDONED:
 	case STATUS_WRECKED:
@@ -267,9 +273,17 @@ CBoat::ProcessControl(void)
 		if(0.1f * m_fMass * GRAVITY*CTimer::GetTimeStep() < buoyanceImpulse.z){
 			bBoatInWater = true;
 			bIsInWater = true;
+			if (GetUp().z < -0.6f && Abs(GetMoveSpeed().x) < 0.05 && Abs(GetMoveSpeed().y) < 0.05) {
+				bIsDrowning = true;
+				if (pDriver)
+					pDriver->InflictDamage(nil, WEAPONTYPE_DROWNING, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
+			}
+			else
+				bIsDrowning = false;
 		}else{
 			bBoatInWater = false;
 			bIsInWater = false;
+			bIsDrowning = false;
 		}
 
 		m_fVolumeUnderWater = mod_Buoyancy.m_volumeUnderWater;
@@ -295,8 +309,8 @@ CBoat::ProcessControl(void)
 				AddWakePoint(GetPosition());
 
 			float steerFactor = 1.0f - DotProduct(m_vecMoveSpeed, GetForward());
-			if (GetModelIndex() == MI_GHOST)
-				steerFactor = 1.0f - DotProduct(m_vecMoveSpeed, GetForward())*0.3f;
+//			if (GetModelIndex() == MI_GHOST)
+//				steerFactor = 1.0f - DotProduct(m_vecMoveSpeed, GetForward())*0.3f;
 			if(steerFactor < 0.0f) steerFactor = 0.0f;
 
 			CVector propeller(0.0f, -pHandling->Dimension.y*m_fPropellerY, -pHandling->Dimension.z*m_fPropellerZ);
@@ -368,8 +382,9 @@ CBoat::ProcessControl(void)
 								CGeneral::GetRandomNumberInRange(0, 30),
 								CGeneral::GetRandomNumberInRange(0, 90), 3);
 #endif
-							if(!cameraHack)
-								CParticle::AddParticle(PARTICLE_BOAT_WAKE, wakePos, wakeDir, nil, 0.0f, jetColor);
+							//TODO: MIAMI:
+							//if(!cameraHack)
+							//	CParticle::AddParticle(PARTICLE_BOAT_WAKE, wakePos, wakeDir, nil, 0.0f, jetColor);
 						}else if((CTimer::GetFrameCounter() + m_randomSeed) & 1){
 #ifdef PC_PARTICLE
 							jetDir.z = 0.018f;
@@ -406,10 +421,10 @@ CBoat::ProcessControl(void)
 		}
 
 		// Slow down or push down boat as it approaches the world limits
-		m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - 1900.0f)*0.01f);	// east
-		m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - -1515.0f)*0.01f);	// west
-		m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - 600.0f)*0.01f);	// north
-		m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - -1900.0f)*0.01f);	// south
+		m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MAX_X-100.0f))*0.01f);	// east
+		m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MIN_X+100.0f))*0.01f);	// west
+		m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MAX_Y-100.0f))*0.01f);	// north
+		m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MIN_Y+100.0f))*0.01f);	// south
 
 		if(!onLand && bBoatInWater)
 			ApplyWaterResistance();
@@ -439,7 +454,7 @@ CBoat::ProcessControl(void)
 				speedUp = pHandling->fBrakeDeceleration - m_vecMoveSpeed.z;
 			if(speedUp < 0.0f) speedUp = 0.0f;
 			float speedFwd = DotProduct(m_vecMoveSpeed, GetForward());
-			speedFwd *= -m_nDeltaVolumeUnderWater * 0.01f * pHandling->fTractionLoss;
+			speedFwd *= -m_nDeltaVolumeUnderWater * 0.01f * pHandling->fBrakeBias;
 			CVector speed = speedFwd*GetForward() + CVector(0.0f, 0.0f, speedUp);
 			CVector splashImpulse = speed * m_fMass;
 			ApplyMoveForce(splashImpulse);
@@ -513,6 +528,7 @@ CBoat::ProcessControl(void)
 	}else{
 		bBoatInWater = false;
 		bIsInWater = false;
+		bIsDrowning = false;
 	}
 
 	if(m_bIsAnchored){
@@ -912,6 +928,68 @@ CBoat::AddWakePoint(CVector point)
 	}
 }
 
+void
+CBoat::DoDriveByShootings(void)
+{
+	CAnimBlendAssociation *anim = nil;
+	CPlayerInfo* playerInfo = ((CPlayerPed*)this)->GetPlayerInfoForThisPlayerPed();
+	if (playerInfo && !playerInfo->m_bDriveByAllowed)
+		return;
+
+	CWeapon *weapon = pDriver->GetWeapon();
+	if(CWeaponInfo::GetWeaponInfo(weapon->m_eWeaponType)->m_nWeaponSlot != 5)
+		return;
+
+	weapon->Update(pDriver->m_audioEntityId, nil);
+
+	bool lookingLeft = false;
+	bool lookingRight = false;
+	if(TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN){
+		if(CPad::GetPad(0)->GetLookLeft())
+			lookingLeft = true;
+		if(CPad::GetPad(0)->GetLookRight())
+			lookingRight = true;
+	}else{
+		if(TheCamera.Cams[TheCamera.ActiveCam].LookingLeft)
+			lookingLeft = true;
+		if(TheCamera.Cams[TheCamera.ActiveCam].LookingRight)
+			lookingRight = true;
+	}
+
+	if(lookingLeft || lookingRight){
+		if(lookingLeft){
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+			if(anim == nil || anim->blendDelta < 0.0f)
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, ANIM_DRIVEBY_L);
+		}else if(pDriver->m_pMyVehicle->pPassengers[0] == nil || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_1STPERSON){
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+			if(anim)
+				anim->blendDelta = -1000.0f;
+			anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+			if(anim == nil || anim->blendDelta < 0.0f)
+				anim = CAnimManager::AddAnimation(pDriver->GetClump(), ASSOCGRP_STD, ANIM_DRIVEBY_R);
+		}
+
+		if (!anim || !anim->IsRunning()) {
+			if (CPad::GetPad(0)->GetCarGunFired() && CTimer::GetTimeInMilliseconds() > weapon->m_nTimer) {
+				weapon->FireFromCar(this, lookingLeft, true);
+				weapon->m_nTimer = CTimer::GetTimeInMilliseconds() + 70;
+			}
+		}
+	}else{
+		weapon->Reload();
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_L);
+		if(anim)
+			anim->blendDelta = -1000.0f;
+		anim = RpAnimBlendClumpGetAssociation(pDriver->GetClump(), ANIM_DRIVEBY_R);
+		if(anim)
+			anim->blendDelta = -1000.0f;
+	}
+}
+
 #ifdef COMPATIBLE_SAVES
 void
 CBoat::Save(uint8*& buf)
diff --git a/src/vehicles/Boat.h b/src/vehicles/Boat.h
index 3cc3513d..c6f4b7ad 100644
--- a/src/vehicles/Boat.h
+++ b/src/vehicles/Boat.h
@@ -5,8 +5,12 @@
 enum eBoatNodes
 {
 	BOAT_MOVING = 1,
+	BOAT_WINDSCREEN,
 	BOAT_RUDDER,
-	BOAT_WINDSCREEN
+	BOAT_FLAP_LEFT,
+	BOAT_FLAP_RIGHT,
+	BOAT_REARFLAP_LEFT,
+	BOAT_REARFLAP_RIGHT
 };
 
 class CBoat : public CVehicle
@@ -41,6 +45,10 @@ public:
 	CVector2D m_avec2dWakePoints[32];
 	float m_afWakePointLifeTime[32];
 
+	static float MAX_WAKE_LENGTH;
+	static float MIN_WAKE_INTERVAL;
+	static float WAKE_LIFETIME;
+
 	CBoat(int, uint8);
 
 	virtual void SetModelIndex(uint32 id);
@@ -57,6 +65,7 @@ public:
 	void SetupModelNodes();
 	void PruneWakeTrail(void);
 	void AddWakePoint(CVector point);
+	void DoDriveByShootings(void);
 
 	static CBoat *apFrameWakeGeneratingBoats[4];
 	
@@ -70,10 +79,4 @@ public:
 #endif
 	static const uint32 nSaveStructSize;
 
-};
-
-VALIDATE_SIZE(CBoat, 0x484);
-
-extern float MAX_WAKE_LENGTH;
-extern float MIN_WAKE_INTERVAL;
-extern float WAKE_LIFETIME;
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index cb21b918..574f2854 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -3,6 +3,7 @@
 #include "CarGen.h"
 
 #include "Automobile.h"
+#include "Bike.h"
 #include "Boat.h"
 #include "Camera.h"
 #include "CarCtrl.h"
@@ -12,7 +13,9 @@
 #include "Streaming.h"
 #include "Timer.h"
 #include "Vehicle.h"
+#include "VisibilityPlugins.h"
 #include "World.h"
+#include "Zones.h"
 
 uint8 CTheCarGenerators::ProcessCounter;
 uint32 CTheCarGenerators::NumOfCarGenerators;
@@ -38,21 +41,44 @@ uint32 CCarGenerator::CalcNextGen()
 	return CTimer::GetTimeInMilliseconds() + 4;
 }
 
+//TODO(MIAMI): check for more changes - so far only -1 mi is accounted for
 void CCarGenerator::DoInternalProcessing()
 {
-	if (CheckForBlockage()) {
-		m_nTimer += 4;
-		if (m_nUsesRemaining == 0)
-			--CTheCarGenerators::CurrentActiveCount;
-		return;
-	}
+	int mi;
 	if (CCarCtrl::NumParkedCars >= 10)
 		return;
-	CStreaming::RequestModel(m_nModelIndex, STREAMFLAGS_DEPENDENCY);
-	if (!CStreaming::HasModelLoaded(m_nModelIndex))
+	if (m_nModelIndex >= 0) {
+		if (CheckForBlockage(m_nModelIndex)) {
+			m_nTimer += 4;
+			return;
+		}
+		mi = m_nModelIndex;
+	}
+	else {
+		mi = -m_nModelIndex;
+		if (m_nModelIndex == -1 || !CStreaming::HasModelLoaded(mi)) {
+			CZoneInfo pZone;
+			CVector pos = FindPlayerCoors();
+			CTheZones::GetZoneInfoForTimeOfDay(&pos, &pZone);
+			mi = CCarCtrl::ChooseCarModel(CCarCtrl::ChooseCarRating(&pZone));
+			if (mi < 0)
+				return;
+			m_nModelIndex = -mi;
+			m_nColor1 = -1;
+			m_nColor2 = -1;
+		}
+		if (CheckForBlockage(mi)) {
+			m_nTimer += 4;
+			return;
+		}
+	}
+	CStreaming::RequestModel(mi, STREAMFLAGS_DEPENDENCY);
+	if (!CStreaming::HasModelLoaded(mi))
 		return;
-	if (CModelInfo::IsBoatModel(m_nModelIndex)){
-		CBoat* pBoat = new CBoat(m_nModelIndex, PARKED_VEHICLE);
+	CVehicle* pVehicle;
+	if (CModelInfo::IsBoatModel(mi)){
+		CBoat* pBoat = new CBoat(mi, PARKED_VEHICLE);
+		pVehicle = pBoat;
 		pBoat->bIsStatic = false;
 		pBoat->bEngineOn = false;
 		CVector pos = m_vecPos;
@@ -63,16 +89,6 @@ void CCarGenerator::DoInternalProcessing()
 		pBoat->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
 		pBoat->SetStatus(STATUS_ABANDONED);
 		pBoat->m_nDoorLock = CARLOCK_UNLOCKED;
-		CWorld::Add(pBoat);
-		if (CGeneral::GetRandomNumberInRange(0, 100) < m_nAlarm)
-			pBoat->m_nAlarmState = -1;
-		if (CGeneral::GetRandomNumberInRange(0, 100) < m_nDoorlock)
-			pBoat->m_nDoorLock = CARLOCK_LOCKED;
-		if (m_nColor1 != -1 && m_nColor2){
-			pBoat->m_currentColour1 = m_nColor1;
-			pBoat->m_currentColour2 = m_nColor2;
-		}
-		m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pBoat);
 	}else{
 		bool groundFound = false;
 		CVector pos = m_vecPos;
@@ -88,28 +104,42 @@ void CCarGenerator::DoInternalProcessing()
 		}
 		if (!groundFound) {
 			debug("CCarGenerator::DoInternalProcessing - can't find ground z for new car x = %f y = %f \n", m_vecPos.x, m_vecPos.y);
-		}else{
-			CAutomobile* pCar = new CAutomobile(m_nModelIndex, PARKED_VEHICLE);
-			pCar->bIsStatic = false;
-			pCar->bEngineOn = false;
-			pos.z += pCar->GetDistanceFromCentreOfMassToBaseOfModel();
-			pCar->SetPosition(pos);
-			pCar->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
-			pCar->SetStatus(STATUS_ABANDONED);
-			pCar->bLightsOn = false;
-			pCar->m_nDoorLock = CARLOCK_UNLOCKED;
-			CWorld::Add(pCar);
-			if (CGeneral::GetRandomNumberInRange(0, 100) < m_nAlarm)
-				pCar->m_nAlarmState = -1;
-			if (CGeneral::GetRandomNumberInRange(0, 100) < m_nDoorlock)
-				pCar->m_nDoorLock = CARLOCK_LOCKED;
-			if (m_nColor1 != -1 && m_nColor2) {
-				pCar->m_currentColour1 = m_nColor1;
-				pCar->m_currentColour2 = m_nColor2;
-			}
-			m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pCar);
+			return;
+		}
+		if (CModelInfo::IsBikeModel(mi)) {
+			CBike* pBike = new CBike(mi, PARKED_VEHICLE);
+			pBike->bIsStanding = true;
+			pVehicle = pBike;
 		}
+		else {
+			CAutomobile* pCar = new CAutomobile(mi, PARKED_VEHICLE);
+			pVehicle = pCar;
+		}
+		pVehicle->bIsStatic = false;
+		pVehicle->bEngineOn = false;
+		pos.z += pVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
+		pVehicle->SetPosition(pos);
+		pVehicle->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
+		pVehicle->SetStatus(STATUS_ABANDONED);
+		pVehicle->bLightsOn = false;
+		pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
+
 	}
+	CWorld::Add(pVehicle);
+	if (CGeneral::GetRandomNumberInRange(0, 100) < m_nAlarm)
+		pVehicle->m_nAlarmState = -1;
+	if (CGeneral::GetRandomNumberInRange(0, 100) < m_nDoorlock)
+		pVehicle->m_nDoorLock = CARLOCK_LOCKED;
+	if (m_nColor1 != -1 && m_nColor2 != -1) {
+		pVehicle->m_currentColour1 = m_nColor1;
+		pVehicle->m_currentColour2 = m_nColor2;
+	}
+	else if (m_nModelIndex < -1) {
+		m_nColor1 = pVehicle->m_currentColour1;
+		m_nColor2 = pVehicle->m_currentColour2;
+	}
+	CVisibilityPlugins::SetClumpAlpha(pVehicle->GetClump(), 0);
+	m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pVehicle);
 	if (m_nUsesRemaining < -1) /* I don't think this is a correct comparasion */
 		--m_nUsesRemaining;
 	m_nTimer = CalcNextGen();
@@ -155,25 +185,33 @@ void CCarGenerator::Setup(float x, float y, float z, float angle, int32 mi, int1
 	m_nTimer = CTimer::GetTimeInMilliseconds() + 1;
 	m_nUsesRemaining = 0;
 	m_bIsBlocking = false;
-	m_vecInf = CModelInfo::GetModelInfo(m_nModelIndex)->GetColModel()->boundingBox.min;
-	m_vecSup = CModelInfo::GetModelInfo(m_nModelIndex)->GetColModel()->boundingBox.max;
-	m_fSize = Max(m_vecInf.Magnitude(), m_vecSup.Magnitude());
 }
 
-bool CCarGenerator::CheckForBlockage()
+bool CCarGenerator::CheckForBlockage(int32 mi)
 {
 	int16 entities;
-	CWorld::FindObjectsKindaColliding(CVector(m_vecPos), m_fSize, 1, &entities, 2, nil, false, true, true, false, false);
-	return entities > 0;
+	CEntity* pEntities[8];
+	CColModel* pColModel = CModelInfo::GetModelInfo(mi)->GetColModel();
+	CWorld::FindObjectsKindaColliding(CVector(m_vecPos), pColModel->boundingSphere.radius, 1, &entities, 8, pEntities, false, true, true, false, false);
+	for (int i = 0; i < entities; i++) {
+		if (m_vecPos.z + pColModel->boundingBox.min.z < pEntities[i]->GetPosition().z + pEntities[i]->GetColModel()->boundingBox.max.z + 1.0f &&
+			m_vecPos.z + pColModel->boundingBox.max.z > pEntities[i]->GetPosition().z + pEntities[i]->GetColModel()->boundingBox.min.z - 1.0f) {
+			m_bIsBlocking = true;
+			return true;
+		}
+	}
+	return false;
 }
 
 bool CCarGenerator::CheckIfWithinRangeOfAnyPlayer()
 {
 	CVector2D direction = FindPlayerCentreOfWorld(CWorld::PlayerInFocus) - m_vecPos;
 	float distance = direction.Magnitude();
-	float farclip = 120.0f * TheCamera.GenerationDistMultiplier;
+	float farclip = 110.0f * TheCamera.GenerationDistMultiplier;
 	float nearclip = farclip - 20.0f;
-	if (distance >= farclip){
+	bool canBeRemoved = (m_nModelIndex > 0 && CModelInfo::IsBoatModel(m_nModelIndex) && 165.0f * TheCamera.GenerationDistMultiplier > distance &&
+		TheCamera.IsPointVisible(m_vecPos, &TheCamera.GetCameraMatrix())); // TODO(MIAMI) COcclision::IsPositionOccluded(m_vecPos, 0.0f)
+	if (distance >= farclip || canBeRemoved){
 		if (m_bIsBlocking)
 			m_bIsBlocking = false;
 		return false;
diff --git a/src/vehicles/CarGen.h b/src/vehicles/CarGen.h
index 9d645318..684f93ee 100644
--- a/src/vehicles/CarGen.h
+++ b/src/vehicles/CarGen.h
@@ -22,9 +22,6 @@ class CCarGenerator
 	int32 m_nVehicleHandle;
 	uint16 m_nUsesRemaining;
 	bool m_bIsBlocking;
-	CVector m_vecInf;
-	CVector m_vecSup;
-	float m_fSize;
 public:
 	void SwitchOff();
 	void SwitchOn();
@@ -32,7 +29,7 @@ public:
 	void DoInternalProcessing();
 	void Process();
 	void Setup(float x, float y, float z, float angle, int32 mi, int16 color1, int16 color2, uint8 force, uint8 alarm, uint8 lock, uint16 min_delay, uint16 max_delay);
-	bool CheckForBlockage();
+	bool CheckForBlockage(int32 mi);
 	bool CheckIfWithinRangeOfAnyPlayer();
 	void SetUsesRemaining(uint16 uses) { m_nUsesRemaining = uses; }
 };
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 757974a6..db7b514f 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -57,7 +57,8 @@ void CCranes::InitCranes(void)
 			}
 		}
 	}
-	for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL).first; pNode; pNode = pNode->next) {
+	// TODO(MIAMI): LEVEL_MAINLAND just so it compiles
+	for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_MAINLAND).first; pNode; pNode = pNode->next) {
 		CEntity* pEntity = (CEntity*)pNode->item;
 		if (MODELID_CRANE_1 == pEntity->GetModelIndex() ||
 			MODELID_CRANE_2 == pEntity->GetModelIndex() ||
@@ -87,6 +88,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity)
 	if (pCrane->m_nAudioEntity >= 0)
 		DMAudio.SetEntityStatus(pCrane->m_nAudioEntity, 1);
 	pCrane->m_bIsTop = (MODELID_CRANE_1 != pEntity->GetModelIndex());
+#if 0
 	// Is this used to avoid military crane?
 	if (pCrane->m_bIsTop || pEntity->GetPosition().y > 0.0f) {
 		CObject* pHook = new CObject(MI_MAGNET, false);
@@ -99,6 +101,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity)
 		pCrane->SetHookMatrix();
 	}
 	else
+#endif
 		pCrane->m_pHook = nil;
 	NumCranes++;
 }
diff --git a/src/vehicles/DamageManager.cpp b/src/vehicles/DamageManager.cpp
index c625a4e7..e4c28c95 100644
--- a/src/vehicles/DamageManager.cpp
+++ b/src/vehicles/DamageManager.cpp
@@ -10,14 +10,20 @@ float G_aComponentDamage[] = { 2.5f, 1.25f, 3.2f, 1.4f, 2.5f, 2.8f, 0.5f };
 CDamageManager::CDamageManager(void)
 {
 	ResetDamageStatus();
-	m_fWheelDamageEffect = 0.75f;
+	m_fWheelDamageEffect = 0.5f;
 	field_18 = 1;
 }
 
 void
 CDamageManager::ResetDamageStatus(void)
 {
-	memset(this, 0, sizeof(*this));
+	int i;
+	m_fWheelDamageEffect = 0.0f;
+	m_engineStatus = 0;
+	for(i = 0; i < ARRAY_SIZE(m_wheelStatus); i++) m_wheelStatus[i] = 0;
+	for(i = 0; i < ARRAY_SIZE(m_doorStatus); i++) m_doorStatus[i] = 0;
+	m_lightStatus = 0;
+	m_panelStatus = 0;
 }
 
 void
@@ -55,6 +61,8 @@ CDamageManager::ApplyDamage(tComponent component, float damage, float unused)
 
 	GetComponentGroup(component, &group, &subComp);
 	damage *= G_aComponentDamage[group];
+	if(component == COMPONENT_PANEL_WINDSCREEN)
+		damage *= 0.6f;
 	if(damage > 150.0f){
 		switch(group){
 		case COMPGROUP_WHEEL:
@@ -218,10 +226,6 @@ CDamageManager::GetEngineStatus(void)
 bool
 CDamageManager::ProgressEngineDamage(void)
 {
-	int status = GetEngineStatus();
-	int newstatus = status + 32 + (CGeneral::GetRandomNumber() & 0x1F);
-	if(status < ENGINE_STATUS_ON_FIRE && newstatus > ENGINE_STATUS_ON_FIRE-1)
-		newstatus = ENGINE_STATUS_ON_FIRE-1;
-	SetEngineStatus(newstatus);
-	return true;
+	// gone in VC
+	return false;
 }
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index 5beed29e..3d5d4e77 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -4,6 +4,8 @@
 #include "FileMgr.h"
 #include "HandlingMgr.h"
 
+//--MIAMI: done
+
 cHandlingDataMgr mod_HandlingManager;
 
 const char *HandlingFilename = "HANDLING.CFG";
@@ -21,7 +23,6 @@ const char VehicleNames[NUMHANDLINGS][14] = {
 	"STRETCH",
 	"MANANA",
 	"INFERNUS",
-	"BLISTA",
 	"PONY",
 	"MULE",
 	"CHEETAH",
@@ -38,7 +39,6 @@ const char VehicleNames[NUMHANDLINGS][14] = {
 	"ENFORCER",
 	"SECURICA",
 	"BANSHEE",
-	"PREDATOR",
 	"BUS",
 	"RHINO",
 	"BARRACKS",
@@ -50,22 +50,73 @@ const char VehicleNames[NUMHANDLINGS][14] = {
 	"STALLION",
 	"RUMPO",
 	"RCBANDIT",
-	"BELLYUP",
-	"MRWONGS",
 	"MAFIA",
-	"YARDIE",
-	"YAKUZA",
-	"DIABLOS",
-	"COLUMB",
-	"HOODS",
 	"AIRTRAIN",
 	"DEADDODO",
-	"SPEEDER",
-	"REEFER",
-	"PANLANT",
 	"FLATBED",
 	"YANKEE",
-	"BORGNINE"
+	"GOLFCART",
+	"VOODOO",
+	"WASHING",
+	"CUBAN",
+	"ROMERO",
+	"PACKER",
+	"ADMIRAL",
+	"GANGBUR",
+	"ZEBRA",
+	"TOPFUN",
+	"GLENDALE",
+	"OCEANIC",
+	"HERMES",
+	"SABRE1",
+	"SABRETUR",
+	"PHEONIX",
+	"WALTON",
+	"REGINA",
+	"COMET",
+	"DELUXO",
+	"BURRITO",
+	"SPAND",
+	"BAGGAGE",
+	"KAUFMAN",
+	"RANCHER",
+	"FBIRANCH",
+	"VIRGO",
+	"GREENWOO",
+	"HOTRING",
+	"SANDKING",
+	"BLISTAC",
+	"BOXVILLE",
+	"BENSON",
+	"DESPERAD",
+	"LOVEFIST",
+	"BLOODRA",
+	"BLOODRB",
+	"BIKE",
+	"MOPED",
+	"DIRTBIKE",
+	"ANGEL",
+	"FREEWAY",
+	"PREDATOR",
+	"SPEEDER",
+	"REEFER",
+	"RIO",
+	"SQUALO",
+	"TROPIC",
+	"COASTGRD",
+	"DINGHY",
+	"MARQUIS",
+	"CUPBOAT",
+	"SEAPLANE",
+	"SPARROW",
+	"SEASPAR",
+	"MAVERICK",
+	"COASTMAV",
+	"POLMAV",
+	"HUNTER",
+	"RCBARON",
+	"RCGOBLIN",
+	"RCCOPTER"
 };
 
 cHandlingDataMgr::cHandlingDataMgr(void)
@@ -94,6 +145,9 @@ cHandlingDataMgr::LoadHandlingData(void)
 	int field, handlingId;
 	int keepGoing;
 	tHandlingData *handling;
+	tFlyingHandlingData *flyingHandling;
+	tBoatHandlingData *boatHandling;
+	tBikeHandlingData *bikeHandling;
 
 	CFileMgr::SetDir("DATA");
 	CFileMgr::LoadFile(HandlingFilename, work_buff, sizeof(work_buff), "r");
@@ -102,6 +156,9 @@ cHandlingDataMgr::LoadHandlingData(void)
 	start = (char*)work_buff;
 	end = start+1;
 	handling = nil;
+	flyingHandling = nil;
+	boatHandling = nil;
+	bikeHandling = nil;
 	keepGoing = 1;
 
 	while(keepGoing){
@@ -118,55 +175,157 @@ cHandlingDataMgr::LoadHandlingData(void)
 		if(strncmp(line, ";the end", 9) == 0)
 			keepGoing = 0;
 		else if(line[0] != ';'){
-			field = 0;
-			strcpy(delim, " \t");
-			// FIX: game seems to use a do-while loop here
-			for(word = strtok(line, delim); word; word = strtok(nil, delim)){
-				switch(field){
-				case  0:
-					handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
-					assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
-					handling = &HandlingData[handlingId];
-					handling->nIdentifier = (eHandlingId)handlingId;
-					break;
-				case  1: handling->fMass = strtod(word, nil); break;
-				case  2: handling->Dimension.x = strtod(word, nil); break;
-				case  3: handling->Dimension.y = strtod(word, nil); break;
-				case  4: handling->Dimension.z = strtod(word, nil); break;
-				case  5: handling->CentreOfMass.x = strtod(word, nil); break;
-				case  6: handling->CentreOfMass.y = strtod(word, nil); break;
-				case  7: handling->CentreOfMass.z = strtod(word, nil); break;
-				case  8: handling->nPercentSubmerged = atoi(word); break;
-				case  9: handling->fTractionMultiplier = strtod(word, nil); break;
-				case 10: handling->fTractionLoss = strtod(word, nil); break;
-				case 11: handling->fTractionBias = strtod(word, nil); break;
-				case 12: handling->Transmission.nNumberOfGears = atoi(word); break;
-				case 13: handling->Transmission.fMaxVelocity = strtod(word, nil); break;
-				case 14: handling->Transmission.fEngineAcceleration = strtod(word, nil) * 0.4f; break;
-				case 15: handling->Transmission.nDriveType = word[0]; break;
-				case 16: handling->Transmission.nEngineType = word[0]; break;
-				case 17: handling->fBrakeDeceleration = strtod(word, nil); break;
-				case 18: handling->fBrakeBias = strtod(word, nil); break;
-				case 19: handling->bABS = !!atoi(word); break;
-				case 20: handling->fSteeringLock = strtod(word, nil); break;
-				case 21: handling->fSuspensionForceLevel = strtod(word, nil); break;
-				case 22: handling->fSuspensionDampingLevel = strtod(word, nil); break;
-				case 23: handling->fSeatOffsetDistance = strtod(word, nil); break;
-				case 24: handling->fCollisionDamageMultiplier = strtod(word, nil); break;
-				case 25: handling->nMonetaryValue = atoi(word); break;
-				case 26: handling->fSuspensionUpperLimit = strtod(word, nil); break;
-				case 27: handling->fSuspensionLowerLimit = strtod(word, nil); break;
-				case 28: handling->fSuspensionBias = strtod(word, nil); break;
-				case 29:
-					sscanf(word, "%x", &handling->Flags);
-					handling->Transmission.Flags = handling->Flags;
-					break;
-				case 30: handling->FrontLights = atoi(word); break;
-				case 31: handling->RearLights = atoi(word); break;
+			if(line[0] == '!'){
+				// Bike data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						bikeHandling = GetBikePointer(handlingId);
+						bikeHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: bikeHandling->fLeanFwdCOM = atof(word); break;
+					case  3: bikeHandling->fLeanFwdForce = atof(word); break;
+					case  4: bikeHandling->fLeanBakCOM = atof(word); break;
+					case  5: bikeHandling->fLeanBackForce = atof(word); break;
+					case  6: bikeHandling->fMaxLean = atof(word); break;
+					case  7: bikeHandling->fFullAnimLean = atof(word); break;
+					case  8: bikeHandling->fDesLean = atof(word); break;
+					case  9: bikeHandling->fSpeedSteer = atof(word); break;
+					case 10: bikeHandling->fSlipSteer = atof(word); break;
+					case 11: bikeHandling->fNoPlayerCOMz = atof(word); break;
+					case 12: bikeHandling->fWheelieAng = atof(word); break;
+					case 13: bikeHandling->fStoppieAng = atof(word); break;
+					case 14: bikeHandling->fWheelieSteer = atof(word); break;
+					case 15: bikeHandling->fWheelieStabMult = atof(word); break;
+					case 16: bikeHandling->fStoppieStabMult = atof(word); break;
+					}
+					field++;
+				}
+				ConvertBikeDataToGameUnits(bikeHandling);
+			}else if(line[0] == '$'){
+				// Flying data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						flyingHandling = GetFlyingPointer(handlingId);
+						flyingHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: flyingHandling->fThrust = atof(word); break;
+					case  3: flyingHandling->fThrustFallOff = atof(word); break;
+					case  4: flyingHandling->fYaw = atof(word); break;
+					case  5: flyingHandling->fYawStab = atof(word); break;
+					case  6: flyingHandling->fSideSlip = atof(word); break;
+					case  7: flyingHandling->fRoll = atof(word); break;
+					case  8: flyingHandling->fRollStab = atof(word); break;
+					case  9: flyingHandling->fPitch = atof(word); break;
+					case 10: flyingHandling->fPitchStab = atof(word); break;
+					case 11: flyingHandling->fFormLift = atof(word); break;
+					case 12: flyingHandling->fAttackLift = atof(word); break;
+					case 13: flyingHandling->fMoveRes = atof(word); break;
+					case 14: flyingHandling->vecTurnRes.x = atof(word); break;
+					case 15: flyingHandling->vecTurnRes.y = atof(word); break;
+					case 16: flyingHandling->vecTurnRes.z = atof(word); break;
+					case 17: flyingHandling->vecSpeedRes.x = atof(word); break;
+					case 18: flyingHandling->vecSpeedRes.y = atof(word); break;
+					case 19: flyingHandling->vecSpeedRes.z = atof(word); break;
+					}
+					field++;
+				}
+			}else if(line[0] == '%'){
+				// Boat data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						boatHandling = GetBoatPointer(handlingId);
+						boatHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: boatHandling->fThrustY = atof(word); break;
+					case  3: boatHandling->fThrustZ = atof(word); break;
+					case  4: boatHandling->fThrustAppZ = atof(word); break;
+					case  5: boatHandling->fAqPlaneForce = atof(word); break;
+					case  6: boatHandling->fAqPlaneLimit = atof(word); break;
+					case  7: boatHandling->fAqPlaneOffset = atof(word); break;
+					case  8: boatHandling->fWaveAudioMult = atof(word); break;
+					case  9: boatHandling->vecMoveRes.x = atof(word); break;
+					case 10: boatHandling->vecMoveRes.y = atof(word); break;
+					case 11: boatHandling->vecMoveRes.z = atof(word); break;
+					case 12: boatHandling->vecTurnRes.x = atof(word); break;
+					case 13: boatHandling->vecTurnRes.y = atof(word); break;
+					case 14: boatHandling->vecTurnRes.z = atof(word); break;
+					case 15: boatHandling->fLook_L_R_BehindCamHeight = atof(word); break;
+					}
+					field++;
 				}
-				field++;
+			}else{
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						handling = &HandlingData[handlingId];
+						handling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  1: handling->fMass = atof(word); break;
+					case  2: handling->Dimension.x = atof(word); break;
+					case  3: handling->Dimension.y = atof(word); break;
+					case  4: handling->Dimension.z = atof(word); break;
+					case  5: handling->CentreOfMass.x = atof(word); break;
+					case  6: handling->CentreOfMass.y = atof(word); break;
+					case  7: handling->CentreOfMass.z = atof(word); break;
+					case  8: handling->nPercentSubmerged = atoi(word); break;
+					case  9: handling->fTractionMultiplier = atof(word); break;
+					case 10: handling->fTractionLoss = atof(word); break;
+					case 11: handling->fTractionBias = atof(word); break;
+					case 12: handling->Transmission.nNumberOfGears = atoi(word); break;
+					case 13: handling->Transmission.fMaxVelocity = atof(word); break;
+					case 14: handling->Transmission.fEngineAcceleration = atof(word) * 0.4f; break;
+					case 15: handling->Transmission.nDriveType = word[0]; break;
+					case 16: handling->Transmission.nEngineType = word[0]; break;
+					case 17: handling->fBrakeDeceleration = atof(word); break;
+					case 18: handling->fBrakeBias = atof(word); break;
+					case 19: handling->bABS = !!atoi(word); break;
+					case 20: handling->fSteeringLock = atof(word); break;
+					case 21: handling->fSuspensionForceLevel = atof(word); break;
+					case 22: handling->fSuspensionDampingLevel = atof(word); break;
+					case 23: handling->fSeatOffsetDistance = atof(word); break;
+					case 24: handling->fCollisionDamageMultiplier = atof(word); break;
+					case 25: handling->nMonetaryValue = atoi(word); break;
+					case 26: handling->fSuspensionUpperLimit = atof(word); break;
+					case 27: handling->fSuspensionLowerLimit = atof(word); break;
+					case 28: handling->fSuspensionBias = atof(word); break;
+					case 29: handling->fSuspensionAntidiveMultiplier = atof(word); break;
+					case 30:
+						sscanf(word, "%x", &handling->Flags);
+						handling->Transmission.Flags = handling->Flags;
+						break;
+					case 31: handling->FrontLights = atoi(word); break;
+					case 32: handling->RearLights = atoi(word); break;
+					}
+					field++;
+				}
+				ConvertDataToGameUnits(handling);
 			}
-			ConvertDataToGameUnits(handling);
 		}
 	}
 }
@@ -199,6 +358,7 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 	if(handling->fTurnMass < 10.0f)
 		handling->fTurnMass *= 5.0f;
 	handling->fInvMass = 1.0f/handling->fMass;
+	handling->fCollisionDamageMultiplier *= 2000.0f/handling->fMass;
 	handling->fBuoyancy = 100.0f/handling->nPercentSubmerged * 0.008f*handling->fMass;
 
 	// What the hell is going on here?
@@ -214,11 +374,16 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 
 	if(handling->nIdentifier == HANDLING_RCBANDIT){
 		handling->Transmission.fUnkMaxVelocity = handling->Transmission.fMaxVelocity;
+		handling->Transmission.fMaxReverseVelocity = -handling->Transmission.fMaxVelocity;
+	}else if(handling->nIdentifier >= HANDLING_BIKE && handling->nIdentifier <= HANDLING_FREEWAY){
+		handling->Transmission.fUnkMaxVelocity = velocity;
+		handling->Transmission.fMaxVelocity = velocity * 1.2f;
+		handling->Transmission.fMaxReverseVelocity = -0.05f;
 	}else{
 		handling->Transmission.fUnkMaxVelocity = velocity;
 		handling->Transmission.fMaxVelocity = velocity * 1.2f;
+		handling->Transmission.fMaxReverseVelocity = -0.2f;
 	}
-	handling->Transmission.fMaxReverseVelocity = -0.2f;
 
 	if(handling->Transmission.nDriveType == '4')
 		handling->Transmission.fEngineAcceleration /= 4.0f;
@@ -228,6 +393,15 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 	handling->Transmission.InitGearRatios();
 }
 
+void
+cHandlingDataMgr::ConvertBikeDataToGameUnits(tBikeHandlingData *handling)
+{
+	handling->fMaxLean = Sin(DEGTORAD(handling->fMaxLean));
+	handling->fFullAnimLean = DEGTORAD(handling->fFullAnimLean);
+	handling->fWheelieAng = Sin(DEGTORAD(handling->fWheelieAng));
+	handling->fStoppieAng = Sin(DEGTORAD(handling->fStoppieAng));
+}
+
 int32
 cHandlingDataMgr::GetHandlingId(const char *name)
 {
@@ -237,3 +411,19 @@ cHandlingDataMgr::GetHandlingId(const char *name)
 			break;
 	return i;
 }
+
+tFlyingHandlingData*
+cHandlingDataMgr::GetFlyingPointer(uint8 id)
+{
+	if(id >= HANDLING_SEAPLANE && id <= HANDLING_RCCOPTER)
+		return &FlyingHandlingData[id-HANDLING_SEAPLANE];
+	return &FlyingHandlingData[0];
+}
+
+tBoatHandlingData*
+cHandlingDataMgr::GetBoatPointer(uint8 id)
+{
+	if(id >= HANDLING_PREDATOR && id <= HANDLING_SEAPLANE)
+		return &BoatHandlingData[id-HANDLING_PREDATOR];
+	return &BoatHandlingData[0];
+}
diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 10e25573..e93f7879 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -16,7 +16,6 @@ enum eHandlingId
 	HANDLING_STRETCH,
 	HANDLING_MANANA,
 	HANDLING_INFERNUS,
-	HANDLING_BLISTA,
 	HANDLING_PONY,
 	HANDLING_MULE,
 	HANDLING_CHEETAH,
@@ -33,7 +32,6 @@ enum eHandlingId
 	HANDLING_ENFORCER,
 	HANDLING_SECURICA,
 	HANDLING_BANSHEE,
-	HANDLING_PREDATOR,
 	HANDLING_BUS,
 	HANDLING_RHINO,
 	HANDLING_BARRACKS,
@@ -45,24 +43,81 @@ enum eHandlingId
 	HANDLING_STALLION,
 	HANDLING_RUMPO,
 	HANDLING_RCBANDIT,
-	HANDLING_BELLYUP,
-	HANDLING_MRWONGS,
 	HANDLING_MAFIA,
-	HANDLING_YARDIE,
-	HANDLING_YAKUZA,
-	HANDLING_DIABLOS,
-	HANDLING_COLUMB,
-	HANDLING_HOODS,
 	HANDLING_AIRTRAIN,
 	HANDLING_DEADDODO,
-	HANDLING_SPEEDER,
-	HANDLING_REEFER,
-	HANDLING_PANLANT,
 	HANDLING_FLATBED,
 	HANDLING_YANKEE,
-	HANDLING_BORGNINE,
+	HANDLING_GOLFCART,
+	HANDLING_VOODOO,
+	HANDLING_WASHING,
+	HANDLING_CUBAN,
+	HANDLING_ROMERO,
+	HANDLING_PACKER,
+	HANDLING_ADMIRAL,
+	HANDLING_GANGBUR,
+	HANDLING_ZEBRA,
+	HANDLING_TOPFUN,
+	HANDLING_GLENDALE,
+	HANDLING_OCEANIC,
+	HANDLING_HERMES,
+	HANDLING_SABRE1,
+	HANDLING_SABRETUR,
+	HANDLING_PHEONIX,
+	HANDLING_WALTON,
+	HANDLING_REGINA,
+	HANDLING_COMET,
+	HANDLING_DELUXO,
+	HANDLING_BURRITO,
+	HANDLING_SPAND,
+	HANDLING_BAGGAGE,
+	HANDLING_KAUFMAN,
+	HANDLING_RANCHER,
+	HANDLING_FBIRANCH,
+	HANDLING_VIRGO,
+	HANDLING_GREENWOO,
+	HANDLING_HOTRING,
+	HANDLING_SANDKING,
+	HANDLING_BLISTAC,
+	HANDLING_BOXVILLE,
+	HANDLING_BENSON,
+	HANDLING_DESPERAD,
+	HANDLING_LOVEFIST,
+	HANDLING_BLOODRA,
+	HANDLING_BLOODRB,
 
-	NUMHANDLINGS
+	HANDLING_BIKE,
+	HANDLING_MOPED,
+	HANDLING_DIRTBIKE,
+	HANDLING_ANGEL,
+	HANDLING_FREEWAY,
+
+	HANDLING_PREDATOR,
+	HANDLING_SPEEDER,
+	HANDLING_REEFER,
+	HANDLING_RIO,
+	HANDLING_SQUALO,
+	HANDLING_TROPIC,
+	HANDLING_COASTGRD,
+	HANDLING_DINGHY,
+	HANDLING_MARQUIS,
+	HANDLING_CUPBOAT,
+	HANDLING_SEAPLANE,	// both boat and plane!
+	HANDLING_SPARROW,
+	HANDLING_SEASPAR,
+	HANDLING_MAVERICK,
+	HANDLING_COASTMAV,
+	HANDLING_POLMAV,
+	HANDLING_HUNTER,
+	HANDLING_RCBARON,
+	HANDLING_RCGOBLIN,
+	HANDLING_RCCOPTER,
+
+	NUMHANDLINGS,
+
+	NUMBIKEHANDLINGS = HANDLING_FREEWAY+1 - HANDLING_BIKE,
+	NUMFLYINGHANDLINGS = HANDLING_RCCOPTER+1 - HANDLING_SEAPLANE,
+	NUMBOATHANDLINGS = HANDLING_SEAPLANE+1 - HANDLING_PREDATOR,
 };
 
 enum
@@ -83,6 +138,18 @@ enum
 	HANDLING_HAS_NO_ROOF = 0x2000,
 	HANDLING_IS_BIG = 0x4000,
 	HANDLING_HALOGEN_LIGHTS = 0x8000,
+	HANDLING_IS_BIKE = 0x10000,
+	HANDLING_IS_HELI = 0x20000,
+	HANDLING_IS_PLANE = 0x40000,
+	HANDLING_IS_BOAT = 0x80000,
+	HANDLING_NO_EXHAUST = 0x100000,
+	HANDLING_REARWHEEL_1ST = 0x200000,
+	HANDLING_HANDBRAKE_TYRE = 0x400000,
+	HANDLING_SIT_IN_BOAT = 0x800000,
+	HANDLING_FAT_REARW = 0x1000000,
+	HANDLING_NARROW_FRONTW = 0x2000000,
+	HANDLING_GOOD_INSAND = 0x4000000,
+	HANDLING_UNKNOWN = 0x8000000,	// something for helis and planes
 };
 
 struct tHandlingData
@@ -109,6 +176,7 @@ struct tHandlingData
 	float fSuspensionUpperLimit;
 	float fSuspensionLowerLimit;
 	float fSuspensionBias;
+	float fSuspensionAntidiveMultiplier;
 	float fCollisionDamageMultiplier;
 	uint32 Flags;
 	float fSeatOffsetDistance;
@@ -116,7 +184,60 @@ struct tHandlingData
 	int8 FrontLights;
 	int8 RearLights;
 };
-VALIDATE_SIZE(tHandlingData, 0xD8);
+
+struct tBikeHandlingData
+{
+	eHandlingId nIdentifier;
+	float fLeanFwdCOM;
+	float fLeanFwdForce;
+	float fLeanBakCOM;
+	float fLeanBackForce;
+	float fMaxLean;
+	float fFullAnimLean;
+	float fDesLean;
+	float fSpeedSteer;
+	float fSlipSteer;
+	float fNoPlayerCOMz;
+	float fWheelieAng;
+	float fStoppieAng;
+	float fWheelieSteer;
+	float fWheelieStabMult;
+	float fStoppieStabMult;
+};
+
+struct tBoatHandlingData
+{
+	eHandlingId nIdentifier;
+	float fThrustY;
+	float fThrustZ;
+	float fThrustAppZ;
+	float fAqPlaneForce;
+	float fAqPlaneLimit;
+	float fAqPlaneOffset;
+	float fWaveAudioMult;
+	float fLook_L_R_BehindCamHeight;
+	CVector vecMoveRes;
+	CVector vecTurnRes;
+};
+
+struct  tFlyingHandlingData
+{
+	eHandlingId nIdentifier;
+	float fThrust;
+	float fThrustFallOff;
+	float fYaw;
+	float fYawStab;
+	float fSideSlip;
+	float fRoll;
+	float fRollStab;
+	float fPitch;
+	float fPitchStab;
+	float fFormLift;
+	float fAttackLift;
+	float fMoveRes;
+	CVector vecTurnRes;
+	CVector vecSpeedRes;
+};
 
 class cHandlingDataMgr
 {
@@ -128,7 +249,9 @@ private:
 	float field_C;	// unused it seems
 	float field_10;	//
 	tHandlingData HandlingData[NUMHANDLINGS];
-	uint32 field_302C;	// unused it seems
+	tBikeHandlingData BikeHandlingData[NUMBIKEHANDLINGS];
+	tFlyingHandlingData FlyingHandlingData[NUMFLYINGHANDLINGS];
+	tBoatHandlingData BoatHandlingData[NUMBOATHANDLINGS];
 
 public:
 	cHandlingDataMgr(void);
@@ -136,10 +259,13 @@ public:
 	void LoadHandlingData(void);
 	int FindExactWord(const char *word, const char *words, int wordLen, int numWords);
 	void ConvertDataToGameUnits(tHandlingData *handling);
+	void ConvertBikeDataToGameUnits(tBikeHandlingData *handling);
 	int32 GetHandlingId(const char *name);
 	tHandlingData *GetHandlingData(eHandlingId id) { return &HandlingData[id]; }
+	tBikeHandlingData *GetBikePointer(uint8 id) { return &BikeHandlingData[id-HANDLING_BIKE]; }
+	tFlyingHandlingData *GetFlyingPointer(uint8 id);
+	tBoatHandlingData *GetBoatPointer(uint8 id);
 	bool HasRearWheelDrive(eHandlingId id) { return HandlingData[id].Transmission.nDriveType == 'R'; }
 	bool HasFrontWheelDrive(eHandlingId id) { return HandlingData[id].Transmission.nDriveType == 'F'; }
 };
-VALIDATE_SIZE(cHandlingDataMgr, 0x3030);
 extern cHandlingDataMgr mod_HandlingManager;
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 4966a228..1e0a8c27 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -558,60 +558,8 @@ CHeli::ProcessControl(void)
 void
 CHeli::PreRender(void)
 {
-	float angle;
-	uint8 i;
-	CColPoint point;
-	CEntity *entity;
-	uint8 r, g, b;
-	float testLowZ = FindPlayerCoors().z - 10.0f;
 	float radius = (GetPosition().z - FindPlayerCoors().z - 10.0f - 1.0f) * 0.3f + 10.0f;
-	int frm = CTimer::GetFrameCounter() & 7;
-
-	i = 0;
-	for(angle = 0.0f; angle < TWOPI; angle += TWOPI/32){
-		CVector pos(radius*Cos(angle), radius*Sin(angle), 0.0f);
-		CVector dir = CVector(pos.x, pos.y, 1.0f)*0.01f;
-		pos += GetPosition();
-
-		if(CWorld::ProcessVerticalLine(pos, testLowZ, point, entity, true, false, false, false, true, false, nil))
-			m_fHeliDustZ[frm] = point.point.z;
-		else
-			m_fHeliDustZ[frm] = -101.0f;
-
-		switch(point.surfaceB){
-		default:
-		case SURFACE_TARMAC:
-			r = 10;
-			g = 10;
-			b = 10;
-			break;
-		case SURFACE_GRASS:
-			r = 10;
-			g = 6;
-			b = 3;
-			break;
-		case SURFACE_GRAVEL:
-			r = 10;
-			g = 8;
-			b = 7;
-			break;
-		case SURFACE_MUD_DRY:
-			r = 10;
-			g = 6;
-			b = 3;
-			break;
-		}
-		RwRGBA col = { r, g, b, 32 };
-#ifdef FIX_BUGS
-		pos.z = m_fHeliDustZ[frm];
-#else
-		// What the hell is the point of this?
-		pos.z = m_fHeliDustZ[(i - (i&3))/4];	// advance every 4 iterations, why not just /4?
-#endif
-		if(pos.z > -200.0f && GetPosition().z - pos.z < 20.0f)
-			CParticle::AddParticle(PARTICLE_HELI_DUST, pos, dir, nil, 0.0f, col);
-		i++;
-	}
+	HeliDustGenerate(this, radius, FindPlayerCoors().z, Max(16.0f - 4.0f*CTimer::GetTimeStep(), 2.0f));
 }
 
 void
@@ -776,7 +724,6 @@ CHeli::InitHelis(void)
 	for(i = 0; i < NUM_HELIS; i++)
 		pHelis[i] = nil;
 
-	((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_ESCAPE))->SetColModel(&CTempColModels::ms_colModelPed1);
 	((CVehicleModelInfo*)CModelInfo::GetModelInfo(MI_CHOPPER))->SetColModel(&CTempColModels::ms_colModelPed1);
 }
 
@@ -787,10 +734,7 @@ GenerateHeli(bool catalina)
 	CVector heliPos;
 	int i;
 
-	if(catalina)
-		heli = new CHeli(MI_ESCAPE, PERMANENT_VEHICLE);
-	else
-		heli = new CHeli(MI_CHOPPER, PERMANENT_VEHICLE);
+	heli = new CHeli(MI_CHOPPER, PERMANENT_VEHICLE);
 
 	if(catalina)
 		heliPos = CVector(-224.0f, 201.0f, 83.0f);
@@ -867,18 +811,6 @@ CHeli::UpdateHelis(void)
 			pHelis[HELI_SCRIPT]->m_heliStatus = HELI_STATUS_FLY_AWAY;
 	}
 
-	// Handle Catalina's heli
-	if(CatalinaHeliOn){
-		if(CStreaming::HasModelLoaded(MI_ESCAPE) && pHelis[HELI_CATALINA] == nil){
-			pHelis[HELI_CATALINA] = GenerateHeli(true);
-			pHelis[HELI_CATALINA]->m_heliType = HELI_TYPE_CATALINA;
-		}else
-			CStreaming::RequestModel(MI_ESCAPE, STREAMFLAGS_DONT_REMOVE);
-	}else{
-		if(pHelis[HELI_CATALINA])
-			pHelis[HELI_CATALINA]->m_heliStatus = HELI_STATUS_FLY_AWAY;
-	}
-
 	// Delete helis that we no longer need
 	for(i = 0; i < NUM_HELIS; i++)
 		if(pHelis[i] && pHelis[i]->m_heliStatus == HELI_STATUS_FLY_AWAY && pHelis[i]->GetPosition().z > 150.0f){
diff --git a/src/vehicles/Heli.h b/src/vehicles/Heli.h
index cf3f791f..a8f604aa 100644
--- a/src/vehicles/Heli.h
+++ b/src/vehicles/Heli.h
@@ -95,6 +95,3 @@ public:
 
 	static void ActivateHeli(bool activate);
 };
-
-VALIDATE_SIZE(CHeli, 0x33C);
-
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 3bf385a0..bc27ca32 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -739,6 +739,7 @@ CPlane::InitPlanes(void)
 		TotalDurationOfFlightPath2 = TotalLengthOfFlightPath2/CRUISE_SPEED;
 	}
 
+/*
 	// Mission Cesna
 	if(pPath3Nodes == nil){
 		pPath3Nodes = LoadPath("data\\paths\\flight3.dat", NumPath3Nodes, TotalLengthOfFlightPath3, false);
@@ -750,6 +751,7 @@ CPlane::InitPlanes(void)
 		pPath4Nodes = LoadPath("data\\paths\\flight4.dat", NumPath4Nodes, TotalLengthOfFlightPath4, false);
 		TotalDurationOfFlightPath4 = TotalLengthOfFlightPath4/CRUISE_SPEED;
 	}
+*/
 
 	CStreaming::LoadAllRequestedModels(false);
 	CStreaming::RequestModel(MI_AIRTRAIN, 0);
@@ -810,7 +812,7 @@ CPlane::LoadPath(char const *filename, int32 &numNodes, float &totalLength, bool
 
 	for(i = 0; i < numNodes; i++){
 		*gString = '\0';
-		for(lp = 0; work_buff[bp] != '\n'; bp++, lp++)
+		for(lp = 0; work_buff[bp] != '\n' && work_buff[bp] != '\0'; bp++, lp++)
 			gString[lp] = work_buff[bp];
 		bp++;
 		// BUG: game doesn't terminate string
diff --git a/src/vehicles/Plane.h b/src/vehicles/Plane.h
index 783c53b3..e9456bcd 100644
--- a/src/vehicles/Plane.h
+++ b/src/vehicles/Plane.h
@@ -64,8 +64,6 @@ public:
 	static bool HasDropOffCesnaBeenShotDown(void);
 };
 
-VALIDATE_SIZE(CPlane, 0x29C);
-
 extern float LandingPoint;
 extern float TakeOffPoint;
 extern float PlanePathPosition[3];
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index baf6bfb7..50f7cb1d 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -41,6 +41,7 @@ static bool bTrainArrivalAnnounced[3] = {false, false, false};
 CTrain::CTrain(int32 id, uint8 CreatedBy)
  : CVehicle(CreatedBy)
 {
+#ifdef GTA_TRAIN
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
 	m_vehType = VEHICLE_TYPE_TRAIN;
 	pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
@@ -67,22 +68,28 @@ CTrain::CTrain(int32 id, uint8 CreatedBy)
 #ifdef FIX_BUGS
 	m_isFarAway = true;
 #endif
+#else
+	assert(0 && "No trains in this game");
+#endif
 }
 
 void
 CTrain::SetModelIndex(uint32 id)
 {
+#ifdef GTA_TRAIN
 	int i;
 
 	CVehicle::SetModelIndex(id);
 	for(i = 0; i < NUM_TRAIN_NODES; i++)
 		m_aTrainNodes[i] = nil;
 	CClumpModelInfo::FillFrameArray(GetClump(), m_aTrainNodes);
+#endif
 }
 
 void
 CTrain::ProcessControl(void)
 {
+#ifdef GTA_TRAIN
 	if(gbModelViewer || m_isFarAway && (CTimer::GetFrameCounter() + m_nWagonId) & 0xF)
 		return;
 
@@ -285,11 +292,13 @@ CTrain::ProcessControl(void)
 				TrainHitStuff(s->m_lists[ENTITYLIST_PEDS_OVERLAP]);
 			}
 	}
+#endif GTA_TRAIN
 }
 
 void
 CTrain::PreRender(void)
 {
+#ifdef GTA_TRAIN
 	CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
 
 	if(m_bIsFirstWagon){
@@ -349,17 +358,21 @@ CTrain::PreRender(void)
 			CCoronas::TYPE_NORMAL, CCoronas::FLARE_NONE, CCoronas::REFLECTION_ON,
 			CCoronas::LOSCHECK_OFF, CCoronas::STREAK_ON, 0.0f);
 	}
+#endif
 }
 
 void
 CTrain::Render(void)
 {
+#ifdef GTA_TRAIN
 	CEntity::Render();
+#endif
 }
 
 void
 CTrain::TrainHitStuff(CPtrList &list)
 {
+#ifdef GTA_TRAIN
 	CPtrNode *node;
 	CPhysical *phys;
 
@@ -368,11 +381,13 @@ CTrain::TrainHitStuff(CPtrList &list)
 		if(phys != this && Abs(this->GetPosition().z - phys->GetPosition().z) < 1.5f)
 			phys->bHitByTrain = true;
 	}
+#endif
 }
 
 void
 CTrain::AddPassenger(CPed *ped)
 {
+#ifdef GTA_TRAIN
 	int i = ped->m_vehEnterType;
 	if((i == TRAIN_POS_LEFT_ENTRY || i == TRAIN_POS_MID_ENTRY || i == TRAIN_POS_RIGHT_ENTRY) && pPassengers[i] == nil){
 		pPassengers[i] = ped;
@@ -385,11 +400,13 @@ CTrain::AddPassenger(CPed *ped)
 				return;
 			}
 	}
+#endif
 }
 
 void
 CTrain::OpenTrainDoor(float ratio)
 {
+#ifdef GTA_TRAIN
 	if(m_rwObject == nil)
 		return;
 
@@ -414,6 +431,7 @@ CTrain::OpenTrainDoor(float ratio)
 
 	doorL.UpdateRW();
 	doorR.UpdateRW();
+#endif
 }
 
 
@@ -421,6 +439,7 @@ CTrain::OpenTrainDoor(float ratio)
 void
 CTrain::InitTrains(void)
 {
+#ifdef GTA_TRAIN
 	int i, j;
 	CTrain *train;
 
@@ -487,21 +506,25 @@ CTrain::InitTrains(void)
 		for(j = 0; pTrackNodes_S[j].t < StationDist_S[i]; j++);
 		aStationCoors_S[i] = pTrackNodes_S[j].p;
 	}
+#endif
 }
 
 void
 CTrain::Shutdown(void)
 {
+#ifdef GTA_TRAIN
 	delete[] pTrackNodes;
 	delete[] pTrackNodes_S;
 	pTrackNodes = nil;
 	pTrackNodes_S = nil;
+#endif
 }
 
 void
 CTrain::ReadAndInterpretTrackFile(Const char *filename, CTrainNode **nodes, int16 *numNodes, int32 numStations, float *stationDists,
 		float *totalLength, float *totalDuration, CTrainInterpolationLine *interpLines, bool rightRail)
 {
+#ifdef GTA_TRAIN
 	bool readingFile = false;
 	int bp, lp;
 	int i, tmp;
@@ -623,6 +646,7 @@ CTrain::ReadAndInterpretTrackFile(Const char *filename, CTrainNode **nodes, int1
 
 	// end
 	interpLines[j].time = *totalDuration;
+#endif
 }
 
 void
@@ -672,6 +696,7 @@ ProcessTrainAnnouncements(void)
 void
 CTrain::UpdateTrains(void)
 {
+#ifdef GTA_TRAIN
 	int i, j;
 	uint32 time;
 	float t, deltaT;
@@ -735,4 +760,5 @@ CTrain::UpdateTrains(void)
 		// time offset for each train
 		time += 0x40000/4;
 	}
+#endif
 }
diff --git a/src/vehicles/Train.h b/src/vehicles/Train.h
index 3446eeb5..57cd28de 100644
--- a/src/vehicles/Train.h
+++ b/src/vehicles/Train.h
@@ -82,5 +82,3 @@ public:
 		float *totalLength, float *totalDuration, CTrainInterpolationLine *interpLines, bool rightRail);
 	static void UpdateTrains(void);
 };
-
-VALIDATE_SIZE(CTrain, 0x2E4);
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index e21ad07c..824aeac1 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -5,6 +5,8 @@
 #include "Timer.h"
 #include "Pad.h"
 #include "Vehicle.h"
+#include "Bike.h"
+#include "Automobile.h"
 #include "Pools.h"
 #include "HandlingMgr.h"
 #include "CarCtrl.h"
@@ -14,10 +16,24 @@
 #include "Lights.h"
 #include "PointLights.h"
 #include "Renderer.h"
+#include "VisibilityPlugins.h"
 #include "DMAudio.h"
 #include "Radar.h"
 #include "Fire.h"
 #include "Darkel.h"
+#include "Streaming.h"
+#include "Camera.h"
+#include "Stats.h"
+#include "Garages.h"
+#include "Wanted.h"
+#include "SurfaceTable.h"
+#include "Particle.h"
+#include "WaterLevel.h"
+#include "Timecycle.h"
+#include "Weather.h"
+#include "Coronas.h"
+
+//--MIAMI: done
 
 bool CVehicle::bWheelsOnlyCheat;
 bool CVehicle::bAllDodosCheat;
@@ -27,7 +43,11 @@ bool CVehicle::bCheat5;
 #ifdef ALT_DODO_CHEAT
 bool CVehicle::bAltDodoCheat;
 #endif
+bool CVehicle::bHoverCheat;
+bool CVehicle::bAllTaxisHaveNitro;
 bool CVehicle::m_bDisableMouseSteering = true;
+bool CVehicle::bDisableRemoteDetonation;
+bool CVehicle::bDisableRemoteDetonationOnContact;
 
 void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New();  }
 void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehiclePool()->New(handle); }
@@ -55,6 +75,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
 	m_fSteerInput = 0.0f;
 	m_type = ENTITY_TYPE_VEHICLE;
 	VehicleCreatedBy = CreatedBy;
+	m_nRouteSeed = 0;
 	bIsLocked = false;
 	bIsLawEnforcer = false;
 	bIsAmbulanceOnDuty = false;
@@ -102,6 +123,26 @@ CVehicle::CVehicle(uint8 CreatedBy)
 	m_bSirenOrAlarm = false;
 	m_nCarHornTimer = 0;
 	m_nCarHornPattern = 0;
+	m_nCarHornDelay = 0;
+	bPartOfConvoy = false;
+	bHeliMinimumTilt = false;
+	bAudioChangingGear = false;
+	bIsDrowning = false;
+	bTyresDontBurst = false;
+	bCreatedAsPoliceVehicle = false;
+	bRestingOnPhysical = false;
+	bParking = false;
+	bCanPark = CGeneral::GetRandomNumberInRange(0.0f, 1.0f) < 0.0f;	// never true. probably doesn't work very well
+	bIsVan = false;
+	bIsBus = false;
+	bIsBig = false;
+	bLowVehicle = false;
+
+	m_bombType = CARBOMB_NONE;
+	bDriverLastFrame = false;
+	m_pBombRigger = nil;
+
+	m_nSetPieceExtendedRangeTime = 0;
 	m_nAlarmState = 0;
 	m_nDoorLock = CARLOCK_UNLOCKED;
 	m_nLastWeaponDamage = -1;
@@ -109,7 +150,26 @@ CVehicle::CVehicle(uint8 CreatedBy)
 	m_audioEntityId = DMAudio.CreateEntity(AUDIOTYPE_PHYSICAL, this);
 	if(m_audioEntityId >= 0)
 		DMAudio.SetEntityStatus(m_audioEntityId, true);
-	m_nRadioStation = CGeneral::GetRandomNumber() % USERTRACK;
+	//m_nRadioStation = CGeneral::GetRandomNumber() % USERTRACK;
+	switch(GetModelIndex()){
+	case MI_HUNTER:
+	case MI_ANGEL:
+	case MI_FREEWAY:
+		m_nRadioStation = V_ROCK;
+		break;
+	case MI_RCBARON:
+	case MI_RCBANDIT:
+	case MI_RCRAIDER:
+	case MI_RCGOBLIN:
+	case MI_TOPFUN:
+	case MI_CADDY:
+	case MI_BAGGAGE:
+		m_nRadioStation = RADIO_OFF;
+		break;
+	default:
+		m_nRadioStation = CGeneral::GetRandomNumber() % USERTRACK;
+		break;
+	}
 	m_pCurGroundEntity = nil;
 	m_bRainAudioCounter = 0;
 	m_bRainSamplesCounter = 0;
@@ -121,6 +181,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
 	AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds();
 	AutoPilot.m_bStayInCurrentLevel = false;
 	AutoPilot.m_bIgnorePathfinding = false;
+	AutoPilot.m_nSwitchDistance = 20;
 }
 
 CVehicle::~CVehicle()
@@ -185,57 +246,30 @@ CVehicle::RemoveLighting(bool reset)
 	CRenderer::RemoveVehiclePedLights(this, reset);
 }
 
+bool
+CVehicle::IsClearToDriveAway(void)
+{
+	CColPoint point;
+	float length = GetColModel()->boundingBox.GetSize().y;
+	CEntity *ent = nil;
+	CVector front = GetForward() * (length*0.5f + 3.0f);
+	return !CWorld::ProcessLineOfSight(GetPosition() + front, GetPosition(),
+			point, ent, true, true, false, false, false, true, true) ||
+		ent == this;
+}
+
 float
 CVehicle::GetHeightAboveRoad(void)
 {
 	return -1.0f * GetColModel()->boundingBox.min.z;
 }
 
-const float fRCPropFallOff = 3.0f;
-const float fRCAeroThrust = 0.003f;
-const float fRCSideSlipMult = 0.1f;
-const float fRCRudderMult = 0.2f;
-const float fRCYawMult = -0.01f;
-const float fRCRollMult = 0.02f;
-const float fRCRollStabilise = -0.08f;
-const float fRCPitchMult = 0.005f;
-const float fRCTailMult = 0.3f;
-const float fRCFormLiftMult = 0.02f;
-const float fRCAttackLiftMult = 0.25f;
-const CVector vecRCAeroResistance(0.998f, 0.998f, 0.9f);
-
-const float fSeaPropFallOff = 2.3f;
-const float fSeaThrust = 0.002f;
-const float fSeaSideSlipMult = 0.1f;
-const float fSeaRudderMult = 0.01f;
-const float fSeaYawMult = -0.0003f;
-const float fSeaRollMult = 0.0015f;
-const float fSeaRollStabilise = -0.01f;
-const float fSeaPitchMult = 0.0002f;
-const float fSeaTailMult = 0.01f;
-const float fSeaFormLiftMult = 0.012f;
-const float fSeaAttackLiftMult = 0.1f;
-const CVector vecSeaAeroResistance(0.995f, 0.995f, 0.85f);
-
-const float fSpeedResistanceY = 500.0f;
-const float fSpeedResistanceZ = 500.0f;
-
-const CVector vecHeliMoveRes(0.995f, 0.995f, 0.99f);
-const CVector vecRCHeliMoveRes(0.99f, 0.99f, 0.99f);
-const float fThrustVar = 0.3f;
-const float fRotorFallOff = 0.75f;
-const float fStabiliseVar = 0.015f;
-const float fPitchBrake = 10.0f;
-const float fPitchVar = 0.006f;
-const float fRollVar = 0.006f;
-const float fYawVar = -0.001f;
-const CVector vecHeliResistance(0.81f, 0.85f, 0.99f);
-const CVector vecRCHeliResistance(0.92f, 0.92f, 0.998f);
-const float fSpinSpeedRes = 20.0f;
-
 void
 CVehicle::FlyingControl(eFlightModel flightModel)
 {
+	if(pFlyingHandling == nil)
+		return;
+
 	switch(flightModel){
 	case FLIGHT_MODEL_DODO:
 	{
@@ -276,6 +310,8 @@ CVehicle::FlyingControl(eFlightModel flightModel)
 
 
 		m_vecTurnSpeed.y *= Pow(0.9f, CTimer::GetTimeStep());
+
+
 		moveSpeed = m_vecMoveSpeed.MagnitudeSqr();
 		if(moveSpeed > SQR(1.5f))
 			m_vecMoveSpeed *= 1.5f/Sqrt(moveSpeed);
@@ -288,38 +324,53 @@ CVehicle::FlyingControl(eFlightModel flightModel)
 
 	case FLIGHT_MODEL_RCPLANE:
 	case FLIGHT_MODEL_SEAPLANE:
+	case FLIGHT_MODEL_PLANE_UNUSED:
+	case FLIGHT_MODEL_PLANE:
 	{
+		float fSteerLR = CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
+		float fSteerUD = -CPad::GetPad(0)->GetSteeringUpDown() / 128.0f;
+		float fGunUD = Abs(CPad::GetPad(0)->GetCarGunUpDown());
+		if(fGunUD > 1.0f)
+			fSteerUD = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f;
+
+		float fSteerAngle = Atan2(fSteerUD, fSteerLR);
+		float fSteerMult = 1.0f;
+		if(fSteerAngle > -PI/4.0f && fSteerAngle <= PI/4.0f)
+			fSteerMult = 1.0f/Cos(fSteerAngle);
+		else if(fSteerAngle > PI/4.0f && fSteerAngle <= PI*3.0f/4.0f)
+			fSteerMult = 1.0f/Cos(fSteerAngle - HALFPI);
+		else if(fSteerAngle > PI*3.0f/4.0f)
+			fSteerMult = 1.0f/Cos(fSteerAngle - PI);
+		else if(fSteerAngle <= -PI*3.0f/4.0f)
+			fSteerMult = 1.0f/Cos(fSteerAngle + PI);
+		else if(fSteerAngle > -PI*3.0f/4.0f && fSteerAngle < -PI/4.0f)
+			fSteerMult = 1.0f/Cos(fSteerAngle + HALFPI);
+
+		fSteerLR *= fSteerMult;
+		fSteerUD *= -fSteerMult;
+
 		// thrust
 		float fForwSpeed = DotProduct(GetMoveSpeed(), GetForward());
 		CVector vecTail = GetColModel()->boundingBox.min.y * GetForward();
 		float fThrust = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f;
-		if (fForwSpeed > 0.1f || (flightModel == FLIGHT_MODEL_RCPLANE && fForwSpeed > 0.02f))
-			fThrust += 1.0f;
-		else if (fForwSpeed > 0.0f && fThrust < 0.0f)
-			fThrust = 0.0f;
 		float fThrustAccel;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fThrustAccel = (fThrust - fRCPropFallOff * fForwSpeed) * fRCAeroThrust;
+		if(fForwSpeed > 0.0f || fThrust > 0.0f)
+			fThrustAccel = (fThrust - pFlyingHandling->fThrustFallOff * fForwSpeed) * pFlyingHandling->fThrust;
 		else
-			fThrustAccel = (fThrust - fSeaPropFallOff * fForwSpeed) * fSeaThrust;
+			fThrustAccel = Min(fThrust - 8.0f * pFlyingHandling->fThrustFallOff * fForwSpeed, 0.0f) * pFlyingHandling->fThrust;
+		if(flightModel == FLIGHT_MODEL_PLANE_UNUSED)
+			fThrustAccel *= 0.3f;
+		else if(flightModel == FLIGHT_MODEL_PLANE)
+			fThrustAccel *= 0.1f;
 		ApplyMoveForce(fThrustAccel * GetForward() * m_fMass * CTimer::GetTimeStep());
 
 		// left/right
 		float fSideSpeed = -DotProduct(GetMoveSpeed(), GetRight());
-		float fSteerLR = CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
-		float fSideSlipAccel;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fSideSlipAccel = Abs(fSideSpeed) * fSideSpeed * fRCSideSlipMult;
-		else
-			fSideSlipAccel = Abs(fSideSpeed) * fSideSpeed * fSeaSideSlipMult;
+		float fSideSlipAccel = pFlyingHandling->fSideSlip * fSideSpeed * Abs(fSideSpeed);
 		ApplyMoveForce(m_fMass * GetRight() * fSideSlipAccel * CTimer::GetTimeStep());
 
 		float fYaw = -DotProduct(GetSpeed(vecTail), GetRight());
-		float fYawAccel;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fYawAccel = fRCRudderMult * fYaw * Abs(fYaw) + fRCYawMult * fSteerLR * fForwSpeed;
-		else
-			fYawAccel = fSeaRudderMult * fYaw * Abs(fYaw) + fSeaYawMult * fSteerLR * fForwSpeed;
+		float fYawAccel = pFlyingHandling->fYawStab * fYaw * Abs(fYaw) + pFlyingHandling->fYaw * fSteerLR * fForwSpeed;
 		ApplyTurnForce(fYawAccel * GetRight() * m_fTurnMass * CTimer::GetTimeStep(), vecTail);
 
 		float fRollAccel;
@@ -327,38 +378,25 @@ CVehicle::FlyingControl(eFlightModel flightModel)
 			float fDirectionMultiplier = CPad::GetPad(0)->GetLookRight();
 			if (CPad::GetPad(0)->GetLookLeft())
 				fDirectionMultiplier = -1;
-			fRollAccel = (0.5f * fDirectionMultiplier + fSteerLR) * fRCRollMult;
+			fRollAccel = (0.5f * fDirectionMultiplier + fSteerLR) * pFlyingHandling->fRoll;
 		}
 		else
-			fRollAccel = fSteerLR * fSeaRollMult;
+			fRollAccel = fSteerLR * pFlyingHandling->fRoll;
 		ApplyTurnForce(GetRight() * fRollAccel * fForwSpeed * m_fTurnMass * CTimer::GetTimeStep(), GetUp());
 
 		CVector vecFRight = CrossProduct(GetForward(), CVector(0.0f, 0.0f, 1.0f));
 		CVector vecStabilise = (GetUp().z > 0.0f) ? vecFRight : -vecFRight;
 		float fStabiliseDirection = (GetRight().z > 0.0f) ? -1.0f : 1.0f;
-		float fStabiliseSpeed;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fStabiliseSpeed = fRCRollStabilise * fStabiliseDirection * (1.0f - DotProduct(GetRight(), vecStabilise)) * (1.0f - Abs(GetForward().z));
-		else
-			fStabiliseSpeed = fSeaRollStabilise * fStabiliseDirection * (1.0f - DotProduct(GetRight(), vecStabilise)) * (1.0f - Abs(GetForward().z));
-		ApplyTurnForce(fStabiliseSpeed * m_fTurnMass * GetRight(), GetUp()); // no CTimer::GetTimeStep(), is it right? VC doesn't have it too
+		float fStabiliseSpeed = pFlyingHandling->fRollStab * fStabiliseDirection * (1.0f - DotProduct(GetRight(), vecStabilise)) * (1.0f - Abs(GetForward().z));
+		ApplyTurnForce(fStabiliseSpeed * m_fTurnMass * GetRight(), GetUp()); // no CTimer::GetTimeStep(), is it right?
 
 		// up/down
 		float fTail = -DotProduct(GetSpeed(vecTail), GetUp());
-		float fSteerUD = -CPad::GetPad(0)->GetSteeringUpDown() / 128.0f;
-		float fPitchAccel;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fPitchAccel = fRCTailMult * fTail * Abs(fTail) + fRCPitchMult * fSteerUD * fForwSpeed;
-		else
-			fPitchAccel = fSeaTailMult * fTail * Abs(fTail) + fSeaPitchMult * fSteerUD * fForwSpeed;
+		float fPitchAccel = pFlyingHandling->fPitchStab * fTail * Abs(fTail) + pFlyingHandling->fPitch * fSteerUD * fForwSpeed;
 		ApplyTurnForce(fPitchAccel * m_fTurnMass * GetUp() * CTimer::GetTimeStep(), vecTail);
 
 		float fLift = -DotProduct(GetMoveSpeed(), GetUp()) / Max(0.01f, GetMoveSpeed().Magnitude());
-		float fLiftAccel;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			fLiftAccel = (fRCAttackLiftMult * fLift + fRCFormLiftMult) * fForwSpeed * fForwSpeed;
-		else
-			fLiftAccel = (fSeaAttackLiftMult * fLift + fSeaFormLiftMult) * fForwSpeed * fForwSpeed;
+		float fLiftAccel = (pFlyingHandling->fAttackLift * fLift + pFlyingHandling->fFormLift) * fForwSpeed * fForwSpeed;
 		float fLiftImpulse = fLiftAccel * m_fMass * CTimer::GetTimeStep();
 		if (GRAVITY * CTimer::GetTimeStep() * m_fMass < fLiftImpulse) {
 			if (flightModel == FLIGHT_MODEL_RCPLANE && GetPosition().z > 50.0f)
@@ -369,83 +407,107 @@ CVehicle::FlyingControl(eFlightModel flightModel)
 		ApplyMoveForce(fLiftImpulse * GetUp());
 
 		CVector vecResistance;
-		if (flightModel == FLIGHT_MODEL_RCPLANE)
-			vecResistance = vecRCAeroResistance;
-		else
-			vecResistance = vecSeaAeroResistance;
+		vecResistance = pFlyingHandling->vecTurnRes;
 		float rX = Pow(vecResistance.x, CTimer::GetTimeStep());
 		float rY = Pow(vecResistance.y, CTimer::GetTimeStep());
 		float rZ = Pow(vecResistance.z, CTimer::GetTimeStep());
 		CVector vecTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
 		vecTurnSpeed.x *= rX;
-		float fResistance = vecTurnSpeed.y * (1.0f / (fSpeedResistanceY * SQR(vecTurnSpeed.y) + 1.0f)) * rY - vecTurnSpeed.y;
+		float fResistance = vecTurnSpeed.y * (1.0f / (pFlyingHandling->vecSpeedRes.y * SQR(vecTurnSpeed.y) + 1.0f)) * rY - vecTurnSpeed.y;
 		vecTurnSpeed.z *= rZ;
 		m_vecTurnSpeed = Multiply3x3(GetMatrix(), vecTurnSpeed);
 		ApplyTurnForce(-GetUp() * fResistance * m_fTurnMass, GetRight() + Multiply3x3(GetMatrix(), m_vecCentreOfMass));
+
+
+		float fMoveSpeed = m_vecMoveSpeed.MagnitudeSqr();
+		if(fMoveSpeed > SQR(1.5f))
+			m_vecMoveSpeed *= 1.5f/Sqrt(fMoveSpeed);
+
+		float fTurnSpeed = m_vecTurnSpeed.MagnitudeSqr();
+		if(fTurnSpeed > SQR(0.2f))
+			m_vecTurnSpeed *= 0.2f/Sqrt(fTurnSpeed);
 		break;
 	}
+	case FLIGHT_MODEL_RCHELI:
 	case FLIGHT_MODEL_HELI:
 	{
-		CVector vecMoveResistance;
-		if (GetModelIndex() == MI_MIAMI_SPARROW)
-			vecMoveResistance = vecHeliMoveRes;
-		else
-			vecMoveResistance = vecRCHeliMoveRes;
-		float rmX = Pow(vecMoveResistance.x, CTimer::GetTimeStep());
-		float rmY = Pow(vecMoveResistance.y, CTimer::GetTimeStep());
-		float rmZ = Pow(vecMoveResistance.z, CTimer::GetTimeStep());
-		m_vecMoveSpeed.x *= rmX;
-		m_vecMoveSpeed.y *= rmY;
-		m_vecMoveSpeed.z *= rmZ;
+		float rm = Pow(pFlyingHandling->fMoveRes, CTimer::GetTimeStep());
+		m_vecMoveSpeed *= rm;
 		if (GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE)
 			return;
-		float fThrust;
-		if (bCheat5)
-			fThrust = CPad::GetPad(0)->GetSteeringUpDown() * fThrustVar / 128.0f + 0.95f;
-		else
-			fThrust = fThrustVar * (CPad::GetPad(0)->GetAccelerate() - 2 * CPad::GetPad(0)->GetBrake()) / 255.0f + 0.95f;
-		fThrust -= fRotorFallOff * DotProduct(m_vecMoveSpeed, GetUp());
-#ifdef GTA3_1_1_PATCH
-		if (fThrust > 0.9f && GetPosition().z > 80.0f)
-			fThrust = 0.9f;
-#endif
+		float fUpSpeed = DotProduct(m_vecMoveSpeed, GetUp());
+		float fThrust = (CPad::GetPad(0)->GetAccelerate() - CPad::GetPad(0)->GetBrake()) / 255.0f;
+		if(fThrust < 0.0f)
+			fThrust *= 2.0f;
+		if(flightModel == FLIGHT_MODEL_RCHELI){
+			fThrust = pFlyingHandling->fThrust * fThrust + 0.45f;
+			ApplyMoveForce(GRAVITY * CVector(0.0f, 0.0f, 0.5f) * m_fMass * CTimer::GetTimeStep());
+		}else
+			fThrust = pFlyingHandling->fThrust * fThrust + 0.95f;
+		fThrust -= pFlyingHandling->fThrustFallOff * fUpSpeed;
+		if(flightModel == FLIGHT_MODEL_RCHELI && GetPosition().z > 40.0f)
+			fThrust *= 10.0f/(GetPosition().z - 30.0f);
+		else if(GetPosition().z > 80.0f)
+			fThrust *= 10.0f/(GetPosition().z - 70.0f);
 		ApplyMoveForce(GRAVITY * GetUp() * fThrust * m_fMass * CTimer::GetTimeStep());
 
-		if (GetUp().z > 0.0f)
-			ApplyTurnForce(-CVector(GetUp().x, GetUp().y, 0.0f) * fStabiliseVar * m_fTurnMass * CTimer::GetTimeStep(), GetUp());
+		if (GetUp().z > 0.0f){
+			float upRight = clamp(GetRight().z, -pFlyingHandling->fFormLift, pFlyingHandling->fFormLift);
+			float upImpulseRight = -upRight * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
+			ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
+
+			float upFwd = clamp(GetForward().z, -pFlyingHandling->fFormLift, pFlyingHandling->fFormLift);
+			float upImpulseFwd = -upFwd * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
+			ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
+		}else{
+			float upRight = GetRight().z < 0.0f ? -pFlyingHandling->fFormLift : pFlyingHandling->fFormLift;
+			float upImpulseRight = -upRight * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
+			ApplyTurnForce(upImpulseRight * GetUp(), GetRight());
+
+			float upFwd = GetForward().z < 0.0f ? -pFlyingHandling->fFormLift : pFlyingHandling->fFormLift;
+			float upImpulseFwd = -upFwd * pFlyingHandling->fAttackLift * m_fTurnMass * CTimer::GetTimeStep();
+			ApplyTurnForce(upImpulseFwd * GetUp(), GetForward());
+		}
 
 		float fRoll, fPitch, fYaw;
 		if (bCheat5) {
-			fPitch = CPad::GetPad(0)->GetCarGunUpDown() / 128.0f;
-			fRoll = -CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
-			fYaw = CPad::GetPad(0)->GetCarGunLeftRight() / 128.0f;
-		}
-		else {
 			fPitch = CPad::GetPad(0)->GetSteeringUpDown() / 128.0f;
 			fRoll = CPad::GetPad(0)->GetLookLeft();
 			if (CPad::GetPad(0)->GetLookRight())
 				fRoll = -1.0f;
 			fYaw = CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
+		} else {
+			fPitch = CPad::GetPad(0)->GetSteeringUpDown() / 128.0f;
+			fRoll = -CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
+			fYaw = CPad::GetPad(0)->GetLookRight();
+			if (CPad::GetPad(0)->GetLookLeft())
+				fYaw = -1.0f;
+			if(Abs(CPad::GetPad(0)->GetCarGunLeftRight()) > 1.0f)
+				fYaw = CPad::GetPad(0)->GetCarGunLeftRight() / 128.0f;
 		}
+		if(Abs(CPad::GetPad(0)->GetCarGunUpDown()) > 1.0f)
+			fPitch = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f;
 		if (CPad::GetPad(0)->GetHorn()) {
 			fYaw = 0.0f;
-			fPitch = clamp(10.0f * DotProduct(m_vecMoveSpeed, GetForward()), -200.0f, 1.3f);
-			fRoll = clamp(10.0f * DotProduct(m_vecMoveSpeed, GetRight()), -200.0f, 1.3f);
+			fPitch = clamp(pFlyingHandling->fPitchStab * DotProduct(m_vecMoveSpeed, GetForward()), -200.0f, 1.3f);
+			fRoll = clamp(pFlyingHandling->fRollStab * DotProduct(m_vecMoveSpeed, GetRight()), -200.0f, 1.3f);
 		}
-		ApplyTurnForce(fPitch * GetUp() * fPitchVar * m_fTurnMass * CTimer::GetTimeStep(), GetForward());
-		ApplyTurnForce(fRoll * GetUp() * fRollVar * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
-		ApplyTurnForce(fYaw * GetForward() * fYawVar * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
+		ApplyTurnForce(fPitch * GetUp() * pFlyingHandling->fPitch * m_fTurnMass * CTimer::GetTimeStep(), GetForward());
+		ApplyTurnForce(fRoll * GetUp() * pFlyingHandling->fRoll * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
 
-		CVector vecResistance;
-		if (GetModelIndex() == MI_MIAMI_SPARROW)
-			vecResistance = vecHeliResistance;
-		else
-			vecResistance = vecRCHeliResistance;
-		float rX = Pow(vecResistance.x, CTimer::GetTimeStep());
-		float rY = Pow(vecResistance.y, CTimer::GetTimeStep());
-		float rZ = Pow(vecResistance.z, CTimer::GetTimeStep());
+		float fSideSpeed = -DotProduct(GetMoveSpeed(), GetRight());
+		float fSideSlipAccel = pFlyingHandling->fSideSlip * fSideSpeed * Abs(fSideSpeed);
+		ApplyMoveForce(m_fMass * GetRight() * fSideSlipAccel * CTimer::GetTimeStep());
+		float fYawAccel = pFlyingHandling->fYawStab * fSideSpeed * Abs(fSideSpeed) + pFlyingHandling->fYaw * fYaw;
+		ApplyTurnForce(fYawAccel * GetRight() * m_fTurnMass * CTimer::GetTimeStep(), -GetForward());
+
+		ApplyTurnForce(fYaw * GetForward() * pFlyingHandling->fYaw * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
+
+		float rX = Pow(pFlyingHandling->vecTurnRes.x, CTimer::GetTimeStep());
+		float rY = Pow(pFlyingHandling->vecTurnRes.y, CTimer::GetTimeStep());
+		float rZ = Pow(pFlyingHandling->vecTurnRes.z, CTimer::GetTimeStep());
 		CVector vecTurnSpeed = Multiply3x3(m_vecTurnSpeed, GetMatrix());
-		float fResistanceMultiplier = Pow(1.0f / (fSpinSpeedRes * SQR(vecTurnSpeed.z) + 1.0f) * rZ, CTimer::GetTimeStep());
+		float fResistanceMultiplier = Pow(1.0f / (pFlyingHandling->vecSpeedRes.z * SQR(vecTurnSpeed.z) + 1.0f) * rZ, CTimer::GetTimeStep());
 		float fResistance = vecTurnSpeed.z * fResistanceMultiplier - vecTurnSpeed.z;
 		vecTurnSpeed.x *= rX;
 		vecTurnSpeed.y *= rY;
@@ -457,8 +519,228 @@ CVehicle::FlyingControl(eFlightModel flightModel)
 	}
 }
 
+static CColModel rotorColModel;
+static CColSphere rotorColSphere;
+float ROTOR_SEMI_THICKNESS = 0.05f;
+float ROTOR_TURN_SPEED = 0.2f;
+float ROTOR_DISGUARD_MULT = 0.3f;
+float ROTOR_COL_ELASTICITY = 1.0f;
+float ROTOR_COL_TURNMULT = -0.001f;
+float ROTOR_DEFAULT_DAMAGE = 100.0f;
+
+bool
+CVehicle::DoBladeCollision(CVector pos, CMatrix &matrix, int16 rotorType, float radius, float damageMult)
+{
+	CVector max(radius, radius, radius);
+	CVector min(-radius, -radius, -radius);
+
+	switch(rotorType){
+	case ROTOR_TOP:
+	case ROTOR_BOTTOM:
+		min.z = -ROTOR_SEMI_THICKNESS;
+		max.z = ROTOR_SEMI_THICKNESS;
+		break;
+	case ROTOR_FRONT:
+	case ROTOR_BACK:
+		min.y = -ROTOR_SEMI_THICKNESS;
+		max.y = ROTOR_SEMI_THICKNESS;
+		break;
+	case ROTOR_RIGHT:
+	case ROTOR_LEFT:
+		min.x = -ROTOR_SEMI_THICKNESS;
+		max.x = ROTOR_SEMI_THICKNESS;
+		break;
+	}
+
+	min += pos;
+	max += pos;
+	rotorColModel.boundingBox.Set(min, max);
+	rotorColModel.boundingSphere.Set(radius, pos);
+	rotorColSphere.Set(radius, pos, 0, 0);
+	rotorColModel.spheres = &rotorColSphere;
+	rotorColModel.numSpheres = 1;
+
+	pos = matrix * pos;
+	bool hadCollision = false;
+	int minX = CWorld::GetSectorIndexX(pos.x - radius);
+	if(minX <= 0) minX = 0;
+
+	int minY = CWorld::GetSectorIndexY(pos.y - radius);
+	if(minY <= 0) minY = 0;
+
+	int maxX = CWorld::GetSectorIndexX(pos.x + radius);
+#ifdef FIX_BUGS
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X - 1;
+#else
+	if(maxX >= NUMSECTORS_X) maxX = NUMSECTORS_X;
+#endif
+
+	int maxY = CWorld::GetSectorIndexY(pos.y + radius);
+#ifdef FIX_BUGS
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y - 1;
+#else
+	if(maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
+#endif
+
+	CWorld::AdvanceCurrentScanCode();
+	for(int curY = minY; curY <= maxY; curY++) {
+		for(int curX = minX; curX <= maxX; curX++) {
+			CSector *sector = CWorld::GetSector(curX, curY);
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_BUILDINGS], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_BUILDINGS_OVERLAP], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_VEHICLES], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_PEDS], rotorColModel, matrix, rotorType, 0.0f))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_PEDS_OVERLAP], rotorColModel, matrix, rotorType, 0.0f))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_OBJECTS], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+			if(BladeColSectorList(sector->m_lists[ENTITYLIST_OBJECTS_OVERLAP], rotorColModel, matrix, rotorType, damageMult))
+				hadCollision = true;
+		}
+	}
+	rotorColModel.spheres = nil;
+	rotorColModel.numSpheres = 0;
+
+	return hadCollision;
+}
+
+bool
+CVehicle::BladeColSectorList(CPtrList &list, CColModel &rotorColModel, CMatrix &matrix, int16 rotorType, float damageMult)
+{
+	int i;
+	CVector axis;
+	CVector turnSpeed(0.0f, 0.0f, 0.0f);
+	switch(rotorType){
+	case ROTOR_TOP:
+		turnSpeed.z = -ROTOR_TURN_SPEED;
+		axis = -matrix.GetUp();
+		break;
+	case ROTOR_BOTTOM:
+		turnSpeed.z = ROTOR_TURN_SPEED;
+		axis = matrix.GetUp();
+		break;
+
+	case ROTOR_FRONT:
+		turnSpeed.y = -ROTOR_TURN_SPEED;
+		axis = -matrix.GetForward();
+		break;
+	case ROTOR_BACK:
+		turnSpeed.y = ROTOR_TURN_SPEED;
+		axis = matrix.GetForward();
+		break;
+
+	case ROTOR_RIGHT:
+		turnSpeed.x = -ROTOR_TURN_SPEED;
+		axis = -matrix.GetRight();
+		break;
+	case ROTOR_LEFT:
+		turnSpeed.x = ROTOR_TURN_SPEED;
+		axis = matrix.GetRight();
+		break;
+	}
+	turnSpeed = Multiply3x3(matrix, turnSpeed);
+	CVector center = rotorColModel.boundingSphere.center;
+	center = matrix*center;
+
+	for(CPtrNode *node = list.first; node; node = node->next) {
+		CEntity *entity = (CEntity *)node->item;
+		if(entity == (CEntity*)this ||
+		   !entity->bUsesCollision ||
+		   entity->m_scanCode == CWorld::GetCurrentScanCode())
+			continue;
+
+		entity->m_scanCode = CWorld::GetCurrentScanCode();
+
+		int numCollisions;
+		CColModel *entityCol;
+		if(entity->IsPed())
+			entityCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(entity->GetModelIndex()))->AnimatePedColModelSkinned(entity->GetClump());
+		else
+			entityCol = entity->GetColModel();
+		if(entityCol)
+			numCollisions = CCollision::ProcessColModels(matrix, rotorColModel, entity->GetMatrix(), *entityCol,
+				CWorld::m_aTempColPts, nil, nil);
+		else
+			numCollisions = 0;
+
+		if(numCollisions > 0 && entity->IsPed()){
+			CPed *ped = (CPed*)entity;
+			CVector2D dirToRotor = GetPosition() - entity->GetPosition();
+			dirToRotor.Normalise();
+			int localDir = ped->GetLocalDirection(dirToRotor);
+			if(ped->m_attachedTo == nil){
+				ped->bIsStanding = false;
+				ped->ApplyMoveForce(-5.0f*dirToRotor.x, -5.0f*dirToRotor.y, 5.0f);
+			}
+			ped->InflictDamage(this, WEAPONTYPE_RUNOVERBYCAR, 1000.0f, PEDPIECE_TORSO, localDir);
+
+			if(CGame::nastyGame && ped->GetIsOnScreen()){
+				for(i = 0; i < 16; i++)
+					CParticle::AddParticle(PARTICLE_BLOOD_SMALL, ped->GetPosition(), CVector(dirToRotor.x, dirToRotor.y, 1.0f) * 0.01f);
+				CParticle::AddParticle(PARTICLE_TEST, ped->GetPosition(), CVector(0.0f, 0.0f, 0.02f), nil, 0.1f);
+				CParticle::AddParticle(PARTICLE_TEST, ped->GetPosition()+CVector(0.0f, 0.0f, 0.2f), CVector(0.0f, 0.0f, -0.01f), nil, 0.1f);
+			}
+		}else if(numCollisions > 0 && entity->GetModelIndex() != MI_MISSILE){
+			float impulse = 0.0f;
+			bool hadCollision = false;
+			float savedElasticity = m_fElasticity;
+			m_fElasticity = ROTOR_COL_ELASTICITY;
+
+			for(i = 0; i < numCollisions; i++){
+				CVector colpos = CWorld::m_aTempColPts[i].point;
+				CVector localColpos = colpos - center;
+				float axisDir = DotProduct(axis, localColpos);
+				float colDir = DotProduct(CWorld::m_aTempColPts[i].normal, localColpos);
+
+				if(2.0f*ROTOR_SEMI_THICKNESS < Abs(axisDir) &&
+				   ROTOR_DISGUARD_MULT*Abs(colDir) < Abs(axisDir))
+					continue;
+
+				hadCollision = true;
+				colpos -= axisDir*axis;	// get rid of axis component
+
+				CVector tangentSpeed = CrossProduct(turnSpeed, colpos - center);
+
+				// Particles
+				for(int j = 0; j < 4; j++){
+					CParticle::AddParticle(PARTICLE_SPARK_SMALL, colpos, (tangentSpeed+m_vecMoveSpeed)/2.0f);
+					CParticle::AddParticle(PARTICLE_SPARK, colpos, 0.1f*CWorld::m_aTempColPts[i].normal);
+				}
+
+				// Apply Collision
+				if(IsCar()){
+					CAutomobile *heli = (CAutomobile*)this;
+					if(heli->m_aWheelSpeed[1] > 0.15f){
+						ApplyCollision(CWorld::m_aTempColPts[i], impulse);
+						ApplyTurnForce(m_fTurnMass*ROTOR_COL_TURNMULT*tangentSpeed, colpos - center);
+						heli->m_aWheelSpeed[1] = 0.15f;
+					}else if(heli->m_aWheelSpeed[1] < 0.075f && heli->m_aWheelSpeed[1] > 0.0f)
+						heli->m_aWheelSpeed[1] *= -1.0f;
+				}
+
+				float damageImpulse = damageMult * Max(impulse, ROTOR_DEFAULT_DAMAGE*m_fMass/3000.0f);
+				if(damageImpulse > m_fDamageImpulse)
+					SetDamagedPieceRecord(0, damageImpulse, entity, CWorld::m_aTempColPts[i].normal);
+
+			}
+
+			if(hadCollision && !entity->IsPed())
+				DMAudio.ReportCollision(this, entity, SURFACE_CAR_PANEL, SURFACE_TARMAC, 50.0f, 0.09f);
+			m_fElasticity = savedElasticity;
+		}
+	}
+	return false;
+}
+
+
 float fBurstSpeedMax = 0.3f;
-float fBurstTyreMod = 0.1f;
+float fBurstTyreMod = 0.13f;
 
 void
 CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelContactSpeed, CVector &wheelContactPoint,
@@ -530,7 +812,172 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
 
 		if(!bBraking){
 			if(m_fGasPedal < 0.01f){
-				if(GetModelIndex() == MI_RCBANDIT)
+				if(IsBike())
+					brake = 0.6f * mod_HandlingManager.fWheelFriction / (pHandling->fMass + 200.0f);
+				else if(pHandling->fMass < 500.0f)
+					brake = mod_HandlingManager.fWheelFriction / m_fMass;
+				else if(GetModelIndex() == MI_RCBANDIT)
+					brake = 0.2f * mod_HandlingManager.fWheelFriction / m_fMass;
+				else
+					brake = mod_HandlingManager.fWheelFriction / m_fMass;
+#ifdef FIX_BUGS
+				brake *= CTimer::GetTimeStepFix();
+#endif
+			}
+		}
+
+		if(brake > adhesion){
+			if(Abs(contactSpeedFwd) > 0.005f)
+				*wheelState = WHEEL_STATE_FIXED;
+		}else {
+			if(fwd > 0.0f){
+				if(fwd > brake)
+					fwd = brake;
+			}else{
+				if(fwd < -brake)
+					fwd = -brake;
+			}
+		}
+	}
+
+	float speedSq = sq(right) + sq(fwd);
+	if(sq(adhesion) < speedSq){
+		if(*wheelState != WHEEL_STATE_FIXED){
+			if(bDriving && contactSpeedFwd < 0.2f)
+				*wheelState = WHEEL_STATE_SPINNING;
+			else
+				*wheelState = WHEEL_STATE_SKIDDING;
+		}
+
+		float l = Sqrt(speedSq);
+		float tractionLoss = bAlreadySkidding ? 1.0f : pHandling->fTractionLoss;
+		right *= adhesion * tractionLoss / l;
+		fwd *= adhesion * tractionLoss / l;
+	}
+
+	if(fwd != 0.0f || right != 0.0f){
+		CVector totalSpeed = fwd*wheelFwd + right*wheelRight;
+
+		CVector turnDirection = totalSpeed;
+		bool separateTurnForce = false;	// BUG: not initialized on PC
+		if(pHandling->fSuspensionAntidiveMultiplier > 0.0f){
+			if(bBraking){
+				separateTurnForce = true;
+				turnDirection = totalSpeed - pHandling->fSuspensionAntidiveMultiplier*fwd*wheelFwd;
+			}else if(bDriving){
+				separateTurnForce = true;
+				turnDirection = totalSpeed - 0.5f*pHandling->fSuspensionAntidiveMultiplier*fwd*wheelFwd;
+			}
+		}
+
+		CVector direction = totalSpeed;
+
+		float speed = totalSpeed.Magnitude();
+		float turnSpeed;
+		if(separateTurnForce)
+			turnSpeed = turnDirection.Magnitude();
+		else
+			turnSpeed = speed;
+		direction.Normalise();
+		if(separateTurnForce)
+			turnDirection.Normalise();
+		else
+			turnDirection = direction;
+
+		float impulse = speed*m_fMass;
+		float turnImpulse = turnSpeed*GetMass(wheelContactPoint, turnDirection);
+
+		ApplyMoveForce(impulse * direction);
+		ApplyTurnForce(turnImpulse * direction, wheelContactPoint);
+	}
+}
+
+float fBurstBikeSpeedMax = 0.12f;
+float fBurstBikeTyreMod = 0.05f;
+float fTweakBikeWheelTurnForce = 2.0f;
+
+void
+CVehicle::ProcessBikeWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelContactSpeed, CVector &wheelContactPoint,
+	int32 wheelsOnGround, float thrust, float brake, float adhesion, float destabTraction, int8 wheelId, float *wheelSpeed, tWheelState *wheelState, eBikeWheelSpecial special, uint16 wheelStatus)
+{
+	// BUG: using statics here is probably a bad idea
+	static bool bAlreadySkidding = false;	// this is never reset
+	static bool bBraking;
+	static bool bDriving;
+	static bool bReversing;
+
+#ifdef FIX_SIGNIFICANT_BUGS
+	bAlreadySkidding = false;
+#endif
+
+	// how much force we want to apply in these axes
+	float fwd = 0.0f;
+	float right = 0.0f;
+
+	bBraking = brake != 0.0f;
+	if(bBraking)
+		thrust = 0.0f;
+	bDriving = thrust != 0.0f;
+	bReversing = thrust < 0.0f;
+
+	float contactSpeedFwd = DotProduct(wheelContactSpeed, wheelFwd);
+	float contactSpeedRight;
+
+	if(*wheelState != WHEEL_STATE_NORMAL)
+		bAlreadySkidding = true;
+	*wheelState = WHEEL_STATE_NORMAL;
+
+	adhesion *= CTimer::GetTimeStep();
+	if(bAlreadySkidding)
+		adhesion *= pHandling->fTractionLoss;
+
+	if(special == BIKE_WHEELSPEC_2 || special == BIKE_WHEELSPEC_3)
+		contactSpeedRight = 0.0f;
+	else
+		contactSpeedRight = DotProduct(wheelContactSpeed, wheelRight);
+
+	// moving sideways
+	if(contactSpeedRight != 0.0f){
+		// exert opposing force
+		right = -contactSpeedRight/wheelsOnGround;
+#ifdef FIX_BUGS
+		// contactSpeedRight is independent of framerate but right has timestep as a factor
+		// so we probably have to fix this
+		right *= CTimer::GetTimeStepFix();
+#endif
+
+		if(wheelStatus == WHEEL_STATUS_BURST){
+			float fwdspeed = Min(contactSpeedFwd, fBurstBikeSpeedMax);
+			right += fwdspeed * CGeneral::GetRandomNumberInRange(-fBurstBikeTyreMod, fBurstBikeTyreMod);
+		}
+	}
+
+	if(bDriving){
+		fwd = thrust;
+
+		// limit sideways force (why?)
+		if(right > 0.0f){
+			if(right > adhesion)
+				right = adhesion;
+		}else{
+			if(right < -adhesion)
+				right = -adhesion;
+		}
+	}else if(contactSpeedFwd != 0.0f){
+		fwd = -contactSpeedFwd/wheelsOnGround;
+#ifdef FIX_BUGS
+		// contactSpeedFwd is independent of framerate but fwd has timestep as a factor
+		// so we probably have to fix this
+		fwd *= CTimer::GetTimeStepFix();
+#endif
+
+		if(!bBraking){
+			if(m_fGasPedal < 0.01f){
+				if(IsBike())
+					brake = 0.6f * mod_HandlingManager.fWheelFriction / (pHandling->fMass + 200.0f);
+				else if(pHandling->fMass < 500.0f)
+					brake = mod_HandlingManager.fWheelFriction / m_fMass;
+				else if(GetModelIndex() == MI_RCBANDIT)
 					brake = 0.2f * mod_HandlingManager.fWheelFriction / m_fMass;
 				else
 					brake = mod_HandlingManager.fWheelFriction / m_fMass;
@@ -567,18 +1014,38 @@ CVehicle::ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelCon
 		float tractionLoss = bAlreadySkidding ? 1.0f : pHandling->fTractionLoss;
 		right *= adhesion * tractionLoss / l;
 		fwd *= adhesion * tractionLoss / l;
+
+		if(destabTraction < 1.0f)
+			right *= destabTraction;
+	}else if(destabTraction < 1.0f){
+		if(!bAlreadySkidding)
+			destabTraction *= pHandling->fTractionLoss;
+		if(sq(adhesion*destabTraction) < speedSq){
+			float l = Sqrt(speedSq);
+			right *= adhesion * destabTraction / l;
+		}
 	}
 
 	if(fwd != 0.0f || right != 0.0f){
 		CVector direction = fwd*wheelFwd + right*wheelRight;
+
 		float speed = direction.Magnitude();
 		direction.Normalise();
 
 		float impulse = speed*m_fMass;
 		float turnImpulse = speed*GetMass(wheelContactPoint, direction);
-
+		CVector vTurnImpulse = turnImpulse * direction;
 		ApplyMoveForce(impulse * direction);
-		ApplyTurnForce(turnImpulse * direction, wheelContactPoint);
+
+		float turnRight = DotProduct(vTurnImpulse, GetRight());
+		float contactRight = DotProduct(wheelContactPoint, GetRight());
+		float contactFwd = DotProduct(wheelContactPoint, GetForward());
+
+		if(wheelId != BIKEWHEEL_REAR || !bBraking && !bReversing)
+			ApplyTurnForce((vTurnImpulse - turnRight*GetRight()) * fTweakBikeWheelTurnForce,
+				wheelContactPoint - contactRight*GetRight());
+
+		ApplyTurnForce(turnRight*GetRight(), contactFwd*GetForward());
 	}
 }
 
@@ -600,35 +1067,81 @@ CVehicle::ProcessWheelRotation(tWheelState state, const CVector &fwd, const CVec
 	return angularVelocity * CTimer::GetTimeStep();
 }
 
+int
+CVehicle::FindTyreNearestPoint(float x, float y)
+{
+	CVector pos = CVector(x - GetPosition().x, y - GetPosition().y, 0.0f);
+	float fwd = DotProduct(GetForward(), pos);
+	float right = DotProduct(GetRight(), pos);
+
+	int piece;
+	if(IsBike()){
+		piece = fwd > 0.0f ? CAR_PIECE_WHEEL_LF : CAR_PIECE_WHEEL_LR;
+	}else{
+		piece = fwd > 0.0f ?
+			right > 0.0f ? CAR_PIECE_WHEEL_RF : CAR_PIECE_WHEEL_LF :
+			right > 0.0f ? CAR_PIECE_WHEEL_RR : CAR_PIECE_WHEEL_LR;
+	}
+	return piece - CAR_PIECE_WHEEL_LF;
+}
+
 void
-CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage)
+CVehicle::InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage, CVector pos)
 {
 	if (!bCanBeDamaged)
 		return;
-	if (bOnlyDamagedByPlayer && (damagedBy != FindPlayerPed() && damagedBy != FindPlayerVehicle()))
+	if(GetStatus() == STATUS_PLAYER && CStats::GetPercentageProgress() >= 100.0f)
+		damage *= 0.5f;
+	if (GetStatus() != STATUS_PLAYER && bOnlyDamagedByPlayer && (damagedBy != FindPlayerPed() && damagedBy != FindPlayerVehicle()))
 		return;
+
+	if(damage > 10.0f && (damagedBy == FindPlayerPed() || damagedBy == FindPlayerVehicle()) && GetStatus() != STATUS_WRECKED){
+		CWorld::Players[CWorld::PlayerInFocus].m_nHavocLevel += 2;
+		CWorld::Players[CWorld::PlayerInFocus].m_fMediaAttention += 1.0f;
+		CStats::PropertyDestroyed += CGeneral::GetRandomNumberInRange(5, 25);
+	}
+
 	bool bFrightensDriver = false;
 	switch (weaponType) {
 	case WEAPONTYPE_UNARMED:
+	case WEAPONTYPE_BRASSKNUCKLE:
+	case WEAPONTYPE_SCREWDRIVER:
+	case WEAPONTYPE_GOLFCLUB:
+	case WEAPONTYPE_NIGHTSTICK:
+	case WEAPONTYPE_KNIFE:
 	case WEAPONTYPE_BASEBALLBAT:
+	case WEAPONTYPE_HAMMER:
+	case WEAPONTYPE_CLEAVER:
+	case WEAPONTYPE_MACHETE:
+	case WEAPONTYPE_KATANA:
+	case WEAPONTYPE_CHAINSAW:
 		if (bMeleeProof)
 			return;
 		break;
 	case WEAPONTYPE_COLT45:
-	case WEAPONTYPE_UZI:
+	case WEAPONTYPE_PYTHON:
 	case WEAPONTYPE_SHOTGUN:
-	case WEAPONTYPE_AK47:
-	case WEAPONTYPE_M16:
+	case WEAPONTYPE_SPAS12_SHOTGUN:
+	case WEAPONTYPE_STUBBY_SHOTGUN:
+	case WEAPONTYPE_TEC9:
+	case WEAPONTYPE_UZI:
+	case WEAPONTYPE_SILENCED_INGRAM:
+	case WEAPONTYPE_MP5:
+	case WEAPONTYPE_M4:
+	case WEAPONTYPE_RUGER:
 	case WEAPONTYPE_SNIPERRIFLE:
-	case WEAPONTYPE_TOTAL_INVENTORY_WEAPONS:
+	case WEAPONTYPE_LASERSCOPE:
+	case WEAPONTYPE_M60:
+	case WEAPONTYPE_MINIGUN:
+	case WEAPONTYPE_HELICANNON:
 	case WEAPONTYPE_UZI_DRIVEBY:
 		if (bBulletProof)
 			return;
 		bFrightensDriver = true;
 		break;
-	case WEAPONTYPE_ROCKETLAUNCHER:
-	case WEAPONTYPE_MOLOTOV:
 	case WEAPONTYPE_GRENADE:
+	case WEAPONTYPE_MOLOTOV:
+	case WEAPONTYPE_ROCKET:
 	case WEAPONTYPE_EXPLOSION:
 		if (bExplosionProof)
 			return;
@@ -645,6 +1158,52 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
 	default:
 		break;
 	}
+
+	if(bFrightensDriver && GetStatus() == STATUS_PLAYER && m_fHealth < 250.0f)
+		return;
+
+	// Pop tires
+	if(damagedBy && damagedBy->IsPed() && (IsCar() || IsBike())){
+		int accuracy = 0;
+		switch(weaponType){
+		case WEAPONTYPE_COLT45:
+			accuracy = 10;
+			break;
+		case WEAPONTYPE_PYTHON:
+			if(!((CPed*)damagedBy)->IsPlayer())
+				accuracy = 64;
+			break;
+		case WEAPONTYPE_SHOTGUN:
+		case WEAPONTYPE_STUBBY_SHOTGUN:
+		case WEAPONTYPE_M60:
+		case WEAPONTYPE_HELICANNON:
+			accuracy = 25;
+			break;
+		case WEAPONTYPE_TEC9:
+		case WEAPONTYPE_UZI:
+		case WEAPONTYPE_SILENCED_INGRAM:
+		case WEAPONTYPE_MP5:
+		case WEAPONTYPE_UZI_DRIVEBY:
+			accuracy = 15;
+			break;
+		case WEAPONTYPE_M4:
+		case WEAPONTYPE_RUGER:
+			if(!((CPed*)damagedBy)->IsPlayer())
+				accuracy = 15;
+			break;
+		}
+
+		if(((CPed*)damagedBy)->IsPlayer() && (CCamera::m_bUseMouse3rdPerson || TheCamera.Using1stPersonWeaponMode()))
+			accuracy = 0;
+
+		if(accuracy != 0 && !bTyresDontBurst && (CGeneral::GetRandomNumber()&0x7F) < accuracy){
+			if(IsBike())
+				BurstTyre(FindTyreNearestPoint(pos.x, pos.y) + CAR_PIECE_WHEEL_LF, false);
+			else if(GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR)
+				BurstTyre(FindTyreNearestPoint(pos.x, pos.y) + CAR_PIECE_WHEEL_LF, true);
+		}
+	}
+
 	if (m_fHealth > 0.0f) {
 		if (VehicleCreatedBy == RANDOM_VEHICLE && pDriver &&
 			(GetStatus() == STATUS_SIMPLE || GetStatus() == STATUS_PHYSICS) &&
@@ -657,24 +1216,41 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
 			}
 		}
 		m_nLastWeaponDamage = weaponType;
+		m_pLastDamageEntity = damagedBy;
 		float oldHealth = m_fHealth;
 		if (m_fHealth > damage) {
 			m_fHealth -= damage;
-			if (VehicleCreatedBy == RANDOM_VEHICLE &&
-				(m_fHealth < DAMAGE_HEALTH_TO_FLEE_ALWAYS ||
-					bFrightensDriver && m_randomSeed > DAMAGE_FLEE_ON_FOOT_PROBABILITY_VALUE)) {
+			if (VehicleCreatedBy == RANDOM_VEHICLE && !IsBoat()){
 				switch (GetStatus()) {
 				case STATUS_SIMPLE:
 				case STATUS_PHYSICS:
-					if (pDriver) {
-						SetStatus(STATUS_ABANDONED);
-						pDriver->bFleeAfterExitingCar = true;
-						pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
-					}
-					for (int i = 0; i < m_nNumMaxPassengers; i++) {
-						if (pPassengers[i]) {
-							pPassengers[i]->bFleeAfterExitingCar = true;
-							pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
+					if(AutoPilot.m_nDrivingStyle == DRIVINGSTYLE_PLOUGH_THROUGH ||
+					   CGeneral::GetRandomNumberInRange(0.0f, 1.0f) > 0.5f && AutoPilot.m_nCarMission == MISSION_CRUISE){
+						// Drive away like a maniac
+						if(pDriver && pDriver->m_objective != OBJECTIVE_LEAVE_VEHICLE){
+							if(AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_PLOUGH_THROUGH)
+								AutoPilot.m_nCruiseSpeed *= 1.5f;
+							AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH;
+						}
+					}else{
+						// Leave vehicle
+						if (pDriver && pDriver->CharCreatedBy != MISSION_CHAR) {
+							SetStatus(STATUS_ABANDONED);
+							pDriver->bFleeAfterExitingCar = true;
+							pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
+							pDriver->Say(SOUND_PED_FLEE_SPRINT);
+						}
+						int time = 200;
+						for (int i = 0; i < m_nNumMaxPassengers; i++) {
+							if (pPassengers[i] &&
+							    pPassengers[i]->m_objective != OBJECTIVE_LEAVE_VEHICLE &&
+							    pPassengers[i]->CharCreatedBy != MISSION_CHAR) {
+								pPassengers[i]->bFleeAfterExitingCar = true;
+								pPassengers[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
+								pPassengers[i]->m_objectiveTimer = CTimer::GetTimeInMilliseconds() + time;
+								pPassengers[i]->Say(SOUND_PED_FLEE_SPRINT);
+								time += 200;
+							}
 						}
 					}
 					break;
@@ -716,56 +1292,98 @@ CVehicle::InflictDamage(CEntity* damagedBy, eWeaponType weaponType, float damage
 void
 CVehicle::DoFixedMachineGuns(void)
 {
-	if(CPad::GetPad(0)->GetCarGunFired() && !bGunSwitchedOff){
-		if(CTimer::GetTimeInMilliseconds() > m_nGunFiringTime + 150){
-			CVector source, target;
-			float dx, dy, len;
-
-			dx = GetForward().x;
-			dy = GetForward().y;
-			len = Sqrt(SQR(dx) + SQR(dy));
-			if(len < 0.1f) len = 0.1f;
-			dx /= len;
-			dy /= len;
-
-			m_nGunFiringTime = CTimer::GetTimeInMilliseconds();
-
-			source = GetMatrix() * CVector(2.0f, 2.5f, 1.0f);
-			target = source + CVector(dx, dy, 0.0f)*60.0f;
-			target += CVector(
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.015f,
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.015f,
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.02f);
-			CWeapon::DoTankDoomAiming(this, pDriver, &source, &target);
-			FireOneInstantHitRound(&source, &target, 15);
-
-			source = GetMatrix() * CVector(-2.0f, 2.5f, 1.0f);
-			target = source + CVector(dx, dy, 0.0f)*60.0f;
-			target += CVector(
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.015f,
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.015f,
-				((CGeneral::GetRandomNumber()&0xFF)-128) * 0.02f);
-			CWeapon::DoTankDoomAiming(this, pDriver, &source, &target);
-			FireOneInstantHitRound(&source, &target, 15);
-
-			DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
-
-			m_nAmmoInClip--;
-			if(m_nAmmoInClip == 0){
+	if(TheCamera.Cams[TheCamera.ActiveCam].DirectionWasLooking == LOOKING_FORWARD){
+		if(CPad::GetPad(0)->GetCarGunFired() && !bGunSwitchedOff){
+			FireFixedMachineGuns();
+		}else{
+			if(CTimer::GetTimeInMilliseconds() > m_nGunFiringTime + 1400)
 				m_nAmmoInClip = 20;
-				m_nGunFiringTime = CTimer::GetTimeInMilliseconds() + 1400;
-			}
 		}
-	}else{
-		if(CTimer::GetTimeInMilliseconds() > m_nGunFiringTime + 1400)
-			m_nAmmoInClip = 20;
 	}
 }
 
 void
+CVehicle::FireFixedMachineGuns(void)
+{
+	if (CTimer::GetTimeInMilliseconds() <= m_nGunFiringTime + 150)
+		return;
+	CVector source, target;
+	float dx, dy, len;
+
+	dx = GetForward().x;
+	dy = GetForward().y;
+	len = Sqrt(SQR(dx) + SQR(dy));
+	if (len < 0.1f) len = 0.1f;
+	dx /= len;
+	dy /= len;
+
+	m_nGunFiringTime = CTimer::GetTimeInMilliseconds();
+
+	source = GetMatrix() * CVector(2.0f, 2.5f, 1.0f);
+	target = source + CVector(dx, dy, 0.0f) * 60.0f;
+	target += CVector(
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.015f,
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.015f,
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.02f);
+	CWeapon::DoTankDoomAiming(this, pDriver, &source, &target);
+	FireOneInstantHitRound(&source, &target, 15);
+
+	source = GetMatrix() * CVector(-2.0f, 2.5f, 1.0f);
+	target = source + CVector(dx, dy, 0.0f) * 60.0f;
+	target += CVector(
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.015f,
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.015f,
+		((CGeneral::GetRandomNumber() & 0xFF) - 128) * 0.02f);
+	CWeapon::DoTankDoomAiming(this, pDriver, &source, &target);
+	FireOneInstantHitRound(&source, &target, 15);
+
+	DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
+
+	m_nAmmoInClip--;
+	if (m_nAmmoInClip == 0) {
+		m_nAmmoInClip = 20;
+		m_nGunFiringTime = CTimer::GetTimeInMilliseconds() + 1400;
+	}
+}
+
+void
+CVehicle::ActivateBomb(void)
+{
+	if(m_bombType == CARBOMB_TIMED){
+		m_bombType = CARBOMB_TIMEDACTIVE;
+		m_nBombTimer = 7000;
+		m_pBlowUpEntity = FindPlayerPed();
+		CGarages::TriggerMessage("GA_12", -1, 3000, -1);
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TIMED_ACTIVATED, 1.0f);
+	}else if(m_bombType == CARBOMB_ONIGNITION){
+		m_bombType = CARBOMB_ONIGNITIONACTIVE;
+		CGarages::TriggerMessage("GA_12", -1, 3000, -1);
+		DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_ONIGNITION_ACTIVATED, 1.0f);
+	}
+}
+
+void
+CVehicle::ActivateBombWhenEntered(void)
+{
+	if(pDriver){
+		if(!bDriverLastFrame && m_bombType == CARBOMB_ONIGNITIONACTIVE){
+			// If someone enters the car and there is a bomb, detonate
+			m_nBombTimer = 1000;
+			m_pBlowUpEntity = m_pBombRigger;
+			if(m_pBlowUpEntity)
+				m_pBlowUpEntity->RegisterReference((CEntity**)&m_pBlowUpEntity);
+			DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TICK, 1.0f);
+		}
+		bDriverLastFrame = true;
+	}else
+		bDriverLastFrame = false;
+}
+
+void
 CVehicle::ExtinguishCarFire(void)
 {
-	m_fHealth = Max(m_fHealth, 300.0f);
+	if(GetStatus() != STATUS_WRECKED)
+		m_fHealth = Max(m_fHealth, 300.0f);
 	if(m_pCarFire)
 		m_pCarFire->Extinguish();
 	if(IsCar()){
@@ -836,6 +1454,69 @@ CVehicle::ShufflePassengersToMakeSpace(void)
 }
 
 void
+CVehicle::MakeNonDraggedPedsLeaveVehicle(CPed *ped1, CPed *ped2, CPlayerPed *&player, CCopPed *&cop)
+{
+	int i;
+	player = nil;
+	cop = nil;
+
+	if(ped1->IsPlayer() && ped2->m_nPedType == PEDTYPE_COP &&
+	   ((CPlayerPed*)ped1)->m_pWanted->m_nWantedLevel > 0 &&
+	   ped2->m_pedInObjective == ped1){
+		player = (CPlayerPed*)ped1;
+		cop = (CCopPed*)ped2;
+		return;
+	}
+
+	bool ped1IsDriver = ped1 == pDriver;
+
+	// Just what the hell is this weird code?
+	CPed *peds[9];
+	CPed *peds2[9];
+	int numPeds = 0;
+	int numPeds2 = 0;
+	for(i = 0; i < m_nNumMaxPassengers; i++){
+		CPed *p = pPassengers[i];
+		if(p && p != ped1 && !p->bStayInCarOnJack){
+			peds[numPeds++] = p;
+			// uhh what?
+			if(i < 1 && !ped1IsDriver)
+				continue;
+			peds2[numPeds2++] = p;
+		}
+	}
+
+	// So we're copying this array for no reason...
+	CPed *peds3[9];
+	int numPeds3 = 0;
+	for(i = 0; i < numPeds; i++){
+		if(peds[i]->IsPlayer() && ped2->m_nPedType == PEDTYPE_COP &&
+		   ((CPlayerPed*)peds[i])->m_pWanted->m_nWantedLevel > 0 &&
+		   ped2->m_pedInObjective == peds[i]){
+			player = (CPlayerPed*)peds[i];
+			cop = (CCopPed*)ped2;
+			return;
+		}
+		peds3[numPeds3++] = peds[i];
+	}
+
+	int time = 1800;
+	for(i = 0; i < numPeds3; i++){
+		peds3[i]->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + time;
+		peds3[i]->SetObjective(OBJECTIVE_LEAVE_VEHICLE, this);
+		time += CGeneral::GetRandomNumberInRange(300.0f, 600.0f);
+	}
+
+	if(IsCar() && numPeds2 > 0 && CGeneral::GetRandomTrueFalse())
+		for(i = 0; i < numPeds2; i++)
+			if(peds2[i]->IsFemale() || CGeneral::GetRandomTrueFalse()){
+				peds2[i]->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 10000;
+				peds2[i]->b156_8 = true;
+				peds2[i]->bFleeAfterExitingCar = true;
+			}
+}
+
+void
 CVehicle::ProcessDelayedExplosion(void)
 {
 	if(m_nBombTimer == 0)
@@ -854,8 +1535,6 @@ CVehicle::ProcessDelayedExplosion(void)
 	if (m_nBombTimer != 0)
 		return;
 
-	if(FindPlayerVehicle() != this && m_pBlowUpEntity == FindPlayerPed())
-		CWorld::Players[CWorld::PlayerInFocus].AwardMoneyForExplosion(this);
 	BlowUpCar(m_pBlowUpEntity);
 }
 
@@ -863,12 +1542,13 @@ bool
 CVehicle::IsLawEnforcementVehicle(void)
 {
 	switch(GetModelIndex()){
-	case MI_FBICAR:
 	case MI_POLICE:
 	case MI_ENFORCER:
 	case MI_PREDATOR:
 	case MI_RHINO:
 	case MI_BARRACKS:
+	case MI_FBIRANCH:
+	case MI_VICECHEE:
 		return true;
 	default:
 		return false;
@@ -886,6 +1566,8 @@ CVehicle::UsesSiren(uint32 id)
 	case MI_POLICE:
 	case MI_ENFORCER:
 	case MI_PREDATOR:
+	case MI_FBIRANCH:
+	case MI_VICECHEE:
 		return true;
 	default:
 		return false;
@@ -897,24 +1579,7 @@ CVehicle::IsVehicleNormal(void)
 {
 	if (!pDriver || m_nNumPassengers != 0 || GetStatus() == STATUS_WRECKED)
 		return false;
-	switch (GetModelIndex()){
-	case MI_FIRETRUCK:
-	case MI_AMBULAN:
-	case MI_TAXI:
-	case MI_POLICE:
-	case MI_ENFORCER:
-	case MI_BUS:
-	case MI_RHINO:
-	case MI_BARRACKS:
-	case MI_DODO:
-	case MI_COACH:
-	case MI_CABBIE:
-	case MI_RCBANDIT:
-	case MI_BORGNINE:
-		return false;
-	default:
-		return true;
-	}
+	return GetModelInfo()->m_vehicleClass != -1;
 }
 
 bool
@@ -922,9 +1587,8 @@ CVehicle::CarHasRoof(void)
 {
 	if((pHandling->Flags & HANDLING_HAS_NO_ROOF) == 0)
 		return true;
-	if(m_aExtras[0] && m_aExtras[1])
-		return false;
-	return true;
+	// component 0 is assumed to be a roof
+	return m_aExtras[0] == 0 || m_aExtras[1] == 0;
 }
 
 bool
@@ -991,7 +1655,8 @@ CVehicle::CanPedOpenLocks(CPed *ped)
 {
 	if(m_nDoorLock == CARLOCK_LOCKED ||
 	   m_nDoorLock == CARLOCK_LOCKED_INITIALLY ||
-	   m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE)
+	   m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE ||
+	   m_nDoorLock == CARLOCK_SKIP_SHUT_DOORS)
 		return false;
 	if(ped->IsPlayer() && m_nDoorLock == CARLOCK_LOCKOUT_PLAYER_ONLY)
 		return false;
@@ -999,10 +1664,18 @@ CVehicle::CanPedOpenLocks(CPed *ped)
 }
 
 bool
+CVehicle::CanDoorsBeDamaged(void)
+{
+	return m_nDoorLock == CARLOCK_NOT_USED ||
+		m_nDoorLock == CARLOCK_UNLOCKED ||
+		m_nDoorLock == CARLOCK_SKIP_SHUT_DOORS;
+}
+
+bool
 CVehicle::CanPedEnterCar(void)
 {
 	// can't enter when car is on side
-	if(GetUp().z > 0.1f || GetUp().z < -0.1f){
+	if(IsBike() || GetUp().z > 0.1f ||  GetUp().z < -0.1f){
 		// also when car is moving too fast
 		if(m_vecMoveSpeed.MagnitudeSqr() > sq(0.2f))
 			return false;
@@ -1014,16 +1687,14 @@ CVehicle::CanPedEnterCar(void)
 }
 
 bool
-CVehicle::CanPedExitCar(void)
+CVehicle::CanPedExitCar(bool jumpExit)
 {
 	CVector up = GetUp();
 	if(up.z > 0.1f || up.z < -0.1f){
-#ifdef VC_PED_PORTS
 		if (IsBoat())
 			return true;
-#endif
 		// can't exit when car is moving too fast
-		if(m_vecMoveSpeed.MagnitudeSqr() > 0.005f)
+		if(m_vecMoveSpeed.MagnitudeSqr() > 0.005f && !jumpExit)
 			return false;
 		// if car is slow enough, check turn speed
 		if(Abs(m_vecTurnSpeed.x) > 0.01f ||
@@ -1046,6 +1717,23 @@ CVehicle::CanPedExitCar(void)
 	}
 }
 
+bool
+CVehicle::CanPedJumpOutCar(void)
+{
+	if(GetUp().z < 0.3f)
+		return false;
+	float speed = m_vecMoveSpeed.MagnitudeSqr();
+	return speed < 0.1f || speed > 0.5f ? false : true;
+}
+
+bool
+CVehicle::CanPedJumpOffBike(void)
+{
+	if(pPassengers[0])
+		return false;
+	return m_vecMoveSpeed.MagnitudeSqr() < 0.07f ? false : true;
+}
+
 void
 CVehicle::ChangeLawEnforcerState(uint8 enable)
 {
@@ -1070,7 +1758,7 @@ CVehicle::SetUpDriver(void)
 	if(VehicleCreatedBy != RANDOM_VEHICLE)
 		return nil;
 
-	pDriver = CPopulation::AddPedInCar(this);
+	pDriver = CPopulation::AddPedInCar(this, true);
 	pDriver->m_pMyVehicle = this;
 	pDriver->m_pMyVehicle->RegisterReference((CEntity**)&pDriver->m_pMyVehicle);
 	pDriver->bInVehicle = true;
@@ -1083,15 +1771,31 @@ CVehicle::SetUpDriver(void)
 CPed*
 CVehicle::SetupPassenger(int n)
 {
+	int i;
+
 	if(pPassengers[n])
 		return pPassengers[n];
 
-	pPassengers[n] = CPopulation::AddPedInCar(this);
-	pPassengers[n]->m_pMyVehicle = this;
-	pPassengers[n]->m_pMyVehicle->RegisterReference((CEntity**)&pPassengers[n]->m_pMyVehicle);
-	pPassengers[n]->bInVehicle = true;
-	pPassengers[n]->SetPedState(PED_DRIVING);
-	if(bIsBus)
+	if((IsTaxi() || IsLimo()) && n == 0)
+		pPassengers[0] = nil;
+	else{
+		CPed *passenger = CPopulation::AddPedInCar(this, false);
+		pPassengers[n] = passenger;
+		passenger->m_pMyVehicle = this;
+		passenger->m_pMyVehicle->RegisterReference((CEntity**)&pPassengers[n]->m_pMyVehicle);
+		passenger->bInVehicle = true;
+		passenger->SetPedState(PED_DRIVING);
+
+		if(passenger->m_nPedType == PEDTYPE_CIVMALE || passenger->m_nPedType == PEDTYPE_CIVFEMALE)
+			for(i = 0; i < n; i++)
+				if(pPassengers[i] && pPassengers[n] &&
+				   (pPassengers[i]->m_nPedType == PEDTYPE_CIVMALE || pPassengers[i]->m_nPedType == PEDTYPE_CIVFEMALE) &&
+				   passenger->GetModelIndex() == pPassengers[i]->GetModelIndex()){
+					pPassengers[n] = nil;
+					CPopulation::RemovePed(passenger);
+				}
+	}
+	if(bIsBus && pPassengers[n])
 		pPassengers[n]->bRenderPedInCar = false;
 	++m_nNumPassengers;
 	return pPassengers[n];
@@ -1104,23 +1808,42 @@ CVehicle::SetDriver(CPed *driver)
 	pDriver->RegisterReference((CEntity**)&pDriver);
 
 	if(bFreebies && driver == FindPlayerPed()){
-		if(GetModelIndex() == MI_AMBULAN)
-			FindPlayerPed()->m_fHealth = Min(FindPlayerPed()->m_fHealth + 20.0f, 100.0f);
-		else if(GetModelIndex() == MI_TAXI)
-			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25;
-		else if(GetModelIndex() == MI_POLICE)
-			driver->GiveWeapon(WEAPONTYPE_SHOTGUN, 5);
-		else if(GetModelIndex() == MI_ENFORCER)
-			driver->m_fArmour = Max(driver->m_fArmour, 100.0f);
-		else if(GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE)
-			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25;
 		bFreebies = false;
+		switch(GetModelIndex()){
+		case MI_AMBULAN:
+			FindPlayerPed()->m_fHealth = Max(FindPlayerPed()->m_fHealth, Min(FindPlayerPed()->m_fHealth + 20.0f, CWorld::Players[0].m_nMaxHealth));
+			break;
+
+		case MI_TAXI:
+		case MI_CABBIE:
+		case MI_ZEBRA:
+		case MI_KAUFMAN:
+			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 12;
+			break;
+
+		case MI_POLICE:
+			CStreaming::RequestModel(MI_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
+			bFreebies = true;
+			break;
+
+		case MI_ENFORCER:
+			driver->m_fArmour = Max(driver->m_fArmour, CWorld::Players[0].m_nMaxArmour);
+			break;
+
+		case MI_CADDY:
+			if(!(driver->IsPlayer() && ((CPlayerPed*)driver)->DoesPlayerWantNewWeapon(WEAPONTYPE_GOLFCLUB, true)))
+				CStreaming::RequestModel(MI_GOLFCLUB, STREAMFLAGS_DONT_REMOVE);
+			break;
+		}
 	}
 
-	ApplyTurnForce(0.0f, 0.0f, -0.2f*driver->m_fMass,
-		driver->GetPosition().x - GetPosition().x,
-		driver->GetPosition().y - GetPosition().y,
-		0.0f);
+	if(IsBike())
+		ApplyMoveForce(-0.2f*driver->m_fMass * GetUp());
+	else
+		ApplyTurnForce(0.0f, 0.0f, -0.2f*driver->m_fMass,
+			driver->GetPosition().x - GetPosition().x,
+			driver->GetPosition().y - GetPosition().y,
+			0.0f);
 }
 
 bool
@@ -1128,10 +1851,13 @@ CVehicle::AddPassenger(CPed *passenger)
 {
 	int i;
 
-	ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
-		passenger->GetPosition().x - GetPosition().x,
-		passenger->GetPosition().y - GetPosition().y,
-		0.0f);
+	if(IsBike())
+		ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward());
+	else
+		ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
+			passenger->GetPosition().x - GetPosition().x,
+			passenger->GetPosition().y - GetPosition().y,
+			0.0f);
 
 	for(i = 0; i < m_nNumMaxPassengers; i++)
 		if(pPassengers[i] == nil){
@@ -1148,10 +1874,13 @@ CVehicle::AddPassenger(CPed *passenger, uint8 n)
 	if(bIsBus)
 		return AddPassenger(passenger);
 
-	ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
-		passenger->GetPosition().x - GetPosition().x,
-		passenger->GetPosition().y - GetPosition().y,
-		0.0f);
+	if(IsBike())
+		ApplyTurnForce(-0.2f*passenger->m_fMass * GetUp(), -0.1f*GetForward());
+	else
+		ApplyTurnForce(0.0f, 0.0f, -0.2f*passenger->m_fMass,
+			passenger->GetPosition().x - GetPosition().x,
+			passenger->GetPosition().y - GetPosition().y,
+			0.0f);
 
 	if(n < m_nNumMaxPassengers && pPassengers[n] == nil){
 		pPassengers[n] = passenger;
@@ -1165,6 +1894,22 @@ void
 CVehicle::RemoveDriver(void)
 {
 	SetStatus(STATUS_ABANDONED);
+	if(pDriver == FindPlayerPed()){
+		if(GetModelIndex() == MI_POLICE && CStreaming::HasModelLoaded(MI_SHOTGUN)){
+			if(bFreebies){
+				if(((CPlayerPed*)pDriver)->DoesPlayerWantNewWeapon(WEAPONTYPE_SHOTGUN, true))
+					pDriver->GiveWeapon(WEAPONTYPE_SHOTGUN, 5, true);
+				else
+					pDriver->GrantAmmo(WEAPONTYPE_SHOTGUN, 5);
+				bFreebies = false;
+			}
+			CStreaming::SetModelIsDeletable(MI_SHOTGUN);
+		}else if(GetModelIndex() == MI_CADDY && CStreaming::HasModelLoaded(MI_GOLFCLUB)){
+			if(((CPlayerPed*)pDriver)->DoesPlayerWantNewWeapon(WEAPONTYPE_GOLFCLUB, true))
+				pDriver->GiveWeapon(WEAPONTYPE_GOLFCLUB, 1, true);
+			CStreaming::SetModelIsDeletable(MI_GOLFCLUB);
+		}
+	}
 	pDriver = nil;
 }
 
@@ -1190,6 +1935,57 @@ CVehicle::RemovePassenger(CPed *p)
 	}
 }
 
+bool
+CVehicle::IsDriver(CPed *ped)
+{
+	if(ped == nil)
+		return false;
+	return ped == pDriver;
+}
+
+bool
+CVehicle::IsDriver(int32 model)
+{
+	return pDriver && pDriver->GetModelIndex() == model;
+}
+
+bool
+CVehicle::IsPassenger(CPed *ped)
+{
+	int i;
+	if(ped == nil)
+		return false;
+	for(i = 0; i < 8; i++)
+		if(pPassengers[i] == ped)
+			return true;
+	return false;
+}
+
+bool
+CVehicle::IsPassenger(int32 model)
+{
+	int i;
+	for(i = 0; i < 8; i++)
+		if(pPassengers[i] && pPassengers[i]->GetModelIndex() == model)
+			return true;
+	return false;
+}
+
+void
+CVehicle::UpdatePassengerList(void)
+{
+	int i;
+	bool hasPassenger = false;
+	if(m_nNumPassengers)
+		for(i = 0; i < 8; i++)
+			if(pPassengers[i]){
+				hasPassenger = true;
+				break;
+			}
+	if(!hasPassenger)
+		m_nNumPassengers = 0;
+}
+
 void
 CVehicle::ProcessCarAlarm(void)
 {
@@ -1199,9 +1995,10 @@ CVehicle::ProcessCarAlarm(void)
 		return;
 
 	step = CTimer::GetTimeStepInMilliseconds();
-	if((uint16)m_nAlarmState < step)
+	if((uint16)m_nAlarmState < step){
 		m_nAlarmState = 0;
-	else
+		m_nCarHornTimer = 0;
+	}else
 		m_nAlarmState -= step;
 }
 
@@ -1229,6 +2026,287 @@ CVehicle::IsSphereTouchingVehicle(float sx, float sy, float sz, float radius)
 	return true;
 }
 
+RpMaterial*
+SetCompAlphaCB(RpMaterial *material, void *data)
+{
+	uint32 alpha = (uint32)(uintptr)data;
+	RwRGBA *col = (RwRGBA*)RpMaterialGetColor(material);	// get rid of const
+	col->alpha = alpha;
+	return material;
+}
+
+void
+CVehicle::SetComponentAtomicAlpha(RpAtomic *atomic, int32 alpha)
+{
+	RpGeometry *geo = RpAtomicGetGeometry(atomic);
+	RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) | rpGEOMETRYMODULATEMATERIALCOLOR);
+	RpGeometryForAllMaterials(geo, SetCompAlphaCB, (void*)alpha);
+}
+
+void
+CVehicle::UpdateClumpAlpha(void)
+{
+	int clumpAlpha = CVisibilityPlugins::GetClumpAlpha((RpClump*)m_rwObject);
+	if(bFadeOut){
+		clumpAlpha -= 8;
+		if(clumpAlpha < 0)
+			clumpAlpha = 0;
+	}else if(clumpAlpha < 255){
+		clumpAlpha += 16;
+		if(clumpAlpha > 255)
+			clumpAlpha = 255;
+	}
+	CVisibilityPlugins::SetClumpAlpha((RpClump*)m_rwObject, clumpAlpha);
+}
+
+void
+CVehicle::HeliDustGenerate(CEntity *heli, float radius, float ground, int rnd)
+{
+	int i;
+	float angle;
+	CColPoint point;
+	CEntity *entity;
+	uint8 r, g, b;
+
+	if(heli == nil)
+		return;
+
+	uint8 surface = SURFACE_TARMAC;
+	int frm = CTimer::GetFrameCounter() & 7;
+	float testLowZ = ground - 10.0f;
+	float dustSize = 0.0f;
+	float baseSize = 1.0f;
+	float offset = 1.0f;	// when heli is tilted
+	float particleZ = -101.0f;
+	int n = 0;
+
+	if(heli->GetModelIndex() == MI_RCGOBLIN || heli->GetModelIndex() == MI_RCRAIDER){
+		radius = 3.0f;
+		dustSize = 0.04f;
+		baseSize = 0.07f;
+		offset = 0.3f;
+	}
+
+	CVector heliPos = heli->GetPosition();
+
+	if(heli->IsVehicle() && ((CVehicle*)heli)->IsCar()){
+		heliPos.x -= (heliPos.z - ground)*heli->GetUp().x*offset*0.5f;
+		heliPos.y -= (heliPos.z - ground)*heli->GetUp().y*offset*0.5f;
+	}
+
+	float steamSize = 0.25f * radius * baseSize;
+	float splashSize = 0.3f * radius * baseSize;
+
+	i = 0;
+	for(i = 0; i < 32+rnd; i++){
+		angle = i * TWOPI/32.0f;
+		CVector pos(radius*Cos(angle), radius*Sin(angle), 0.0f);
+		CVector dir = CVector(pos.x, pos.y, 1.0f)*0.01f;
+		pos += heliPos;
+
+		if(i < 32 && i == 4*frm){
+			if(CWorld::ProcessVerticalLine(pos, testLowZ, point, entity, true, false, false, false, true, false, nil)){
+				n = rnd;
+				particleZ = point.point.z;
+				surface = point.surfaceB;
+			}else
+				n = 0;
+
+			float waterLevel = 0.0f;
+			if(CWaterLevel::GetWaterLevel(pos, &waterLevel, false) && waterLevel > particleZ){
+				surface = SURFACE_WATER;
+				n = rnd;
+				particleZ = waterLevel;
+			}
+		}
+
+		if(n){
+			pos.z = particleZ;
+			if(surface == SURFACE_WATER){
+				float red = (0.3*CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed_Obj())*255.0f/4.0f;
+				float green = (0.3*CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen_Obj())*255.0f/4.0f;
+				float blue = (0.3*CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue_Obj())*255.0f/4.0f;
+				r = clamp(red, 0.0f, 255.0f);
+				g = clamp(green, 0.0f, 255.0f);
+				b = clamp(blue, 0.0f, 255.0f);
+				RwRGBA col1 = { r, g, b, CGeneral::GetRandomNumberInRange(8, 32) };
+				RwRGBA col2 = { 255, 255, 255, 32 };
+
+				if(n&1)
+					CParticle::AddParticle(PARTICLE_STEAM_NY_SLOWMOTION, pos, dir, nil, steamSize, col2);
+				else
+					CParticle::AddParticle(PARTICLE_CAR_SPLASH, pos, dir, nil, splashSize, col1,
+						CGeneral::GetRandomNumberInRange(0.0f, 10.0f),
+						CGeneral::GetRandomNumberInRange(0.0f, 90.0f), 1);
+			}else{
+				switch(surface){
+				default:
+				case SURFACE_TARMAC:
+					r = 10;
+					g = 10;
+					b = 10;
+					break;
+				case SURFACE_GRASS:
+					r = 10;
+					g = 10;
+					b = 3;
+					break;
+				case SURFACE_GRAVEL:
+					r = 10;
+					g = 8;
+					b = 7;
+					break;
+				case SURFACE_MUD_DRY:
+					r = 10;
+					g = 6;
+					b = 3;
+					break;
+				case SURFACE_SAND:
+				case SURFACE_SAND_BEACH:
+					r = 10;
+					g = 10;
+					b = 7;
+					break;
+				}
+				RwRGBA col = { r, g, b, 32 };
+				if(heliPos.z - pos.z < 20.0f)
+					CParticle::AddParticle(PARTICLE_HELI_DUST, pos, dir, nil, dustSize, col);
+			}
+
+			n--;
+		}
+	}
+}
+
+#define GLARE_MIN_DIST (13.0f)
+#define GLARE_FULL_DIST (30.0f)
+#define GLARE_MIN_ANGLE (0.99f)
+#define GLARE_FULL_ANGLE (0.995f)
+
+void
+CVehicle::DoSunGlare(void)
+{
+	if(bRenderScorched || GetPosition().z < 0.0f ||
+	   GetVehicleAppearance() != VEHICLE_APPEARANCE_CAR || CWeather::SunGlare <= 0.0f)
+		return;
+
+	CVector camDir = TheCamera.GetPosition() - GetPosition();
+	float dist = camDir.Magnitude();
+	camDir *= 2.0f/dist;
+	CVector glareVec = camDir + CTimeCycle::GetSunDirection();
+	CVector localGlareVec;
+	localGlareVec.x = DotProduct(glareVec, GetRight());
+	localGlareVec.y = DotProduct(glareVec, GetForward());
+	localGlareVec.z = 0.0;
+	localGlareVec.Normalise();
+
+	CVector2D fwd2D = GetForward();
+	fwd2D.Normalise();
+	CVector2D camDir2D = camDir;
+	camDir2D.Normalise();
+	float fwdness = Abs(DotProduct2D(fwd2D, camDir2D));
+
+	// check angle
+	float strength;
+	if(fwdness > GLARE_FULL_ANGLE)
+		strength = 1.0f;
+	else if(fwdness > GLARE_MIN_ANGLE)
+		strength = (fwdness - GLARE_MIN_ANGLE)/(GLARE_FULL_ANGLE-GLARE_MIN_ANGLE);
+	else
+		return;
+	// check distance
+	if(dist > GLARE_FULL_DIST){
+		// no max distance
+	}else if(dist > GLARE_MIN_DIST)
+		strength *= (dist - GLARE_MIN_DIST)/(GLARE_FULL_DIST - GLARE_MIN_DIST);
+	else
+		return;
+
+	float intens = 0.8f * strength * CWeather::SunGlare;
+	int r = intens * (CTimeCycle::GetSunCoreRed() + 2*255)/3.0f;
+	int g = intens * (CTimeCycle::GetSunCoreGreen() + 2*255)/3.0f;
+	int b = intens * (CTimeCycle::GetSunCoreBlue() + 2*255)/3.0f;
+
+	CColModel *colmodel = GetColModel();
+	CCollision::CalculateTrianglePlanes(colmodel);
+
+	int i;
+	for(i = 0; i < colmodel->numTriangles-2; i += 2){
+		int a1 = colmodel->triangles[i].a;
+		int b1 = colmodel->triangles[i].b;
+		int c1 = colmodel->triangles[i].c;
+		int a2 = colmodel->triangles[i+1].a;
+		int b2 = colmodel->triangles[i+1].b;
+		int c2 = colmodel->triangles[i+1].c;
+		CVector vert1 = colmodel->vertices[a1];
+		CVector vert4;
+		// Need an upward surface
+		if(vert1.z <= 0.0f)
+			continue;
+
+		// trying to find a quad here
+		int numTri2Verts = 0;
+		if(a2 != a1 && a2 != b1 && a2 != c1){
+			// a2 is not in tri1
+			numTri2Verts++;
+			vert4 = colmodel->vertices[a2];
+		}
+		if(b2 != a1 && b2 != b1 && b2 != c1){
+			// b2 is not in tri1
+			numTri2Verts++;
+			vert4 = colmodel->vertices[b2];
+		}
+		if(c2 != a1 && c2 != b1 && c2 != c1){
+			// c2 is not in tri1
+			numTri2Verts++;
+			vert4 = colmodel->vertices[c2];
+		}
+		// Need exactly one vertex from tri2 for a quad with tri1
+		if(numTri2Verts != 1)
+			continue;
+
+		CVector mid = (vert1 + colmodel->vertices[b1] + colmodel->vertices[c1] + vert4)/4.0f;
+		float dy = mid.y - vert1.y;
+		float dx = mid.x - vert1.x;
+		float dist = 1.4f * Min(Abs(dx), Abs(dy));
+		if(dist > 0.6f){
+			CVector pos = GetMatrix() * (dist * localGlareVec + mid) + camDir;
+			CCoronas::RegisterCorona((uintptr)this + 27 + i,
+				r, g, b, 255,
+				pos, 0.9f*CWeather::SunGlare, 90.0f,
+				CCoronas::TYPE_STAR, CCoronas::FLARE_NONE,
+				CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF,
+				CCoronas::STREAK_OFF, 0.0f);
+		}
+	}
+}
+
+void
+CVehicle::KillPedsInVehicle(void)
+{
+	int i;
+	if(pDriver){
+		CDarkel::RegisterKillByPlayer(pDriver, WEAPONTYPE_EXPLOSION);
+		if(pDriver->GetPedState() == PED_DRIVING){
+			pDriver->SetDead();
+			if(!pDriver->IsPlayer())
+				pDriver->FlagToDestroyWhenNextProcessed();
+		}else
+			pDriver->SetDie();
+	}
+	for(i = 0; i < m_nNumMaxPassengers; i++){
+		if(pPassengers[i]){
+			CDarkel::RegisterKillByPlayer(pPassengers[i], WEAPONTYPE_EXPLOSION);
+			if(pPassengers[i]->GetPedState() == PED_DRIVING){
+				pPassengers[i]->SetDead();
+				if(!pPassengers[i]->IsPlayer())
+					pPassengers[i]->FlagToDestroyWhenNextProcessed();
+			}else
+				pPassengers[i]->SetDie();
+		}
+	}
+}
+
 void
 DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle)
 {
@@ -1370,3 +2448,35 @@ CVehicle::Load(uint8*& buf)
 	SkipSaveBuf(buf, 99);
 }
 #endif
+
+eVehicleAppearance
+CVehicle::GetVehicleAppearance(void)
+{
+	uint32 flags = pHandling->Flags & 0xF0000;
+	if (flags == 0)
+		return VEHICLE_APPEARANCE_CAR;
+	if (flags == HANDLING_IS_BIKE)
+		return VEHICLE_APPEARANCE_BIKE;
+	if (flags == HANDLING_IS_HELI)
+		return VEHICLE_APPEARANCE_HELI;
+	if (flags == HANDLING_IS_PLANE)
+		return VEHICLE_APPEARANCE_PLANE;
+	if (flags == HANDLING_IS_BOAT)
+		return VEHICLE_APPEARANCE_BOAT;
+	return VEHICLE_APPEARANCE_NONE;
+}
+
+bool
+IsVehiclePointerValid(CVehicle* pVehicle)
+{
+	if (!pVehicle)
+		return false;
+	int index = CPools::GetVehiclePool()->GetJustIndex(pVehicle);
+#ifdef FIX_BUGS
+	if (index < 0 || index >= NUMVEHICLES)
+#else
+	if (index < 0 || index > NUMVEHICLES)
+#endif
+		return false;
+	return pVehicle->m_vehType == VEHICLE_TYPE_PLANE || pVehicle->m_entryInfoList.first;
+}
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 48546e68..bc14bc77 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -5,8 +5,11 @@
 #include "ModelIndices.h"
 #include "AnimManager.h"
 #include "Weapon.h"
+#include "HandlingMgr.h"
 
 class CPed;
+class CPlayerPed;
+class CCopPed;
 class CFire;
 struct tHandlingData;
 
@@ -28,6 +31,16 @@ enum eCarLock {
 	CARLOCK_SKIP_SHUT_DOORS
 };
 
+enum eBombType
+{
+	CARBOMB_NONE,
+	CARBOMB_TIMED,
+	CARBOMB_ONIGNITION,
+	CARBOMB_REMOTE,
+	CARBOMB_TIMEDACTIVE,
+	CARBOMB_ONIGNITIONACTIVE,
+};
+
 enum eDoors
 {
 	DOOR_BONNET = 0,
@@ -97,23 +110,54 @@ enum tWheelState
 enum eFlightModel
 {
 	FLIGHT_MODEL_DODO,
-	// not used in III
 	FLIGHT_MODEL_RCPLANE,
-	FLIGHT_MODEL_HELI,
-	FLIGHT_MODEL_SEAPLANE
+	FLIGHT_MODEL_RCHELI,
+	FLIGHT_MODEL_SEAPLANE,
+	FLIGHT_MODEL_PLANE_UNUSED,
+	FLIGHT_MODEL_PLANE,
+	FLIGHT_MODEL_HELI
+};
+
+enum eVehicleAppearance
+{
+	VEHICLE_APPEARANCE_NONE,
+	VEHICLE_APPEARANCE_CAR,
+	VEHICLE_APPEARANCE_BIKE,
+	VEHICLE_APPEARANCE_HELI,
+	VEHICLE_APPEARANCE_BOAT,
+	VEHICLE_APPEARANCE_PLANE,
+};
+
+// TODO: what is this even?
+enum eBikeWheelSpecial
+{
+	BIKE_WHEELSPEC_0,	// both wheels on ground
+	BIKE_WHEELSPEC_1,	// rear wheel on ground
+	BIKE_WHEELSPEC_2,	// only front wheel on ground
+	BIKE_WHEELSPEC_3,	// can't happen
+};
+
+enum
+{
+	ROTOR_TOP = 3,
+	ROTOR_FRONT = 4,
+	ROTOR_RIGHT = 5,
+	ROTOR_LEFT = 7,
+	ROTOR_BACK = 8,
+	ROTOR_BOTTOM = 9,
 };
 
 class CVehicle : public CPhysical
 {
 public:
-	// 0x128
 	tHandlingData *pHandling;
+	tFlyingHandlingData *pFlyingHandling;
 	CAutoPilot AutoPilot;
 	uint8 m_currentColour1;
 	uint8 m_currentColour2;
 	uint8 m_aExtras[2];
 	int16 m_nAlarmState;
-	int16 m_nMissionValue;
+	int16 m_nRouteSeed;
 	CPed *pDriver;
 	CPed *pPassengers[8];
 	uint8 m_nNumPassengers;
@@ -162,15 +206,29 @@ public:
 	uint8 bVehicleColProcessed : 1;// Has ProcessEntityCollision been processed for this car?
 	uint8 bIsCarParkVehicle : 1; // Car has been created using the special CAR_PARK script command
 	uint8 bHasAlreadyBeenRecorded : 1; // Used for replays
+	uint8 bPartOfConvoy : 1;
+	uint8 bHeliMinimumTilt : 1; // This heli should have almost no tilt really
+	uint8 bAudioChangingGear : 1; // sounds like vehicle is changing gear
+
+	uint8 bIsDrowning : 1; // is vehicle occupants taking damage in water (i.e. vehicle is dead in water)
+	uint8 bTyresDontBurst : 1; // If this is set the tyres are invincible
+	uint8 bCreatedAsPoliceVehicle : 1;// True if this guy was created as a police vehicle (enforcer, policecar, miamivice car etc)
+	uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed
+	uint8 bParking : 1;
+	uint8 bCanPark : 1;
+
+	uint8 m_bombType : 3;
+	uint8 bDriverLastFrame : 1;
 
 	int8 m_numPedsUseItAsCover;
 	uint8 m_nAmmoInClip;    // Used to make the guns on boat do a reload (20 by default)
 	int8 m_nPacManPickupsCarried;
 	uint8 m_nRoadblockType;
-	int16 m_nRoadblockNode;
 	float m_fHealth;           // 1000.0f = full health. 250.0f = fire. 0 -> explode
 	uint8 m_nCurrentGear;
 	float m_fChangeGearTime;
+	CEntity* m_pBombRigger;
+	uint32 m_nSetPieceExtendedRangeTime;
 	uint32 m_nGunFiringTime;    // last time when gun on vehicle was fired (used on boats)
 	uint32 m_nTimeOfDeath;
 	uint16 m_nTimeBlocked;
@@ -180,12 +238,14 @@ public:
 	float m_fMapObjectHeightBehind;	// rear Z?
 	eCarLock m_nDoorLock;
 	int8 m_nLastWeaponDamage; // see eWeaponType, -1 if no damage
+	CEntity *m_pLastDamageEntity;
 	int8 m_nRadioStation;
 	uint8 m_bRainAudioCounter;
 	uint8 m_bRainSamplesCounter;
-	uint8 m_nCarHornTimer;
-	uint8 m_nCarHornPattern; // last horn?
+	uint32 m_nCarHornTimer;
+	uint8 m_nCarHornPattern;
 	bool m_bSirenOrAlarm;
+	uint8 m_nCarHornDelay;
 	int8 m_comedyControlState;
 	CStoredCollPoly m_aCollPolys[2];     // poly which is under front/rear part of car
 	float m_fSteerInput;
@@ -215,11 +275,15 @@ public:
 	virtual bool IsDoorFullyOpen(eDoors door) { return false; }
 	virtual bool IsDoorClosed(eDoors door) { return false; }
 	virtual bool IsDoorMissing(eDoors door) { return false; }
+	virtual bool IsDoorReady(uint32 door) { return false; }
+	virtual bool IsDoorMissing(uint32 door) { return false; }
+	virtual bool IsOpenTopCar(void) { return false; }
 	virtual void RemoveRefsToVehicle(CEntity *ent) {}
 	virtual void BlowUpCar(CEntity *ent) {}
 	virtual bool SetUpWheelColModel(CColModel *colModel) { return false; }
-	virtual void BurstTyre(uint8 tyre) {}
-	virtual bool IsRoomForPedToLeaveCar(uint32 component, CVector *forcedDoorPos) { return false;}
+	virtual void BurstTyre(uint8 tyre, bool applyForces) {}
+	virtual bool IsRoomForPedToLeaveCar(uint32 component, CVector *forcedDoorPos) { return false; }
+	virtual bool IsClearToDriveAway(void);
 	virtual float GetHeightAboveRoad(void);
 	virtual void PlayCarHorn(void) {}
 #ifdef COMPATIBLE_SAVES
@@ -227,6 +291,7 @@ public:
 	virtual void Load(uint8*& buf);
 #endif
 
+	eVehicleAppearance GetVehicleAppearance(void);
 	bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; }
 	bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; }
 	bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; }
@@ -235,11 +300,17 @@ public:
 	bool IsBike(void) { return m_vehType == VEHICLE_TYPE_BIKE; }
 
 	void FlyingControl(eFlightModel flightModel);
+	bool DoBladeCollision(CVector pos, CMatrix &matrix, int16 rotorType, float radius, float damageMult);
+	bool BladeColSectorList(CPtrList &list, CColModel &rotorColModel, CMatrix &matrix, int16 rotorType, float damageMult);
+
 	void ProcessWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelContactSpeed, CVector &wheelContactPoint,
 		int32 wheelsOnGround, float thrust, float brake, float adhesion, int8 wheelId, float *wheelSpeed, tWheelState *wheelState, uint16 wheelStatus);
+	void ProcessBikeWheel(CVector &wheelFwd, CVector &wheelRight, CVector &wheelContactSpeed, CVector &wheelContactPoint,
+		int32 wheelsOnGround, float thrust, float brake, float adhesion, float destabTraction, int8 wheelId, float *wheelSpeed, tWheelState *wheelState, eBikeWheelSpecial special, uint16 wheelStatus);
 	void ExtinguishCarFire(void);
 	void ProcessDelayedExplosion(void);
 	float ProcessWheelRotation(tWheelState state, const CVector &fwd, const CVector &speed, float radius);
+	int FindTyreNearestPoint(float x, float y);
 	bool IsLawEnforcementVehicle(void);
 	void ChangeLawEnforcerState(uint8 enable);
 	bool UsesSiren(uint32 id);
@@ -249,8 +320,11 @@ public:
 	bool IsOnItsSide(void);
 	bool CanBeDeleted(void);
 	bool CanPedOpenLocks(CPed *ped);
+	bool CanDoorsBeDamaged(void);
 	bool CanPedEnterCar(void);
-	bool CanPedExitCar(void);
+	bool CanPedExitCar(bool jumpExit);
+	bool CanPedJumpOutCar(void);
+	bool CanPedJumpOffBike(void);
 	// do these two actually return something?
 	CPed *SetUpDriver(void);
 	CPed *SetupPassenger(int n);
@@ -259,20 +333,34 @@ public:
 	bool AddPassenger(CPed *passenger, uint8 n);
 	void RemovePassenger(CPed *passenger);
 	void RemoveDriver(void);
+	bool IsDriver(CPed *ped);
+	bool IsDriver(int32 model);
+	bool IsPassenger(CPed *ped);
+	bool IsPassenger(int32 model);
+	void UpdatePassengerList(void);
 	void ProcessCarAlarm(void);
 	bool IsSphereTouchingVehicle(float sx, float sy, float sz, float radius);
 	bool ShufflePassengersToMakeSpace(void);
-	void InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage);
+	void MakeNonDraggedPedsLeaveVehicle(CPed *ped1, CPed *ped2, CPlayerPed *&player, CCopPed *&cop);
+	void InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage, CVector pos = CVector(0.0f, 0.0f, 0.0f));
 	void DoFixedMachineGuns(void);
+	void FireFixedMachineGuns(void);
+	void ActivateBomb(void);
+	void ActivateBombWhenEntered(void);
+	void KillPedsInVehicle(void);
+
+	void SetComponentAtomicAlpha(RpAtomic *atomic, int32 alpha);
+	void UpdateClumpAlpha(void);
+
+	static void HeliDustGenerate(CEntity *heli, float radius, float ground, int rnd);
+	void DoSunGlare(void);
 
-#ifdef FIX_BUGS
 	bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1 && GetStatus() != STATUS_WRECKED; }
-#else
-	bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; }
-#endif
 	CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); }
-	bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE; }
-	AnimationId GetDriverAnim(void) { return IsCar() && bLowVehicle ? ANIM_CAR_LSIT : (IsBoat() && GetModelIndex() != MI_SPEEDER ? ANIM_DRIVE_BOAT : ANIM_CAR_SIT); }
+	bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_ZEBRA || GetModelIndex() == MI_KAUFMAN; }
+	bool IsLimo(void) { return GetModelIndex() == MI_STRETCH || GetModelIndex() == MI_LOVEFIST; }
+	bool IsRealHeli(void) { return !!(pHandling->Flags & HANDLING_IS_HELI); }
+	bool IsRealPlane(void) { return !!(pHandling->Flags & HANDLING_IS_PLANE); }
 
 	static bool bWheelsOnlyCheat;
 	static bool bAllDodosCheat;
@@ -282,9 +370,12 @@ public:
 #ifdef ALT_DODO_CHEAT
 	static bool bAltDodoCheat;
 #endif
+	static bool bHoverCheat;
+	static bool bAllTaxisHaveNitro;
 	static bool m_bDisableMouseSteering;
+	static bool bDisableRemoteDetonation;
+	static bool bDisableRemoteDetonationOnContact;
 };
 
-VALIDATE_SIZE(CVehicle, 0x288);
-
 void DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle);
+bool IsVehiclePointerValid(CVehicle* pVehicle);
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index d0a68279..f4ad346d 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -86,7 +86,7 @@ CExplosion::GetExplosionPosition(uint8 id)
 }
 
 bool
-CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime)
+CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool unk)
 {
 	CVector pPosn;
 	CVector posGround;
diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h
index bf54328c..c8539cca 100644
--- a/src/weapons/Explosion.h
+++ b/src/weapons/Explosion.h
@@ -40,7 +40,8 @@ public:
 	static void ResetExplosionActiveCounter(uint8 id);
 	static uint8 GetExplosionType(uint8 id);
 	static CVector *GetExplosionPosition(uint8 id);
-	static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime);
+// TODO(MIAMI): that new parameter
+	static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool unk = true);
 	static void Update();
 	static bool TestForExplosionInArea(eExplosionType type, float x1, float x2, float y1, float y2, float z1, float z2);
 	static void RemoveAllExplosionsInArea(CVector pos, float radius);
diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp
index 47bc65ac..35e55b36 100644
--- a/src/weapons/ProjectileInfo.cpp
+++ b/src/weapons/ProjectileInfo.cpp
@@ -45,6 +45,7 @@ CProjectileInfo::GetProjectileInfo(int32 id)
 	return &gaProjectileInfo[id];
 }
 
+// --MIAMI: Mostly done
 bool
 CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos, float speed)
 {
@@ -58,32 +59,36 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 
 	switch (weapon)
 	{
-	case WEAPONTYPE_ROCKETLAUNCHER:
+	case WEAPONTYPE_ROCKET:
 	{
-		float vy = 1.25f;
-		time = CTimer::GetTimeInMilliseconds() + 1400;
-		if (ped->IsPlayer()) {
-			matrix.GetForward() = TheCamera.Cams[TheCamera.ActiveCam].Front;
-			matrix.GetUp() = TheCamera.Cams[TheCamera.ActiveCam].Up;
-			matrix.GetRight() = CrossProduct(TheCamera.Cams[TheCamera.ActiveCam].Up, TheCamera.Cams[TheCamera.ActiveCam].Front);
+		float vy = 0.35f;
+		time = CTimer::GetTimeInMilliseconds() + 2000;
+		if (entity->GetModelIndex() == MI_SPARROW || entity->GetModelIndex() == MI_HUNTER || entity->GetModelIndex() == MI_SENTINEL) {
+			matrix = ped->GetMatrix();
 			matrix.GetPosition() = pos;
-		} else if (ped->m_pSeekTarget != nil) {
+			CVector vecSpeed = ((CPhysical*)entity)->m_vecMoveSpeed;
+			vy += Max(0.0f, DotProduct(vecSpeed, entity->GetForward())) + Max(0.0f, DotProduct(vecSpeed, entity->GetUp()));
+		} else {
+			if (ped->IsPlayer()) {
+				matrix.GetForward() = TheCamera.Cams[TheCamera.ActiveCam].Front;
+				matrix.GetUp() = TheCamera.Cams[TheCamera.ActiveCam].Up;
+				matrix.GetRight() = CrossProduct(TheCamera.Cams[TheCamera.ActiveCam].Up, TheCamera.Cams[TheCamera.ActiveCam].Front);
+				matrix.GetPosition() = pos;
+			} else if (ped->m_pSeekTarget != nil) {
 				float ry = CGeneral::GetRadianAngleBetweenPoints(1.0f, ped->m_pSeekTarget->GetPosition().z, 1.0f, pos.z);
 				float rz = Atan2(-ped->GetForward().x, ped->GetForward().y);
 				vy = 0.35f * speed + 0.15f;
 				matrix.SetTranslate(0.0f, 1.0f, 1.0f);
 				matrix.Rotate(0.0f, ry, rz);
 				matrix.GetPosition() += pos;
-		} else {
-			matrix = ped->GetMatrix();
+			} else {
+				matrix = ped->GetMatrix();
+			}
 		}
 		velocity = Multiply3x3(matrix, CVector(0.0f, vy, 0.0f));
 		gravity = false;
 		break;
 	}
-	case WEAPONTYPE_FLAMETHROWER:
-		Error("Undefined projectile type, AddProjectile, ProjectileInfo.cpp");
-		break;
 	case WEAPONTYPE_MOLOTOV:
 	{
 		time = CTimer::GetTimeInMilliseconds() + 2000;
@@ -100,6 +105,7 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 		break;
 	}
 	case WEAPONTYPE_GRENADE:
+	case WEAPONTYPE_DETONATOR_GRENADE:
 	{
 		time = CTimer::GetTimeInMilliseconds() + 2000;
 		float scale = 0.0f;
@@ -116,7 +122,9 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 		elasticity = 0.5f;
 		break;
 	}
-	default: break;
+	default:
+		Error("Undefined projectile type, AddProjectile, ProjectileInfo.cpp");
+		break;
 	}
 
 	int i = 0;
@@ -127,7 +135,7 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 
 	switch (weapon)
 	{
-	case WEAPONTYPE_ROCKETLAUNCHER:
+	case WEAPONTYPE_ROCKET:
 		ms_apProjectile[i] = new CProjectile(MI_MISSILE);
 		break;
 	case WEAPONTYPE_FLAMETHROWER:
@@ -136,6 +144,7 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 		ms_apProjectile[i] = new CProjectile(MI_MOLOTOV);
 		break;
 	case WEAPONTYPE_GRENADE:
+	case WEAPONTYPE_DETONATOR_GRENADE:
 		ms_apProjectile[i] = new CProjectile(MI_GRENADE);
 		break;
 	default: break;
@@ -158,6 +167,10 @@ CProjectileInfo::AddProjectile(CEntity *entity, eWeaponType weapon, CVector pos,
 	CWorld::Add(ms_apProjectile[i]);
 
 	gaProjectileInfo[i].m_vecPos = ms_apProjectile[i]->GetPosition();
+
+	if (entity && entity->IsPed() && !ped->m_pCollidingEntity) {
+		ped->m_pCollidingEntity = ms_apProjectile[i];
+	}
 	return true;
 }
 
@@ -182,7 +195,7 @@ CProjectileInfo::RemoveNotAdd(CEntity *entity, eWeaponType weaponType, CVector p
 	case WEAPONTYPE_MOLOTOV:
 		CExplosion::AddExplosion(nil, entity, EXPLOSION_MOLOTOV, pos, 0);
 		break;
-	case WEAPONTYPE_ROCKETLAUNCHER:
+	case WEAPONTYPE_ROCKET:
 		CExplosion::AddExplosion(nil, entity, EXPLOSION_ROCKET, pos, 0);
 		break;
 	default: break;
@@ -204,17 +217,17 @@ CProjectileInfo::Update()
 			continue;
 		}
 
-		if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER) {
+		if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKET) {
 			CParticle::AddParticle(PARTICLE_SMOKE, ms_apProjectile[i]->GetPosition(), CVector(0.0f, 0.0f, 0.0f));
 		}
 
 		if (CTimer::GetTimeInMilliseconds() <= gaProjectileInfo[i].m_nExplosionTime) {
-			if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER) {
+			if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKET) {
 				CVector pos = ms_apProjectile[i]->GetPosition();
 				CWorld::pIgnoreEntity = ms_apProjectile[i];
 				if (ms_apProjectile[i]->bHasCollided
 					|| !CWorld::GetIsLineOfSightClear(gaProjectileInfo[i].m_vecPos, pos, true, true, true, true, false, false)
-					|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
+					|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKET && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
 					RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
 				}
 				CWorld::pIgnoreEntity = nil;
@@ -227,14 +240,25 @@ CProjectileInfo::Update()
 				{
 					if (ms_apProjectile[i]->bHasCollided
 						|| !CWorld::GetIsLineOfSightClear(gaProjectileInfo[i].m_vecPos, pos, true, true, true, true, false, false)
-						|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
+						|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKET && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
 						RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
 					}
 				}
 				CWorld::pIgnoreEntity = nil;
 			}
 		} else {
-			RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
+			if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_DETONATOR_GRENADE) {
+				CEntity *ent = gaProjectileInfo[i].m_pSource;
+				if (ent->IsPed() && ((CPed*)ped)->IsPlayer()) {
+					CPed *ped = (CPed*)ent;
+					if (ped->GetWeapon(ped->GetWeaponSlot(WEAPONTYPE_DETONATOR)).m_eWeaponType != WEAPONTYPE_DETONATOR
+						|| ped->GetWeapon(ped->GetWeaponSlot(WEAPONTYPE_DETONATOR)).m_nAmmoTotal == 0) {
+						gaProjectileInfo[i].m_nExplosionTime = 0;
+					}
+				}
+			} else {
+				RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
+			}
 		}
 
 		gaProjectileInfo[i].m_vecPos = ms_apProjectile[i]->GetPosition();
@@ -247,7 +271,7 @@ CProjectileInfo::IsProjectileInRange(float x1, float x2, float y1, float y2, flo
 	bool result = false;
 	for (int i = 0; i < ARRAY_SIZE(ms_apProjectile); i++) {
 		if (gaProjectileInfo[i].m_bInUse) {
-			if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER || gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_MOLOTOV || gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_GRENADE) {
+			if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKET || gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_MOLOTOV || gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_GRENADE) {
 				const CVector &pos = ms_apProjectile[i]->GetPosition();
 				if (pos.x >= x1 && pos.x <= x2 && pos.y >= y1 && pos.y <= y2 && pos.z >= z1 && pos.z <= z2) {
 					result = true;
@@ -263,6 +287,20 @@ CProjectileInfo::IsProjectileInRange(float x1, float x2, float y1, float y2, flo
 	return result;
 }
 
+// --MIAMI: Done
+void
+CProjectileInfo::RemoveDetonatorProjectiles()
+{
+	for (int i = 0; i < ARRAY_SIZE(ms_apProjectile); i++) {
+		if (gaProjectileInfo[i].m_bInUse && gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_DETONATOR_GRENADE) {
+			CExplosion::AddExplosion(nil, gaProjectileInfo[i].m_pSource, EXPLOSION_GRENADE, gaProjectileInfo[i].m_vecPos, 0); // TODO(Miami): New parameter (1)
+			gaProjectileInfo[i].m_bInUse = false;
+			CWorld::Remove(ms_apProjectile[i]);
+			delete ms_apProjectile[i];
+		}
+	}
+}
+
 void
 CProjectileInfo::RemoveAllProjectiles()
 {
diff --git a/src/weapons/ProjectileInfo.h b/src/weapons/ProjectileInfo.h
index 3d8074c9..d1688948 100644
--- a/src/weapons/ProjectileInfo.h
+++ b/src/weapons/ProjectileInfo.h
@@ -26,6 +26,7 @@ public:
 	static void RemoveNotAdd(CEntity *entity, eWeaponType weaponType, CVector pos);
 	static bool RemoveIfThisIsAProjectile(CObject *pObject);
 	static void RemoveAllProjectiles();
+	static void RemoveDetonatorProjectiles();
 	static void Update();
 	static bool IsProjectileInRange(float x1, float x2, float y1, float y2, float z1, float z2, bool remove);
 };
diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp
index f09ae052..6fc6341d 100644
--- a/src/weapons/ShotInfo.cpp
+++ b/src/weapons/ShotInfo.cpp
@@ -128,4 +128,4 @@ CShotInfo::Update()
 		if (!((CTimer::GetFrameCounter() + slot) & 3))
 			CWorld::SetCarsOnFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 4.0f, shot.m_sourceEntity);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index 378e621a..8aa3db39 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -30,23 +30,52 @@
 #include "WaterLevel.h"
 #include "WeaponInfo.h"
 #include "World.h"
+#include "SurfaceTable.h"
+#include "Bike.h"
 
-uint16 gReloadSampleTime[WEAPONTYPE_LAST_WEAPONTYPE] =
+// TODO(Miami)
+#define AUDIO_NOT_READY
+
+// TODO(Miami): Those are mostly placeholders!!!
+uint16 gReloadSampleTime[] =
 {
 	0,			// UNARMED
-	0,			// BASEBALLBAT
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,			// GRENADE
+	0,			// DETONATEGRENADE
+	0,			// TEARGAS
+	0,			// MOLOTOV
+	0,			// ROCKET
 	250,		// COLT45
-	400,		// UZI
+	250,		// PYTHON
 	650,		// SHOTGUN
-	300,		// AK47
+	650,		// SPAS12 SHOTGUN
+	650,		// STUBBY SHOTGUN
+	400,		// TEC9
+	400,		// UZIhec
+	400,		// SILENCED_INGRAM
+	400,		// MP5
 	300,		// M16
+	300,		// AK47
 	423,		// SNIPERRIFLE
+	423,		// LASERSCOPE
 	400,		// ROCKETLAUNCHER
 	0,			// FLAMETHROWER
-	0,			// MOLOTOV
-	0,			// GRENADE
+	0,			// M60
+	0,			// MINIGUN
 	0,			// DETONATOR
-	0			// HELICANNON
+	0,			// HELICANNON
+	0			// CAMERA
 };
 
 CWeaponInfo *
@@ -86,18 +115,54 @@ CWeapon::UpdateWeapons(void)
 	CBulletInfo::Update();
 }
 
+//--MIAMI: done
+CWeapon::CWeapon(eWeaponType type, int32 ammo)
+{
+	m_eWeaponType = type;
+	m_eWeaponState = WEAPONSTATE_READY;
+	m_nAmmoTotal = Min(ammo, 99999);
+	m_nAmmoInClip = 0;
+	Reload();
+	m_nTimer = 0;
+	m_bAddRotOffset = false;
+}
+
+// --MIAMI: Done
 void
 CWeapon::Initialise(eWeaponType type, int32 ammo)
 {
 	m_eWeaponType = type;
 	m_eWeaponState = WEAPONSTATE_READY;
-	if (ammo > 99999)
-		m_nAmmoTotal = 99999;
-	else
-		m_nAmmoTotal = ammo;
+	m_nAmmoTotal = Min(ammo, 99999);
 	m_nAmmoInClip = 0;
 	Reload();
 	m_nTimer = 0;
+	int modelId = CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_nModelId;
+	if (modelId != -1)
+		CModelInfo::GetModelInfo(modelId)->AddRef();
+
+	int model2Id = CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_nModel2Id;
+	if (model2Id != -1)
+		CModelInfo::GetModelInfo(model2Id)->AddRef();
+}
+
+// --MIAMI: Done
+void
+CWeapon::Shutdown()
+{
+	int modelId = CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_nModelId;
+	if (modelId != -1)
+		CModelInfo::GetModelInfo(modelId)->RemoveRef();
+
+	int model2Id = CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_nModel2Id;
+	if (model2Id != -1)
+		CModelInfo::GetModelInfo(model2Id)->RemoveRef();
+
+	m_eWeaponType = WEAPONTYPE_UNARMED;
+	m_eWeaponState = WEAPONSTATE_READY;
+	m_nAmmoInClip = 0;
+	m_nAmmoTotal = 0;
+	m_nTimer = 0;
 }
 
 bool
@@ -125,6 +190,7 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 		return false;
 
 	bool fired;
+	bool addFireRateAsDelay = true;
 
 	if ( GetInfo()->m_eWeaponFire != WEAPON_FIRE_MELEE )
 	{
@@ -134,38 +200,46 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 		switch ( m_eWeaponType )
 		{
 			case WEAPONTYPE_SHOTGUN:
+			case WEAPONTYPE_SPAS12_SHOTGUN:
+			case WEAPONTYPE_STUBBY_SHOTGUN:
 			{
+				addFireRateAsDelay = true;
 				fired = FireShotgun(shooter, source);
 
 				break;
 			}
 
 			case WEAPONTYPE_COLT45:
+			case WEAPONTYPE_PYTHON:
 			case WEAPONTYPE_UZI:
-			case WEAPONTYPE_AK47:
+			case WEAPONTYPE_TEC9:
+			case WEAPONTYPE_SILENCED_INGRAM:
+			case WEAPONTYPE_MP5:
+			case WEAPONTYPE_M4:
+			case WEAPONTYPE_RUGER:
+			case WEAPONTYPE_M60:
+			case WEAPONTYPE_MINIGUN:
+			case WEAPONTYPE_HELICANNON:
 			{
-				fired = FireInstantHit(shooter, source);
-
+				if ((TheCamera.PlayerWeaponMode.Mode == CCam::MODE_HELICANNON_1STPERSON || TheCamera.PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON)
+					&& shooter == FindPlayerPed()) {
+					addFireRateAsDelay = false;
+					fired = FireM16_1stPerson(shooter);
+				} else {
+					addFireRateAsDelay = true;
+					fired = FireInstantHit(shooter, source);
+				}
 				break;
 			}
 
 			case WEAPONTYPE_SNIPERRIFLE:
+			case WEAPONTYPE_LASERSCOPE:
 			{
 				fired = FireSniper(shooter);
 
 				break;
 			}
 
-			case WEAPONTYPE_M16:
-			{
-				if ( TheCamera.PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON && shooter == FindPlayerPed() )
-					fired = FireM16_1stPerson(shooter);
-				else
-					fired = FireInstantHit(shooter, source);
-
-				break;
-			}
-
 			case WEAPONTYPE_ROCKETLAUNCHER:
 			{
 				if ( shooter->IsPed() && ((CPed*)shooter)->m_pSeekTarget != nil )
@@ -185,6 +259,8 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 
 			case WEAPONTYPE_MOLOTOV:
 			case WEAPONTYPE_GRENADE:
+			case WEAPONTYPE_DETONATOR_GRENADE:
+			case WEAPONTYPE_TEARGAS:
 			{
 				if ( shooter == FindPlayerPed() )
 				{
@@ -202,6 +278,11 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 				else
 					fired = FireProjectile(shooter, source, 0.3f);
 
+				if (m_eWeaponType == WEAPONTYPE_DETONATOR_GRENADE) {
+					((CPed*)shooter)->GiveWeapon(WEAPONTYPE_DETONATOR, 1, true);
+					((CPed*)shooter)->GetWeapon(((CPed*)shooter)->GetWeaponSlot(WEAPONTYPE_DETONATOR)).m_eWeaponState = WEAPONSTATE_READY;
+					((CPed*)shooter)->SetCurrentWeapon(WEAPONTYPE_DETONATOR);
+				}
 				break;
 			}
 
@@ -222,19 +303,6 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 				break;
 			}
 
-			case WEAPONTYPE_HELICANNON:
-			{
-				if ( (TheCamera.PlayerWeaponMode.Mode == CCam::MODE_HELICANNON_1STPERSON || TheCamera.PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON )
-						&& shooter == FindPlayerPed() )
-				{
-					fired = FireM16_1stPerson(shooter);
-				}
-				else
-					fired = FireInstantHit(shooter, source);
-
-				break;
-			}
-
 			default:
 			{
 				debug("Unknown weapon type, Weapon.cpp");
@@ -258,8 +326,11 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 				DMAudio.PlayOneShot(shooterPed->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
 			}
 
-			if (m_nAmmoInClip > 0) m_nAmmoInClip--;
-			if (m_nAmmoTotal > 0 && (m_nAmmoTotal < 25000 || isPlayer)) m_nAmmoTotal--;
+			if (m_nAmmoInClip > 0)
+				m_nAmmoInClip--;
+
+			if (m_nAmmoTotal > 0 && (m_nAmmoTotal < 25000 || isPlayer) && (!isPlayer || CStats::GetPercentageProgress() < 100.0f || m_eWeaponType == WEAPONTYPE_DETONATOR))
+				m_nAmmoTotal--;
 
 			if (m_eWeaponState == WEAPONSTATE_READY && m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
 				DMAudio.PlayOneShot(((CPhysical*)shooter)->m_audioEntityId, SOUND_WEAPON_FLAMETHROWER_FIRE, 0.0f);
@@ -283,7 +354,11 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 				return true;
 			}
 
-			m_nTimer = CTimer::GetTimeInMilliseconds() + 1000;
+			if (addFireRateAsDelay)
+				m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nFiringRate;
+			else
+				m_nTimer = CTimer::GetTimeInMilliseconds();
+
 			if (shooter == FindPlayerPed())
 				CStats::RoundsFiredByPlayer++;
 		}
@@ -294,9 +369,15 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 		{
 			m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload;
 			m_eWeaponState = WEAPONSTATE_FIRING;
+#ifndef AUDIO_NOT_READY
+			if (shooter->IsPed() && m_eWeaponType != WEAPONTYPE_CHAINSAW)
+			{
+				DMAudio.PlayOneShot(((CPed*)shooter)->m_audioEntityId, 188, m_eWeaponType << 8);
+			}
+#endif
 		}
 
-		FireMelee(shooter, *source);
+		fired = FireMelee(shooter, *source);
 	}
 
 	if ( m_eWeaponType == WEAPONTYPE_UNARMED || m_eWeaponType == WEAPONTYPE_BASEBALLBAT )
@@ -306,7 +387,7 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 }
 
 bool
-CWeapon::FireFromCar(CAutomobile *shooter, bool left)
+CWeapon::FireFromCar(CVehicle *shooter, bool left, bool right)
 {
 	ASSERT(shooter!=nil);
 
@@ -316,7 +397,7 @@ CWeapon::FireFromCar(CAutomobile *shooter, bool left)
 	if ( m_nAmmoInClip <= 0 )
 		return false;
 
-	if ( FireInstantHitFromCar(shooter, left) )
+	if ( FireInstantHitFromCar(shooter, left, right) )
 	{
 		DMAudio.PlayOneShot(shooter->m_audioEntityId, SOUND_WEAPON_SHOT_FIRED, 0.0f);
 
@@ -344,6 +425,7 @@ CWeapon::FireFromCar(CAutomobile *shooter, bool left)
 	return true;
 }
 
+// --MIAMI: Done, except commented things
 bool
 CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 {
@@ -351,28 +433,39 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 
 	CWeaponInfo *info = GetInfo();
 
-	bool anim2Playing = false;
-	if ( RpAnimBlendClumpGetAssociation(shooter->GetClump(), info->m_Anim2ToPlay) )
-		anim2Playing = true;
+	bool anim2Playing = RpAnimBlendClumpGetAssociation(shooter->GetClump(), CPed::GetFireAnimGround(info, false));
 
 	ASSERT(shooter->IsPed());
 
 	CPed *shooterPed = (CPed*)shooter;
 
+	if (shooterPed == FindPlayerPed()) {
+		if (m_eWeaponType == WEAPONTYPE_GOLFCLUB || m_eWeaponType == WEAPONTYPE_NIGHTSTICK ||
+			(m_eWeaponType >= WEAPONTYPE_BASEBALLBAT && m_eWeaponType <= WEAPONTYPE_CHAINSAW)) {
+			
+			// TODO(Miami): BreakGlassPhysically
+			if (m_eWeaponType == WEAPONTYPE_CHAINSAW) {
+				CEventList::RegisterEvent(EVENT_GUNSHOT, EVENT_ENTITY_PED, FindPlayerPed(), FindPlayerPed(), 1000);
+			}
+		}
+	}
+
+	int damageEntityRegistered = 0;
+
 	for ( int32 i = 0; i < shooterPed->m_numNearPeds; i++ )
 	{
 		CPed *victimPed = shooterPed->m_nearPeds[i];
 		ASSERT(victimPed!=nil);
 
 		if ( (victimPed->m_nPedType != shooterPed->m_nPedType || victimPed == shooterPed->m_pSeekTarget)
-				&& victimPed != shooterPed->m_leader || !(CGeneral::GetRandomNumber() & 31) )
+				&& victimPed != shooterPed->m_leader || !(CGeneral::GetRandomNumber() & 31)
+				&& (!shooterPed->IsGangMember() || victimPed->CanBeDamagedByThisGangMember(shooterPed)) )
 		{
 			bool collided = false;
 
-			CColModel *victimPedCol = &CTempColModels::ms_colModelPed1;
-			if ( victimPed->OnGround() || !victimPed->IsPedHeadAbovePos(-0.3f) )
-				victimPedCol = &CTempColModels::ms_colModelPedGroundHit;
-
+			if (victimPed->m_nPedState == PED_DRIVING && (m_eWeaponType == WEAPONTYPE_UNARMED || m_eWeaponType == WEAPONTYPE_BRASSKNUCKLE
+				|| info->m_bFightMode))
+				continue;
 
 			float victimPedRadius = victimPed->GetBoundRadius() + info->m_fRadius;
 			if ( victimPed->bUsesCollision || victimPed->Dead() || victimPed->Driving() )
@@ -381,12 +474,29 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 				if ( SQR(victimPedRadius) > (victimPedPos-(*fireSource)).MagnitudeSqr() )
 				{
 					CVector collisionDist;
+					CColModel* victimPedCol = &CTempColModels::ms_colModelPed1;
+					bool useLocalPos = false;
+					if (victimPed->m_nPedState == PED_FALL
+						|| victimPed->m_nPedState == PED_DIE && victimPed->bIsPedDieAnimPlaying
+						|| victimPed->m_nWaitState == WAITSTATE_SIT_IDLE
+						|| victimPed->m_nWaitState == WAITSTATE_SUN_BATHE_IDLE)
+					{
+						useLocalPos = true;
+						victimPedCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(victimPed->GetModelIndex()))->AnimatePedColModelSkinnedWorld(victimPed->GetClump());
+					} else if (victimPed->DyingOrDead()) {
+						victimPedCol = &CTempColModels::ms_colModelPedGroundHit;
+					}
 
 					int32 s = 0;
 					while ( s < victimPedCol->numSpheres )
 					{
 						CColSphere *sphere = &victimPedCol->spheres[s];
-						collisionDist = victimPedPos+sphere->center-(*fireSource);
+
+						if (useLocalPos) {
+							collisionDist = sphere->center - (*fireSource);
+						} else {
+							collisionDist = victimPedPos + sphere->center - (*fireSource);
+						}
 
 						if ( SQR(sphere->radius + info->m_fRadius) > collisionDist.MagnitudeSqr() )
 						{
@@ -407,65 +517,130 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 
 							int32 localDir = victimPed->GetLocalDirection(posOffset);
 
-							bool isBat = m_eWeaponType == WEAPONTYPE_BASEBALLBAT;
+							bool isHeavy = m_eWeaponType >= WEAPONTYPE_GOLFCLUB && m_eWeaponType <= WEAPONTYPE_KATANA && m_eWeaponType != WEAPONTYPE_HAMMER;
+
+							if (shooterPed->m_fDamageImpulse == 0.0f) {
+								shooterPed->m_pDamageEntity = victimPed;
+								victimPed->RegisterReference(&shooterPed->m_pDamageEntity);
+							}
+
+							damageEntityRegistered = 3;
+							if (victimPed->bInVehicle) {
+								CVehicle *victimVeh = victimPed->m_pMyVehicle;
+								if (victimVeh) {
+									if (victimVeh->IsBike()) {
+										CBike *victimBike = (CBike*)victimVeh;
+										victimBike->KnockOffRider(m_eWeaponType, localDir, victimPed, false);
+										if (victimBike->pDriver) {
+											victimBike->pDriver->ReactToAttack(shooterPed);
+										} else {
+											if (victimVeh->pPassengers[0])
+												victimVeh->pPassengers[0]->ReactToAttack(shooterPed);
+										}
+										continue;
+									}
+								}
+							}
 
 							if ( !victimPed->DyingOrDead() )
 								victimPed->ReactToAttack(shooterPed);
 
 							uint8 hitLevel = HITLEVEL_HIGH;
-							if ( isBat && victimPed->OnGround() )
+							if ( isHeavy && (victimPed->OnGround() || victimPed->m_nWaitState == WAITSTATE_SUN_BATHE_IDLE))
 								hitLevel = HITLEVEL_GROUND;
 
 							victimPed->StartFightDefend(localDir, hitLevel, 10);
 
 							if ( !victimPed->DyingOrDead() )
 							{
-								if ( shooterPed->IsPlayer() && isBat && anim2Playing )
+								if ( shooterPed->IsPlayer() && isHeavy && anim2Playing )
 									victimPed->InflictDamage(shooterPed, m_eWeaponType, 100.0f, PEDPIECE_TORSO, localDir);
 								else if ( shooterPed->IsPlayer() && ((CPlayerPed*)shooterPed)->m_bAdrenalineActive )
 									victimPed->InflictDamage(shooterPed, m_eWeaponType, 3.5f*info->m_nDamage, PEDPIECE_TORSO, localDir);
 								else
 								{
-									if ( victimPed->IsPlayer() && isBat ) // wtf, it's not fair
+									if ( victimPed->IsPlayer() && isHeavy ) // wtf, it's not fair
 										victimPed->InflictDamage(shooterPed, m_eWeaponType, 2.0f*info->m_nDamage, PEDPIECE_TORSO, localDir);
 									else
 										victimPed->InflictDamage(shooterPed, m_eWeaponType,      info->m_nDamage, PEDPIECE_TORSO, localDir);
 								}
 							}
 
-							if ( CGame::nastyGame )
+							if ( CGame::nastyGame && victimPed->GetIsOnScreen() )
 							{
-								if ( victimPed->GetIsOnScreen() )
-								{
-									CVector dir = collisionDist * RecipSqrt(1.0f, 10.0f*collisionDist.MagnitudeSqr());
+								CVector dir = collisionDist * RecipSqrt(1.0f, 10.0f*collisionDist.MagnitudeSqr());
 
+								CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+								CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+								CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+
+								if ( isHeavy )
+								{
+									dir.x += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
+									dir.y += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
 									CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+
+									dir.x += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
+									dir.y += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
 									CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
-									CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+								}
 
-									if ( isBat )
+								if (m_eWeaponType == WEAPONTYPE_CHAINSAW)
+								{
+									if (victimPed->m_nPedState != PED_DEAD && !((CTimer::GetFrameCounter() + 17) & 1)
+										|| victimPed->m_nPedState == PED_DEAD && !((CTimer::GetFrameCounter() + 17) & 3))
 									{
-										dir.x += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
-										dir.y += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
-										CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
-
-										dir.x += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
-										dir.y += CGeneral::GetRandomNumberInRange(-0.05f, 0.05f);
-										CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, dir);
+										CParticle::AddParticle(PARTICLE_TEST, bloodPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.2f);
 									}
+									CVector newDir(dir);
+									newDir.z += 0.2f;
+									CParticle::AddParticle(PARTICLE_BLOOD_SMALL, bloodPos, newDir);
+									CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, newDir);
+									newDir.z = dir.z + 0.1f;
+									CParticle::AddParticle(PARTICLE_BLOOD, bloodPos, newDir);
+									newDir.x = 0.0f;
+									newDir.y = 0.0f;
+									newDir.z = 0.01f;
+									CParticle::AddParticle(PARTICLE_DEBRIS2, bloodPos, newDir);
+
+									// TODO(Miami): New particle
+									/*
+									v116.z = 0.0;
+									v116.x = CGeneral::GetRandomNumberInRange(-0.15f, 0.15f);
+									v116.y = CGeneral::GetRandomNumberInRange(0.1f, 0.35f);
+									v115.x = CGeneral::GetRandomNumberInRange(SCREEN_STRETCH_X(50.0f), SCREEN_STRETCH_FROM_RIGHT(50.0f));
+									v115.z = 1.0;
+									v115.y = CGeneral::GetRandomNumberInRange(SCREEN_STRETCH_Y(50.0f), SCREEN_STRETCH_FROM_BOTTOM(50.0f));
+									CParticle::AddParticle(41, v115, v116, nil, CGeneral::GetRandomNumberInRange(0.1f, 0.15f),
+										CRGBA(0, 0, 0, 0), 0, 0, CGeneral::GetRandomNumber() & 1, 0);
+
+									*/
+								}
+								if (info->m_AnimToPlay == ASSOCGRP_KNIFE)
+								{
+									dir.x += 0.1f * shooterPed->GetUp().x + 0.05f * shooterPed->GetRight().x;
+									dir.y += 0.1f * shooterPed->GetUp().y + 0.05f * shooterPed->GetRight().y;
+									dir.z += 0.1f * shooterPed->GetUp().z + 0.05f * shooterPed->GetRight().z;
+									CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir);
+									CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir);
+									CParticle::AddParticle(PARTICLE_BLOOD_SPURT, bloodPos, dir);
 								}
 							}
 
 							if ( !victimPed->OnGround() )
 							{
 								if ( victimPed->m_fHealth > 0.0f
-									&& (victimPed->m_fHealth < 20.0f && victimPedHealth > 20.0f || isBat && !victimPed->IsPlayer()) )
+									&& (victimPed->m_fHealth < 30.0f && victimPedHealth > 20.0f ||
+										(isHeavy || m_eWeaponType == WEAPONTYPE_BRASSKNUCKLE) && !victimPed->IsPlayer()) )
 								{
 									posOffset.Normalise();
 									victimPed->bIsStanding = false;
-									victimPed->ApplyMoveForce(posOffset.x*-5.0f, posOffset.y*-5.0f, 3.0f);
+									if(m_eWeaponType == WEAPONTYPE_CHAINSAW)
+										victimPed->ApplyMoveForce(posOffset.x*-2.0f, posOffset.y*-2.0f, 2.0f);
+									else
+										victimPed->ApplyMoveForce(posOffset.x*-5.0f, posOffset.y*-5.0f, 3.0f);
 
-									if ( isBat && victimPed->IsPlayer() )
+									if ( isHeavy && victimPed->IsPlayer() )
 										victimPed->SetFall(3000, AnimationId(ANIM_KO_SKID_FRONT + localDir), false);
 									else
 										victimPed->SetFall(1500, AnimationId(ANIM_KO_SKID_FRONT + localDir), false);
@@ -478,21 +653,152 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource)
 							{
 								posOffset.Normalise();
 								victimPed->bIsStanding = false;
-								victimPed->ApplyMoveForce(posOffset.x*-5.0f, posOffset.y*-5.0f, 3.0f);
+								if(m_eWeaponType == WEAPONTYPE_CHAINSAW)
+									victimPed->ApplyMoveForce(posOffset.x*-1.0f, posOffset.y*-1.0f, 1.0f);
+								else
+									victimPed->ApplyMoveForce(posOffset.x*-5.0f, posOffset.y*-5.0f, 3.0f);
 							}
 
 							m_eWeaponState = WEAPONSTATE_MELEE_MADECONTACT;
 
-							if ( victimPed->m_nPedType == PEDTYPE_COP )
-								CEventList::RegisterEvent(EVENT_ASSAULT_POLICE, EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
-							else
-								CEventList::RegisterEvent(EVENT_ASSAULT,        EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
+							if (m_eWeaponType != WEAPONTYPE_KNIFE && m_eWeaponType != WEAPONTYPE_MACHETE
+								&& m_eWeaponType != WEAPONTYPE_KATANA && m_eWeaponType != WEAPONTYPE_CHAINSAW) {
+
+								if (victimPed->m_nPedType == PEDTYPE_COP)
+									CEventList::RegisterEvent(EVENT_ASSAULT_POLICE, EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
+								else
+									CEventList::RegisterEvent(EVENT_ASSAULT, EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
+							} else {
+								if (victimPed->m_nPedType == PEDTYPE_COP)
+									CEventList::RegisterEvent(EVENT_ASSAULT_NASTYWEAPON_POLICE, EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
+								else
+									CEventList::RegisterEvent(EVENT_ASSAULT_NASTYWEAPON, EVENT_ENTITY_PED, victimPed, shooterPed, 2000);
+							}
 						}
 					}
 				}
 			}
 		}
 	}
+	CVehicle *nearVeh = (CVehicle*)CWorld::TestSphereAgainstWorld(fireSource, info->m_fRadius, nil, false, true, false, false, false, false);
+	if (nearVeh && nearVeh->IsCar())
+	{
+		CAutomobile *nearCar = (CAutomobile*)nearVeh;
+		m_eWeaponState = WEAPONSTATE_MELEE_MADECONTACT;
+		if (shooterPed == FindPlayerPed())
+		{
+			if (nearCar->IsLawEnforcementVehicle())
+			{
+				FindPlayerPed()->SetWantedLevelNoDrop(1);
+			}
+			CEventList::RegisterEvent(EVENT_ASSAULT, EVENT_ENTITY_VEHICLE, nearCar, shooterPed, 2000);
+		}
+		float oldHealth = nearCar->m_fHealth;
+		if (m_eWeaponType == WEAPONTYPE_CHAINSAW)
+		{
+			for(int i=0; i<4; i++) {
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.3f));
+				CParticle::AddParticle(PARTICLE_SPARK, gaTempSphereColPoints[0].point, gaTempSphereColPoints[0].normal * 0.1f);
+			}
+		}
+		if (m_eWeaponType == WEAPONTYPE_CHAINSAW)
+		{
+			nearCar->VehicleDamage(info->m_nDamage * (0.00075f * nearCar->pHandling->fMass), gaTempSphereColPoints[0].pieceB);
+
+			// TODO(Miami): Particle not in III
+			// CParticle::AddParticle(81, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
+		}
+		else
+		{
+			nearCar->VehicleDamage(info->m_nDamage* (0.00075f * nearCar->pHandling->fMass), gaTempSphereColPoints[0].pieceB);
+		}
+		if (nearCar->m_fHealth < oldHealth)
+		{
+			nearCar->m_nLastWeaponDamage = m_eWeaponType;
+			nearCar->m_pLastDamageEntity = shooterPed;
+		}
+		if (shooterPed->m_fDamageImpulse == 0.0f)
+		{
+			shooterPed->m_pDamageEntity = nearCar;
+			nearCar->RegisterReference(&shooterPed->m_pDamageEntity);
+		}
+		damageEntityRegistered = 2;
+		if (FindPlayerPed()->GetWeapon() == this && nearCar->VehicleCreatedBy != MISSION_VEHICLE)
+		{
+			if (nearCar->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_PLOUGH_THROUGH
+				&& (CGeneral::GetRandomTrueFalse() || nearCar->AutoPilot.m_nCarMission != MISSION_CRUISE))
+			{
+				int leaveCarDelay = 200;
+				CPed *driver = nearCar->pDriver;
+				if (driver && driver->CharCreatedBy != MISSION_CHAR)
+				{
+					if (driver->m_pedStats->m_temper <= driver->m_pedStats->m_fear)
+					{
+						driver->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
+					}
+					else
+					{
+						driver->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, FindPlayerPed());
+						driver->m_objectiveTimer = CTimer::GetTimeInMilliseconds() + 10000;
+						driver->m_prevObjective = OBJECTIVE_KILL_CHAR_ON_FOOT;
+					}
+					driver->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 200;
+					leaveCarDelay = 400;
+				}
+				for (int j = 0; j < nearCar->m_nNumPassengers; ++j)
+				{
+					CPed *passenger = nearCar->pPassengers[j];
+					if (passenger && passenger->CharCreatedBy != MISSION_CHAR)
+					{
+						nearCar->pPassengers[j]->SetObjective(OBJECTIVE_FLEE_TILL_SAFE);
+						passenger->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + leaveCarDelay;
+						leaveCarDelay += 200;
+					}
+				}
+			}
+			else
+			{
+				CPed *driver = nearCar->pDriver;
+				if (driver)
+				{
+					if (driver->m_objective != OBJECTIVE_LEAVE_VEHICLE && driver->m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT &&
+						driver->m_objective != OBJECTIVE_FLEE_TILL_SAFE)
+					{
+						if (nearCar->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_PLOUGH_THROUGH)
+							nearCar->AutoPilot.m_nCruiseSpeed = nearCar->AutoPilot.m_nCruiseSpeed * 1.5f;
+
+						nearCar->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_PLOUGH_THROUGH;
+					}
+				}
+			}
+		}
+	}
+	if (m_eWeaponType == WEAPONTYPE_CHAINSAW)
+	{
+		CEntity *nearStatic = (CObject*)CWorld::TestSphereAgainstWorld(fireSource, info->m_fRadius, nil, true, false, false, true, false, false);
+		if (nearStatic)
+		{
+			for(int i=0; i < 4; i++) {
+				CParticle::AddParticle(PARTICLE_SPARK_SMALL, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.3f), 0, 0.0f, 0, 0, 0, 0);
+				CParticle::AddParticle(PARTICLE_SPARK, gaTempSphereColPoints[0].point, 0.1f * gaTempSphereColPoints[0].normal, 0, 0.0f, 0, 0, 0, 0);
+			}
+
+			// TODO(Miami): Particle not in III
+			//CParticle::AddParticle(81, gaTempSphereColPoints[0].point, CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
+			
+			if (!damageEntityRegistered)
+			{
+				m_eWeaponState = WEAPONSTATE_MELEE_MADECONTACT;
+				if (shooterPed->m_fDamageImpulse == 0.0f)
+				{
+					shooterPed->m_pDamageEntity = nearStatic;
+					nearStatic->RegisterReference(&shooterPed->m_pDamageEntity);
+				}
+			}
+			if (nearStatic->IsObject() && ((CObject*)nearStatic)->m_nCollisionDamageEffect >= DAMAGE_EFFECT_SMASH_COMPLETELY)
+				((CObject*)nearStatic)->ObjectDamage(200.0f);
+		}
+	}
 
 	return true;
 }
@@ -534,13 +840,10 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 			int32 accuracy   = shooterPed->m_wepAccuracy;
 			int32 inaccuracy = 100-accuracy;
 
-			if ( accuracy != 100 )
-				FindPlayerPed();	//what ?
-
 			CPed *threatAttack = (CPed*)shooterPed->m_pPointGunAt;
 			if ( threatAttack->IsPed() )
 			{
-				threatAttack->m_pedIK.GetComponentPosition(target, PED_MID);
+				threatAttack->m_pedIK.GetComponentPosition(*(RwV3d *)&target, PED_MID);
 				threatAttack->ReactToPointGun(shooter);
 			}
 			else
@@ -582,7 +885,7 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		CWorld::bIncludeDeadPeds = false;
 
 		int32 rotSpeed = 1;
-		if ( m_eWeaponType == WEAPONTYPE_M16  )
+		if ( m_eWeaponType == WEAPONTYPE_M4  )
 			rotSpeed = 4;
 
 		CVector bulletPos;
@@ -610,7 +913,7 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		ProcessLineOfSight(*fireSource, target, point, victim, m_eWeaponType, shooter, true, true, true, true, true, true, false);
 
 		int32 rotSpeed = 1;
-		if ( m_eWeaponType == WEAPONTYPE_M16  )
+		if ( m_eWeaponType == WEAPONTYPE_M4  )
 			rotSpeed = 4;
 
 		CVector bulletPos;
@@ -621,10 +924,19 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		}
 	}
 
-	if ( victim && shooter->IsPed() && victim == ((CPed*)shooter)->m_leader )
-		return false;
+	if (victim && shooter->IsPed())
+	{
+		if (victim == ((CPed*)shooter)->m_leader)
+			return false;
 
-	CEventList::RegisterEvent(EVENT_GUNSHOT, EVENT_ENTITY_PED, shooter, (CPed *)shooter, 1000);
+		if (victim->IsPed() && ((CPed*)shooter)->IsGangMember() && !((CPed*)victim)->CanBeDamagedByThisGangMember((CPed*)shooter))
+			return false;
+	}
+
+	if (shooter->IsPed())
+		CEventList::RegisterEvent(EVENT_GUNSHOT, EVENT_ENTITY_PED, shooter, (CPed*)shooter, 1000);
+	else if (shooter->IsVehicle() && ((CVehicle*)shooter)->pDriver)
+		CEventList::RegisterEvent(EVENT_GUNSHOT, EVENT_ENTITY_VEHICLE, shooter, ((CVehicle*)shooter)->pDriver, 1000);
 
 	if ( shooter == FindPlayerPed() )
 	{
@@ -635,99 +947,17 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 
 	switch ( m_eWeaponType )
 	{
-		case WEAPONTYPE_AK47:
-		{
-			static uint8 counter = 0;
-
-			if ( !(++counter & 1) )
-			{
-				CPointLights::AddLight(CPointLights::LIGHT_POINT,
-					*fireSource, CVector(0.0f, 0.0f, 0.0f), 5.0f,
-					1.0f, 0.8f, 0.0f, CPointLights::FOG_NONE, false);
-
-				CVector gunflashPos = *fireSource;
-				gunflashPos += CVector(0.06f*ahead.x, 0.06f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.10f);
-				gunflashPos += CVector(0.06f*ahead.x, 0.06f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.08f);
-				gunflashPos += CVector(0.05f*ahead.x, 0.05f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.06f);
-				gunflashPos += CVector(0.04f*ahead.x, 0.04f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
-
-				CVector gunsmokePos = *fireSource;
-				float rnd = CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
-				CParticle::AddParticle(PARTICLE_GUNSMOKE2, gunsmokePos, CVector(ahead.x*rnd, ahead.y*rnd, 0.0f));
-
-				CVector gunshellPos = *fireSource;
-				gunshellPos -= CVector(0.5f*ahead.x, 0.5f*ahead.y, 0.0f);
-				CVector dir = CrossProduct(CVector(ahead.x, ahead.y, 0.0f), CVector(0.0f, 0.0f, 5.0f));
-				dir.Normalise2D();
-				AddGunshell(shooter, gunshellPos, CVector2D(dir.x, dir.y), 0.018f);
-			}
-
-			break;
-		}
-
-		case WEAPONTYPE_M16:
+		case WEAPONTYPE_M4:
+		case WEAPONTYPE_RUGER:
+		case WEAPONTYPE_M60:
+		case WEAPONTYPE_MINIGUN:
+		case WEAPONTYPE_HELICANNON:
 		{
 			static uint8 counter = 0;
 
-			if ( !(++counter & 1) )
+			if ( info->m_nFiringRate >= 50 && !(++counter & 1) )
 			{
-				CPointLights::AddLight(CPointLights::LIGHT_POINT,
-					*fireSource, CVector(0.0f, 0.0f, 0.0f), 5.0f,
-					1.0f, 0.8f, 0.0f, CPointLights::FOG_NONE, false);
-
-				CVector gunflashPos = *fireSource;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.08f);
-				gunflashPos += CVector(0.06f*ahead.x, 0.06f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.06f);
-				gunflashPos += CVector(0.06f*ahead.x, 0.06f*ahead.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.06f);
-
-				gunflashPos = *fireSource;
-				gunflashPos += CVector(-0.1f*ahead.x, -0.1f*ahead.y, 0.0f);
-				gunflashPos.z += 0.04f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
-				gunflashPos.z += 0.04f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-				gunflashPos.z += 0.03f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-
-				gunflashPos = *fireSource;
-				gunflashPos += CVector(-0.1f*ahead.x, -0.1f*ahead.y, 0.0f);
-				gunflashPos.z -= 0.04f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
-				gunflashPos.z -= 0.04f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-				gunflashPos.z -= 0.03f;
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-
-				CVector offset = CrossProduct(CVector(ahead.x, ahead.y, 0.0f), CVector(0.0f, 0.0f, 5.0f));
-				offset.Normalise2D();
-
-				gunflashPos = *fireSource;
-				gunflashPos += CVector(-0.1f*ahead.x, -0.1f*ahead.y, 0.0f);
-				gunflashPos += CVector(0.06f*offset.x, 0.06f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
-				gunflashPos += CVector(0.04f*offset.x, 0.04f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.03f);
-				gunflashPos += CVector(0.03f*offset.x, 0.03f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-
-				gunflashPos = *fireSource;
-				gunflashPos += CVector(-0.1f*ahead.x, -0.1f*ahead.y, 0.0f);
-				gunflashPos -= CVector(0.06f*offset.x, 0.06f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
-				gunflashPos -= CVector(0.04f*offset.x, 0.04f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.03f);
-				gunflashPos -= CVector(0.03f*offset.x, 0.03f*offset.y, 0.0f);
-				CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
-
-				CVector gunsmokePos = *fireSource;
-				float rnd = CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
-				CParticle::AddParticle(PARTICLE_GUNSMOKE2, gunsmokePos, CVector(ahead.x*rnd, ahead.y*rnd, 0.0f));
+				AddGunFlashBigGuns(*fireSource, *fireSource + target);
 
 				CVector gunshellPos = *fireSource;
 				gunshellPos -= CVector(0.65f*ahead.x, 0.65f*ahead.y, 0.0f);
@@ -740,6 +970,9 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		}
 
 		case WEAPONTYPE_UZI:
+		case WEAPONTYPE_TEC9:
+		case WEAPONTYPE_SILENCED_INGRAM:
+		case WEAPONTYPE_MP5:
 		{
 			CPointLights::AddLight(CPointLights::LIGHT_POINT,
 					*fireSource, CVector(0.0f, 0.0f, 0.0f), 5.0f,
@@ -778,6 +1011,9 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		}
 
 		case WEAPONTYPE_COLT45:
+		case WEAPONTYPE_PYTHON:
+		case WEAPONTYPE_SNIPERRIFLE:
+		case WEAPONTYPE_LASERSCOPE:
 		{
 			CPointLights::AddLight(CPointLights::LIGHT_POINT,
 					*fireSource, CVector(0.0f, 0.0f, 0.0f), 5.0f,
@@ -891,7 +1127,8 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
 					}
 					else
 					{
-						if ( m_eWeaponType == WEAPONTYPE_SHOTGUN || m_eWeaponType == WEAPONTYPE_HELICANNON )
+						if ( IsShotgun(m_eWeaponType) || m_eWeaponType == WEAPONTYPE_HELICANNON
+							|| m_eWeaponType == WEAPONTYPE_M60 || m_eWeaponType == WEAPONTYPE_PYTHON)
 						{
 							posOffset.Normalise();
 							victimPed->bIsStanding = false;
@@ -916,7 +1153,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
 									asoc->blendAmount = 0.0f;
 									asoc->blendDelta  = 8.0f;
 
-									if ( m_eWeaponType == WEAPONTYPE_AK47 || m_eWeaponType == WEAPONTYPE_M16 )
+									if ( m_eWeaponType == WEAPONTYPE_M4 )
 										victimPlayer->m_nHitAnimDelayTimer = CTimer::GetTimeInMilliseconds() + 2500;
 									else
 										victimPlayer->m_nHitAnimDelayTimer = CTimer::GetTimeInMilliseconds() + 1000;
@@ -945,7 +1182,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
 					if ( CGame::nastyGame )
 					{
 						uint8 bloodAmount = 8;
-						if ( m_eWeaponType == WEAPONTYPE_SHOTGUN || m_eWeaponType == WEAPONTYPE_HELICANNON )
+						if ( IsShotgun(m_eWeaponType) || m_eWeaponType == WEAPONTYPE_HELICANNON )
 							bloodAmount = 32;
 
 						CVector dir = (point->point - victim->GetPosition()) * 0.01f;
@@ -1017,7 +1254,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
 				}
 				case ENTITY_TYPE_VEHICLE:
 				{
-					((CVehicle *)victim)->InflictDamage(shooter, m_eWeaponType, info->m_nDamage);
+					((CVehicle *)victim)->InflictDamage(shooter, m_eWeaponType, info->m_nDamage, point->point);
 
 					for ( int32 i = 0; i < 16; i++ )
 						CParticle::AddParticle(PARTICLE_SPARK, point->point, point->normal*0.05f);
@@ -1161,10 +1398,35 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 	else
 		shooterAngle = RADTODEG(shooter->GetForward().Heading());
 
+	int shootsAtOnce;
+	int checkObstacleOnShootNo;
+	float angleRange;
+	switch (m_eWeaponType) {
+		case WEAPONTYPE_SHOTGUN:
+			angleRange = DEGTORAD(9.0f);
+			checkObstacleOnShootNo = 1;
+			shootsAtOnce = 3;
+			break;
+		case WEAPONTYPE_SPAS12_SHOTGUN:
+			angleRange = DEGTORAD(6.0f);
+			checkObstacleOnShootNo = 1;
+			shootsAtOnce = 3;
+			break;
+		case WEAPONTYPE_STUBBY_SHOTGUN:
+			angleRange = DEGTORAD(18.0f);
+			checkObstacleOnShootNo = 2;
+			shootsAtOnce = 5;
+			break;
+		default:
+			break;
+	}
+	bool statUpdated = false;
+	float halfAngleRange = angleRange / 2.f;
+	float angleBetweenTwoShot = angleRange / (shootsAtOnce - 1.f);
 
-	for ( int32 i = 0; i < 5; i++ ) // five shoots at once
+	for ( int32 i = 0; i < shootsAtOnce; i++ )
 	{
-		float shootAngle = DEGTORAD(7.5f*i + shooterAngle - 15.0f);
+		float shootAngle = DEGTORAD(RADTODEG(halfAngleRange - angleBetweenTwoShot * i) + shooterAngle);
 		CVector2D shootRot(-Sin(shootAngle), Cos(shootAngle));
 
 		CVector source, target;
@@ -1176,12 +1438,17 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 			TheCamera.Find3rdPersonCamTargetVector(1.0f, *fireSource, source, target);
 			CVector Left = CrossProduct(TheCamera.Cams[TheCamera.ActiveCam].Front, TheCamera.Cams[TheCamera.ActiveCam].Up);
 
-			float f = float(i - 2) * (DEGTORAD(7.5f) / 2);
+			float f = (i - (shootsAtOnce / 2)) * angleBetweenTwoShot;
 			target  = f * Left + target - source;
 			target *= info->m_fRange;
 			target += source;
+			CWorld::bIncludeDeadPeds = true;
+			//bProcessVehicleWheels = true; // TODO(Miami): bProcessVehicleWheels
+			//bProcessPedsOnBoatsAndBikes = true; // TODO(Miami): bProcessPedsOnBoatsAndBikes
 
-			ProcessLineOfSight(source, target, point, victim, m_eWeaponType, shooter, true, true, true, true, true, true, false);
+			ProcessLineOfSight(source, target, point, victim, m_eWeaponType, shooter, true, true, true, true, true, false, false); // TODO(Miami): New parameter: ,true);
+			CWorld::bIncludeDeadPeds = false;
+			//bProcessVehicleWheels = false; // TODO(Miami): bProcessVehicleWheels
 		}
 		else
 		{
@@ -1197,24 +1464,84 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 					DoDoomAiming(shooter, fireSource, &target);
 				else
 				{
-					float distToTarget = (shooterPed->m_pPointGunAt->GetPosition() - (*fireSource)).Magnitude2D();
-					target.z += info->m_fRange / distToTarget * (shooterPed->m_pPointGunAt->GetPosition().z - target.z);
+					CVector pos;
+					if (shooterPed->m_pPointGunAt->IsPed()) {
+						((CPed*)shooterPed->m_pPointGunAt)->m_pedIK.GetComponentPosition(*(RwV3d *)&pos, PED_MID);
+					} else {
+						pos = ((CPed*)shooterPed->m_pPointGunAt)->GetPosition();
+					}
+
+					float distToTarget = (pos - (*fireSource)).Magnitude2D();
+					target.z += info->m_fRange / distToTarget * (pos.z - target.z);
 				}
 			}
+			if (shooter == FindPlayerPed())
+				CWorld::bIncludeDeadPeds = true;
 
-			ProcessLineOfSight(*fireSource, target, point, victim, m_eWeaponType, shooter, true, true, true, true, true, true, false);
+			//bProcessPedsOnBoatsAndBikes = true; // TODO(Miami): bProcessPedsOnBoatsAndBikes
+			ProcessLineOfSight(*fireSource, target, point, victim, m_eWeaponType, shooter, true, true, true, true, true, false, false); // TODO(Miami): New parameter: ,true);
+			CWorld::bIncludeDeadPeds = false;
 		}
+		//bProcessPedsOnBoatsAndBikes = false; // TODO(Miami): bProcessPedsOnBoatsAndBikes
 
 		if ( victim )
 		{
 			CGlass::WasGlassHitByBullet(victim, point.point);
+			CWeapon::BlowUpExplosiveThings(victim);
+			if (i == checkObstacleOnShootNo)
+			{
+				if (shooter)
+				{
+					if (shooter->IsPed() && !((CPed*)shooter)->IsPlayer())
+					{
+						CPed *shooterPed = (CPed*)shooter;
+						CEntity *guyWePointGun = shooterPed->m_pPointGunAt;
+						if (guyWePointGun)
+						{
+							if (victim != guyWePointGun)
+							{
+								float distWithAim = (guyWePointGun->GetPosition() - shooter->GetPosition()).Magnitude();
+								float distWithBullet = (point.point - shooter->GetPosition()).Magnitude();
+								if (distWithAim > 0.1f && distWithBullet > 0.1f)
+								{
+									// Normalize
+									CVector aimDir = (guyWePointGun->GetPosition() - shooter->GetPosition()) * (1.0f / distWithAim);
+									CVector bulletDir = (point.point - shooter->GetPosition()) * (1.0f / distWithBullet);
+
+									float dotProd = DotProduct(aimDir, bulletDir);
+									float aimAndBulletAngle;
+									if (dotProd <= 0.35f)
+										aimAndBulletAngle = PI;
+									else
+										aimAndBulletAngle = Acos(dotProd);
 
+									if (aimAndBulletAngle <= DEGTORAD(45.0f) && (aimAndBulletAngle <= DEGTORAD(15.0f) || distWithBullet / distWithAim >= 0.75f) && distWithBullet / distWithAim >= 0.99f)
+									{
+										shooterPed->bObstacleShowedUpDuringKillObjective = false;
+										shooterPed->m_shotTime = 0;
+									}
+									else
+									{
+										shooterPed->bObstacleShowedUpDuringKillObjective = true;
+										shooterPed->m_shootTimer = 0;
+										shooterPed->m_shotTime = CTimer::GetTimeInMilliseconds();
+										if (distWithAim >= 10.0f)
+											shooterPed->SetAttackTimer(3000);
+										else
+											shooterPed->SetAttackTimer(1500);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 			CBulletTraces::AddTrace(fireSource, &point.point);
 
 			if ( victim->IsPed() )
 			{
 				CPed *victimPed = (CPed *)victim;
-				if ( !victimPed->OnGround() && victim != shooter && victimPed->DoesLOSBulletHitPed(point) )
+				if ( !victimPed->DyingOrDead() && victim != shooter )
 				{
 					bool cantStandup = true;
 
@@ -1227,7 +1554,8 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 
 					posOffset.Normalise();
 
-					if ( victimPed->m_getUpTimer > (CTimer::GetTimeInMilliseconds() - 3000) )
+					if ( victimPed->m_getUpTimer > (CTimer::GetTimeInMilliseconds() - 3000) || 
+						!victimPed->bCanBeShotInVehicle)
 						cantStandup = false;
 
 					if ( victimPed->bIsStanding && cantStandup )
@@ -1252,7 +1580,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 					if ( CGame::nastyGame )
 					{
 						uint8 bloodAmount = 8;
-						if ( m_eWeaponType == WEAPONTYPE_SHOTGUN )
+						if ( IsShotgun(m_eWeaponType) )
 							bloodAmount = 32;
 
 						CVector dir = (point.point - victim->GetPosition()) * 0.01f;
@@ -1264,6 +1592,36 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 								CParticle::AddParticle(PARTICLE_BLOOD_SMALL, point.point, dir);
 						}
 					}
+				} else {
+					if (CGame::nastyGame)
+					{
+						CVector dir = (point.point - victim->GetPosition()) * 0.01f;
+						dir.z = 0.01f;
+
+						if (victimPed->GetIsOnScreen())
+						{
+							for (uint8 i = 0; i < 8; i++)
+								CParticle::AddParticle(PARTICLE_BLOOD_SMALL, point.point + CVector(0.0f, 0.0f, 0.15f), dir);
+						}
+						if (victimPed->Dead())
+						{
+							CAnimBlendAssociation *hitAssoc;
+							if (RpAnimBlendClumpGetFirstAssociation(victimPed->GetClump(), ASSOC_FRONTAL))
+							{
+								hitAssoc = CAnimManager::BlendAnimation(victimPed->GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT_F, 8.0f);
+							}
+							else
+							{
+								hitAssoc = CAnimManager::BlendAnimation(victimPed->GetClump(), ASSOCGRP_STD, ANIM_FLOOR_HIT, 8.0f);
+							}
+							if (hitAssoc)
+							{
+								hitAssoc->SetCurrentTime(0.0f);
+								hitAssoc->SetRun();
+								hitAssoc->flags &= ~ASSOC_DELETEFADEDOUT;
+							}
+						}
+					}
 				}
 			}
 			else
@@ -1272,21 +1630,29 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 				{
 					case ENTITY_TYPE_VEHICLE:
 					{
-						((CVehicle *)victim)->InflictDamage(shooter, m_eWeaponType, info->m_nDamage);
+						if (point.pieceB >= SURFACE_LAMP_POST && point.pieceB <= SURFACE_METAL_CHAIN_FENCE) {
+							((CVehicle*)victim)->BurstTyre(point.pieceB, true);
 
-						for ( int32 i = 0; i < 16; i++ )
-							CParticle::AddParticle(PARTICLE_SPARK, point.point, point.normal*0.05f);
+							for (int32 i = 0; i < 4; i++)
+								CParticle::AddParticle(PARTICLE_BULLETHIT_SMOKE, point.point, point.normal * 0.05f);
+						}
+						else
+						{
+							((CVehicle*)victim)->InflictDamage(shooter, m_eWeaponType, info->m_nDamage);
+
+							for (int32 i = 0; i < 16; i++)
+								CParticle::AddParticle(PARTICLE_SPARK, point.point, point.normal * 0.05f);
 
 #ifndef FIX_BUGS
-						CVector dist = point.point - (*fireSource);
-						CVector offset = dist - Max(0.2f*dist.Magnitude(), 2.0f) * CVector(shootRot.x, shootRot.y, 0.0f);
-						CVector smokePos = *fireSource + offset;
+							CVector dist = point.point - (*fireSource);
+							CVector offset = dist - Max(0.2f * dist.Magnitude(), 2.0f) * CVector(shootRot.x, shootRot.y, 0.0f);
+							CVector smokePos = *fireSource + offset;
 #else
-					    CVector smokePos = point.point;
+							CVector smokePos = point.point;
 #endif
 
-						CParticle::AddParticle(PARTICLE_BULLETHIT_SMOKE, smokePos, CVector(0.0f, 0.0f, 0.0f));
-
+							CParticle::AddParticle(PARTICLE_BULLETHIT_SMOKE, smokePos, CVector(0.0f, 0.0f, 0.0f));
+						}
 						break;
 					}
 
@@ -1316,13 +1682,15 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 
 							if ( !victimObject->bInfiniteMass )
 							{
-								if ( victimObject->IsStatic() && victimObject->m_fUprootLimit <= 0.0f )
+								bool notStatic = !victimObject->IsStatic();
+								if ( notStatic && victimObject->m_fUprootLimit <= 0.0f )
 								{
 									victimObject->bIsStatic = false;
 									victimObject->AddToMovingList();
 								}
 
-								if ( !victimObject->IsStatic())
+								notStatic = !victimObject->IsStatic();
+								if ( !notStatic )
 								{
 									CVector moveForce = point.normal*-5.0f;
 									victimObject->ApplyMoveForce(moveForce.x, moveForce.y, moveForce.z);
@@ -1345,17 +1713,29 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
 				}
 				case ENTITY_TYPE_VEHICLE:
 				{
+					if (!statUpdated) {
+						//CStats::NumBulletsHit++; // TODO(Miami): Stats
+						statUpdated = true;
+					}
 					DMAudio.PlayOneShot(((CPhysical*)victim)->m_audioEntityId, SOUND_WEAPON_HIT_VEHICLE, 1.0f);
 					break;
 				}
 				case ENTITY_TYPE_PED:
 				{
+					if (!statUpdated) {
+						//CStats::NumBulletsHit++; // TODO(Miami): Stats
+						statUpdated = true;
+					}
 					DMAudio.PlayOneShot(((CPhysical*)victim)->m_audioEntityId, SOUND_WEAPON_HIT_PED, 1.0f);
 					((CPed*)victim)->Say(SOUND_PED_BULLET_HIT);
 					break;
 				}
 				case ENTITY_TYPE_OBJECT:
 				{
+					if (!statUpdated) {
+						//CStats::NumBulletsHit++; // TODO(Miami): Stats
+						statUpdated = true;
+					}
 					PlayOneShotScriptObject(SCRIPT_SOUND_BULLET_HIT_GROUND_2, point.point);
 					break;
 				}
@@ -1388,10 +1768,12 @@ CWeapon::FireProjectile(CEntity *shooter, CVector *fireSource, float power)
 	ASSERT(fireSource!=nil);
 
 	CVector source, target;
+	eWeaponType projectileType = m_eWeaponType;
 
 	if ( m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER )
 	{
 		source = *fireSource;
+		projectileType = WEAPONTYPE_ROCKET;
 
 		if ( shooter->IsPed() && ((CPed*)shooter)->IsPlayer() )
 		{
@@ -1433,7 +1815,7 @@ CWeapon::FireProjectile(CEntity *shooter, CVector *fireSource, float power)
 	if ( !CWorld::GetIsLineOfSightClear(source, target, true, true, false, true, false, false, false) )
 	{
 		if ( m_eWeaponType != WEAPONTYPE_GRENADE )
-			CProjectileInfo::RemoveNotAdd(shooter, m_eWeaponType, *fireSource);
+			CProjectileInfo::RemoveNotAdd(shooter, projectileType, *fireSource);
 		else
 		{
 			if ( shooter->IsPed() )
@@ -1442,14 +1824,14 @@ CWeapon::FireProjectile(CEntity *shooter, CVector *fireSource, float power)
 				source.z -= 0.4f;
 
 				if ( !CWorld::TestSphereAgainstWorld(source, 0.5f, nil, false, false, true, false, false, false) )
-					CProjectileInfo::AddProjectile(shooter, m_eWeaponType, source, 0.0f);
+					CProjectileInfo::AddProjectile(shooter, WEAPONTYPE_GRENADE, source, 0.0f);
 				else
-					CProjectileInfo::RemoveNotAdd(shooter, m_eWeaponType, *fireSource);
+					CProjectileInfo::RemoveNotAdd(shooter, WEAPONTYPE_GRENADE, *fireSource);
 			}
 		}
 	}
 	else
-		CProjectileInfo::AddProjectile(shooter, m_eWeaponType, *fireSource, power);
+		CProjectileInfo::AddProjectile(shooter, projectileType, *fireSource, power);
 
 	return true;
 }
@@ -1533,7 +1915,7 @@ CWeapon::FireSniper(CEntity *shooter)
 	CVector dir    = cam->Front;
 
 	if ( DotProduct(dir, CVector(0.0f, -0.9894f, 0.145f)) > 0.997f )
-		CCoronas::bSmallMoon = !CCoronas::bSmallMoon;
+		CCoronas::MoonSize = (CCoronas::MoonSize+1) & 7;
 
 	dir.Normalise();
 	dir *= 16.0f;
@@ -1556,6 +1938,7 @@ CWeapon::FireSniper(CEntity *shooter)
 	return true;
 }
 
+// --MIAMI: Heavily TODO
 bool
 CWeapon::FireM16_1stPerson(CEntity *shooter)
 {
@@ -1565,6 +1948,7 @@ CWeapon::FireM16_1stPerson(CEntity *shooter)
 
 	if (!( mode == CCam::MODE_M16_1STPERSON
 		|| mode == CCam::MODE_SNIPER
+		|| mode == CCam::MODE_CAMERA
 		|| mode == CCam::MODE_ROCKETLAUNCHER
 		|| mode == CCam::MODE_M16_1STPERSON_RUNABOUT
 		|| mode == CCam::MODE_SNIPER_RUNABOUT
@@ -1600,7 +1984,8 @@ CWeapon::FireM16_1stPerson(CEntity *shooter)
 	DoBulletImpact(shooter, victim, &source, &target, &point, front);
 
 	CVector bulletPos;
-	if ( CHeli::TestBulletCollision(&source, &target, &bulletPos, 4) )
+
+	if ( CHeli::TestBulletCollision(&source, &target, &bulletPos, (m_eWeaponType == WEAPONTYPE_M60 || m_eWeaponType == WEAPONTYPE_HELICANNON ? 20 : 4)) )
 	{
 		for ( int32 i = 0; i < 16; i++ )
 			CParticle::AddParticle(PARTICLE_SPARK, bulletPos, CVector(0.0f, 0.0f, 0.0f));
@@ -1610,24 +1995,35 @@ CWeapon::FireM16_1stPerson(CEntity *shooter)
 	{
 		CPad::GetPad(0)->StartShake_Distance(240, 128, FindPlayerPed()->GetPosition().x, FindPlayerPed()->GetPosition().y, FindPlayerPed()->GetPosition().z);
 
-		if ( m_eWeaponType == WEAPONTYPE_M16 )
-		{
-			TheCamera.Cams[TheCamera.ActiveCam].Beta  += float((CGeneral::GetRandomNumber() & 127) - 64) * 0.0003f;
-			TheCamera.Cams[TheCamera.ActiveCam].Alpha += float((CGeneral::GetRandomNumber() & 127) - 64) * 0.0003f;
-		}
-		else if ( m_eWeaponType == WEAPONTYPE_HELICANNON )
-		{
-			TheCamera.Cams[TheCamera.ActiveCam].Beta  += float((CGeneral::GetRandomNumber() & 127) - 64) * 0.0001f;
-			TheCamera.Cams[TheCamera.ActiveCam].Alpha += float((CGeneral::GetRandomNumber() & 127) - 64) * 0.0001f;
+		float mult;
+		switch (m_eWeaponType) {
+			case WEAPONTYPE_M4:
+			case WEAPONTYPE_HELICANNON:
+			case WEAPONTYPE_M60:
+				mult = 0.0003f;
+				break;
+			case WEAPONTYPE_RUGER:
+				mult = 0.00015f;
+				break;
+			default:
+				mult = 0.0002f;
+				break;
 		}
+
+		if (FindPlayerPed()->bIsDucking || FindPlayerPed()->m_attachedTo)
+			mult *= 0.3f;
+
+		TheCamera.Cams[TheCamera.ActiveCam].Beta  += float((CGeneral::GetRandomNumber() & 127) - 64) * mult;
+		TheCamera.Cams[TheCamera.ActiveCam].Alpha += float((CGeneral::GetRandomNumber() & 127) - 64) * mult;
 	}
 
 	return true;
 }
 
 bool
-CWeapon::FireInstantHitFromCar(CAutomobile *shooter, bool left)
+CWeapon::FireInstantHitFromCar(CVehicle *shooter, bool left, bool right)
 {
+// TODO(MIAMI): bikes
 	CWeaponInfo *info = GetInfo();
 
 	CVehicleModelInfo *modelInfo = shooter->GetModelInfo();
@@ -1995,8 +2391,10 @@ CWeapon::Reload(void)
 }
 
 void
-CWeapon::Update(int32 audioEntity)
+CWeapon::Update(int32 audioEntity, CPed *pedToAdjustSound)
 {
+	CWeaponInfo *info = GetInfo();
+
 	switch ( m_eWeaponState )
 	{
 		case WEAPONSTATE_MELEE_MADECONTACT:
@@ -2007,9 +2405,9 @@ CWeapon::Update(int32 audioEntity)
 
 		case WEAPONSTATE_FIRING:
 		{
-			if ( m_eWeaponType == WEAPONTYPE_SHOTGUN && AEHANDLE_IS_OK(audioEntity) )
+			if ( IsShotgun(m_eWeaponType) && AEHANDLE_IS_OK(audioEntity) )
 			{
-				uint32 timePassed = m_nTimer - gReloadSampleTime[WEAPONTYPE_SHOTGUN];
+				uint32 timePassed = m_nTimer - gReloadSampleTime[m_eWeaponType];
 				if ( CTimer::GetPreviousTimeInMilliseconds() < timePassed && CTimer::GetTimeInMilliseconds() >= timePassed )
 					DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, 0.0f);
 			}
@@ -2027,11 +2425,59 @@ CWeapon::Update(int32 audioEntity)
 
 		case WEAPONSTATE_RELOADING:
 		{
-			if  ( AEHANDLE_IS_OK(audioEntity) && m_eWeaponType < WEAPONTYPE_LAST_WEAPONTYPE )
+			if  ( AEHANDLE_IS_OK(audioEntity) && m_eWeaponType < WEAPONTYPE_TOTALWEAPONS)
 			{
-				uint32 timePassed = m_nTimer - gReloadSampleTime[m_eWeaponType];
-				if ( CTimer::GetPreviousTimeInMilliseconds() < timePassed && CTimer::GetTimeInMilliseconds() >= timePassed )
-					DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, 0.0f);
+				CAnimBlendAssociation *reloadAssoc = nil;
+				if (pedToAdjustSound) {
+					if (CPed::GetReloadAnim(info) && (!CWorld::Players[CWorld::PlayerInFocus].m_bFastReload || !pedToAdjustSound->IsPlayer())) {
+						reloadAssoc = RpAnimBlendClumpGetAssociation(pedToAdjustSound->GetClump(), CPed::GetReloadAnim(info));
+						if (!reloadAssoc) {
+							reloadAssoc = RpAnimBlendClumpGetAssociation(pedToAdjustSound->GetClump(), CPed::GetCrouchReloadAnim(info));
+						}
+					}
+				}
+				if (reloadAssoc && reloadAssoc->IsRunning() && reloadAssoc->blendAmount > 0.2f) {
+					float soundStart = 0.75f;
+					switch (info->m_AnimToPlay) {
+						case ASSOCGRP_PYTHON:
+							soundStart = 0.5f;
+							break;
+						case ASSOCGRP_COLT:
+						case ASSOCGRP_TEC:
+							soundStart = 0.7f;
+							break;
+						case ASSOCGRP_UZI:
+							soundStart = 0.75f;
+							break;
+						case ASSOCGRP_RIFLE:
+							soundStart = 0.75f;
+							break;
+						case ASSOCGRP_M60:
+							soundStart = 0.7f;
+							break;
+						default:
+							break;
+					}
+					if (reloadAssoc->GetProgress() >= soundStart && (reloadAssoc->currentTime - reloadAssoc->timeStep) / reloadAssoc->hierarchy->totalLength < soundStart) {
+#ifdef AUDIO_NOT_READY
+						DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, 0.0f);
+#else
+						DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, m_eWeaponType);
+#endif
+					}
+					if (CTimer::GetTimeInMilliseconds() > m_nTimer && reloadAssoc->GetProgress() < 0.9f) {
+						m_nTimer = CTimer::GetTimeInMilliseconds();
+					}
+				} else {
+					uint32 timePassed = m_nTimer - gReloadSampleTime[m_eWeaponType];
+					if (CTimer::GetPreviousTimeInMilliseconds() < timePassed && CTimer::GetTimeInMilliseconds() >= timePassed) {
+#ifdef AUDIO_NOT_READY
+						DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, 0.0f);
+#else
+						DMAudio.PlayOneShot(audioEntity, SOUND_WEAPON_RELOAD, m_eWeaponType);
+#endif
+					}
+				}
 			}
 
 			if ( CTimer::GetTimeInMilliseconds() > m_nTimer )
@@ -2154,13 +2600,15 @@ FireOneInstantHitRound(CVector *source, CVector *target, int32 damage)
 bool
 CWeapon::IsTypeMelee(void)
 {
-	return m_eWeaponType == WEAPONTYPE_UNARMED || m_eWeaponType == WEAPONTYPE_BASEBALLBAT;
+	return CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_eWeaponFire == WEAPON_FIRE_MELEE;
 }
 
 bool
 CWeapon::IsType2Handed(void)
 {
-	return m_eWeaponType >= WEAPONTYPE_SHOTGUN && m_eWeaponType <= WEAPONTYPE_FLAMETHROWER && m_eWeaponType != WEAPONTYPE_ROCKETLAUNCHER;
+	return m_eWeaponType == WEAPONTYPE_FLAMETHROWER || m_eWeaponType == WEAPONTYPE_HELICANNON || m_eWeaponType == WEAPONTYPE_M60 ||
+		m_eWeaponType == WEAPONTYPE_M4 || IsShotgun(m_eWeaponType) ||
+		m_eWeaponType == WEAPONTYPE_RUGER || m_eWeaponType == WEAPONTYPE_SNIPERRIFLE || m_eWeaponType == WEAPONTYPE_LASERSCOPE;
 }
 
 void
@@ -2267,13 +2715,15 @@ CWeapon::BlowUpExplosiveThings(CEntity *thing)
 bool
 CWeapon::HasWeaponAmmoToBeUsed(void)
 {
-	switch (m_eWeaponType) {
-		case WEAPONTYPE_UNARMED:
-		case WEAPONTYPE_BASEBALLBAT:
-			return true;
-		default:
-			return m_nAmmoTotal != 0;
-	}
+	// FIX: This is better (not bug tho)
+#if 0
+	if (m_eWeaponType <= WEAPONTYPE_CHAINSAW)
+#else
+	if (CWeaponInfo::GetWeaponInfo(m_eWeaponType)->m_eWeaponFire == WEAPON_FIRE_MELEE)
+#endif
+		return true;
+	else
+		return m_nAmmoTotal != 0;
 }
 
 bool
@@ -2282,6 +2732,71 @@ CWeapon::ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPo
 	return CWorld::ProcessLineOfSight(point1, point2, point, entity, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, ignoreSeeThrough, ignoreSomeObjects);
 }
 
+void
+CWeapon::AddGunFlashBigGuns(CVector start, CVector end)
+{
+	CPointLights::AddLight(CPointLights::LIGHT_POINT,
+		start, CVector(0.0f, 0.0f, 0.0f), 5.0f,
+		1.0f, 0.8f, 0.0f, CPointLights::FOG_NONE, false);
+	CVector gunflashPos = start;
+
+	CVector shootVec = end - start;
+
+	// Wtf did you do there R*?
+	shootVec.Normalise();
+	CVector2D ahead = shootVec;
+	ahead.Normalise();
+
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.08f);
+	gunflashPos += CVector(0.06f * ahead.x, 0.06f * ahead.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.06f);
+	gunflashPos += CVector(0.06f * ahead.x, 0.06f * ahead.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.06f);
+
+	gunflashPos = start;
+	gunflashPos += CVector(-0.1f * ahead.x, -0.1f * ahead.y, 0.0f);
+	gunflashPos.z += 0.04f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
+	gunflashPos.z += 0.04f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+	gunflashPos.z += 0.03f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+
+	gunflashPos = start;
+	gunflashPos += CVector(-0.1f * ahead.x, -0.1f * ahead.y, 0.0f);
+	gunflashPos.z -= 0.04f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
+	gunflashPos.z -= 0.04f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+	gunflashPos.z -= 0.03f;
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+
+	CVector offset = CrossProduct(CVector(ahead.x, ahead.y, 0.0f), CVector(0.0f, 0.0f, 5.0f));
+	offset.Normalise2D();
+
+	gunflashPos = start;
+	gunflashPos += CVector(-0.1f * ahead.x, -0.1f * ahead.y, 0.0f);
+	gunflashPos += CVector(0.06f * offset.x, 0.06f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
+	gunflashPos += CVector(0.04f * offset.x, 0.04f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.03f);
+	gunflashPos += CVector(0.03f * offset.x, 0.03f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+
+	gunflashPos = start;
+	gunflashPos += CVector(-0.1f * ahead.x, -0.1f * ahead.y, 0.0f);
+	gunflashPos -= CVector(0.06f * offset.x, 0.06f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.04f);
+	gunflashPos -= CVector(0.04f * offset.x, 0.04f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.03f);
+	gunflashPos -= CVector(0.03f * offset.x, 0.03f * offset.y, 0.0f);
+	CParticle::AddParticle(PARTICLE_GUNFLASH_NOANIM, gunflashPos, CVector(0.0f, 0.0f, 0.0f), nil, 0.02f);
+
+	CVector gunsmokePos = start;
+	float rnd = CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
+	CParticle::AddParticle(PARTICLE_GUNSMOKE2, gunsmokePos, CVector(ahead.x * rnd, ahead.y * rnd, 0.0f));
+}
+
 #ifdef COMPATIBLE_SAVES
 #define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
 #define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index c7685e0d..cb1d9835 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -7,7 +7,8 @@
 
 class CEntity;
 class CPhysical;
-class CAutomobile;
+class CVehicle;
+class CPed;
 struct CColPoint;
 class CWeaponInfo;
 
@@ -24,6 +25,7 @@ public:
 	CWeapon() {
 		m_bAddRotOffset = false;
 	}
+	CWeapon(eWeaponType type, int32 ammo);
 	
 	CWeaponInfo *GetInfo();
 
@@ -32,9 +34,10 @@ public:
 	static void UpdateWeapons    (void);
 	
 	void Initialise(eWeaponType type, int32 ammo);
+	void Shutdown();
 	
 	bool Fire          (CEntity *shooter, CVector *fireSource);
-	bool FireFromCar   (CAutomobile *shooter, bool left);
+	bool FireFromCar   (CVehicle *shooter, bool left, bool right);
 	bool FireMelee     (CEntity *shooter, CVector &fireSource);
 	bool FireInstantHit(CEntity *shooter, CVector *fireSource);
 	
@@ -49,14 +52,14 @@ public:
 	bool FireAreaEffect       (CEntity *shooter, CVector *fireSource);
 	bool FireSniper           (CEntity *shooter);
 	bool FireM16_1stPerson    (CEntity *shooter);
-	bool FireInstantHitFromCar(CAutomobile *shooter, bool left);
+	bool FireInstantHitFromCar(CVehicle *shooter, bool left, bool right);
 	
 	static void DoDoomAiming       (CEntity *shooter, CVector *source, CVector *target);
 	static void DoTankDoomAiming   (CEntity *shooter, CEntity *driver, CVector *source, CVector *target);
 	static void DoDriveByAutoAiming(CEntity *shooter, CVector *source, CVector *target);
 	
 	void Reload(void);
-	void Update(int32 audioEntity);
+	void Update(int32 audioEntity, CPed *pedToAdjustSound);
 	bool IsTypeMelee  (void);
 	bool IsType2Handed(void);
 	
@@ -65,7 +68,10 @@ public:
 	bool HitsGround(CEntity *holder, CVector *fireSource, CEntity *aimingTo);
 	static void BlowUpExplosiveThings(CEntity *thing);
 	bool HasWeaponAmmoToBeUsed(void);
+	static void AddGunFlashBigGuns(CVector, CVector);
 	
+	static bool IsShotgun(int weapon) { return weapon == WEAPONTYPE_SHOTGUN || weapon == WEAPONTYPE_SPAS12_SHOTGUN || weapon == WEAPONTYPE_STUBBY_SHOTGUN; }
+
 	static bool ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPoint &point, CEntity *&entity, eWeaponType type, CEntity *shooter, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects);
 
 #ifdef COMPATIBLE_SAVES
diff --git a/src/weapons/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp
index 46195d2c..fb50bbe0 100644
--- a/src/weapons/WeaponEffects.cpp
+++ b/src/weapons/WeaponEffects.cpp
@@ -36,7 +36,7 @@ CWeaponEffects::Init(void)
 	int32 slot = CTxdStore::FindTxdSlot("particle");
 	CTxdStore::SetCurrentTxd(slot);
 	
-	gpCrossHairTex    = RwTextureRead("crosshair", nil);
+	gpCrossHairTex    = RwTextureRead("target256", "target256m");
 	gpCrossHairRaster = RwTextureGetRaster(gpCrossHairTex);
 	
 	CTxdStore::PopCurrentTxd();
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp
index c4ab75d2..bd53d8c5 100644
--- a/src/weapons/WeaponInfo.cpp
+++ b/src/weapons/WeaponInfo.cpp
@@ -6,70 +6,119 @@
 #include "AnimManager.h"
 #include "AnimBlendAssociation.h"
 #include "Weapon.h"
+#include "ModelInfo.h"
+#include "ModelIndices.h"
+
+// Yeah...
+int32 CWeaponInfo::ms_aMaxAmmoForWeapon[WEAPONTYPE_TOTALWEAPONS] = {
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	-1, -1, -1, -1, -1, -1, -1, -1, -1
+};
 
 CWeaponInfo CWeaponInfo::ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS];
 
+// --MIAMI: Todo
 static char ms_aWeaponNames[][32] = {
 	"Unarmed",
+	"BrassKnuckle",
+	"ScrewDriver",
+	"GolfClub",
+	"NightStick",
+	"Knife",
 	"BaseballBat",
+	"Hammer",
+	"Cleaver",
+	"Machete",
+	"Katana",
+	"Chainsaw",
+	"Grenade",
+	"DetonateGrenade",
+	"TearGas",
+	"Molotov",
+	"Rocket",
 	"Colt45",
-	"Uzi",
+	"Python",
 	"Shotgun",
-	"AK47",
-	"M16",
+	"Spas12Shotgun",
+	"StubbyShotgun",
+	"Tec9",
+	"Uzi",
+	"SilencedIngram",
+	"Mp5",
+	"m4",
+	"Ruger",
 	"SniperRifle",
+	"LaserScope",
 	"RocketLauncher",
 	"FlameThrower",
-	"Molotov",
-	"Grenade",
+	"M60",
+	"Minigun",
 	"Detonator",
-	"HeliCannon"
+	"HeliCannon",
+	"Camera",
 };
 
 CWeaponInfo*
-CWeaponInfo::GetWeaponInfo(eWeaponType weaponType) {
+CWeaponInfo::GetWeaponInfo(eWeaponType weaponType)
+{
 	return &CWeaponInfo::ms_apWeaponInfos[weaponType];
 }
 
+// --MIAMI: done except WEAPONTYPE_TOTALWEAPONS value
 void
 CWeaponInfo::Initialise(void)
 {
 	debug("Initialising CWeaponInfo...\n");
 	for (int i = 0; i < WEAPONTYPE_TOTALWEAPONS; i++) {
 		ms_apWeaponInfos[i].m_eWeaponFire = WEAPON_FIRE_INSTANT_HIT;
-		ms_apWeaponInfos[i].m_AnimToPlay = ANIM_PUNCH_R;
-		ms_apWeaponInfos[i].m_Anim2ToPlay = NUM_ANIMS;
+		ms_apWeaponInfos[i].m_fRange = 0.0f;
+		ms_apWeaponInfos[i].m_nFiringRate = 0;
+		ms_apWeaponInfos[i].m_nReload = 0;
+		ms_apWeaponInfos[i].m_nAmountofAmmunition = 0;
+		ms_apWeaponInfos[i].m_nDamage = 0;
+		ms_apWeaponInfos[i].m_fSpeed = 0.0f;
+		ms_apWeaponInfos[i].m_fRadius = 0.0f;
+		ms_apWeaponInfos[i].m_fLifespan = 0.0f;
+		ms_apWeaponInfos[i].m_fSpread = 0.0f;
+		ms_apWeaponInfos[i].m_vecFireOffset = CVector(0.0f, 0.0f, 0.0f);
+		ms_apWeaponInfos[i].m_AnimToPlay = ASSOCGRP_UNARMED;
+		ms_apWeaponInfos[i].m_fAnimLoopStart = 0.0f;
+		ms_apWeaponInfos[i].m_fAnimLoopEnd = 0.0f;
+		ms_apWeaponInfos[i].m_fAnimFrameFire = 0.0f;
+		ms_apWeaponInfos[i].m_fAnim2LoopStart = 0.0f;
+		ms_apWeaponInfos[i].m_fAnim2LoopEnd = 0.0f;
+		ms_apWeaponInfos[i].m_fAnim2FrameFire = 0.0f;
+		ms_apWeaponInfos[i].m_fAnimBreakout = 0.0f;
 		ms_apWeaponInfos[i].m_bUseGravity = 1;
 		ms_apWeaponInfos[i].m_bSlowsDown = 1;
 		ms_apWeaponInfos[i].m_bRandSpeed = 1;
 		ms_apWeaponInfos[i].m_bExpands = 1;
 		ms_apWeaponInfos[i].m_bExplodes = 1;
+		ms_apWeaponInfos[i].m_nWeaponSlot = 0;
 	}
 	debug("Loading weapon data...\n");
 	LoadWeaponData();
 	debug("CWeaponInfo ready\n");
 }
 
+// --MIAMI: Done, commented parts wait for weapons port
 void
 CWeaponInfo::LoadWeaponData(void)
 {
 	float spread, speed, lifeSpan, radius;
 	float range, fireOffsetX, fireOffsetY, fireOffsetZ;
-	float delayBetweenAnimAndFire, delayBetweenAnim2AndFire, animLoopStart, animLoopEnd;
+	float anim2LoopStart, anim2LoopEnd, delayBetweenAnim2AndFire, animBreakout;
+	float delayBetweenAnimAndFire, animLoopStart, animLoopEnd;
 	int flags, ammoAmount, damage, reload, weaponType;
-	int firingRate, modelId;
+	int firingRate, modelId, modelId2, weaponSlot;
 	char line[256], weaponName[32], fireType[32];
-	char animToPlay[32], anim2ToPlay[32];
-
-	CAnimBlendAssociation *animAssoc;
-	AnimationId animId;
+	char animToPlay[32];
 
 	int bp, buflen;
 	int lp, linelen;
 		
 	CFileMgr::SetDir("DATA");
 	buflen = CFileMgr::LoadFile("WEAPON.DAT", work_buff, sizeof(work_buff), "r");
-	CFileMgr::SetDir("");
 
 	for (bp = 0; bp < buflen; ) {
 		// read file line by line
@@ -101,10 +150,9 @@ CWeaponInfo::LoadWeaponData(void)
 		fireType[0] = '\0';
 		fireOffsetY = 0.0f;
 		fireOffsetZ = 0.0f;
-		animId = ANIM_WALK;
 		sscanf(
 			&line[lp],
-			"%s %s %f %d %d %d %d %f %f %f %f %f %f %f %s %s %f %f %f %f %d %d",
+			"%s %s %f %d %d %d %d %f %f %f %f %f %f %f %s %f %f %f %f %f %f %f %d %d %x %d",
 			weaponName,
 			fireType,
 			&range,
@@ -120,27 +168,23 @@ CWeaponInfo::LoadWeaponData(void)
 			&fireOffsetY,
 			&fireOffsetZ,
 			animToPlay,
-			anim2ToPlay,
 			&animLoopStart,
 			&animLoopEnd,
 			&delayBetweenAnimAndFire,
+			&anim2LoopStart,
+			&anim2LoopEnd,
 			&delayBetweenAnim2AndFire,
+			&animBreakout,
 			&modelId,
-			&flags);
+			&modelId2,
+			&flags,
+			&weaponSlot);
 
 		if (strncmp(weaponName, "ENDWEAPONDATA", 13) == 0)
 			return;
 
 		weaponType = FindWeaponType(weaponName);
 
-		animAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, animToPlay);
-		animId = static_cast<AnimationId>(animAssoc->animId);
-
-		if (strncmp(anim2ToPlay, "null", 4) != 0) {
-			animAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, anim2ToPlay);
-			ms_apWeaponInfos[weaponType].m_Anim2ToPlay = (AnimationId) animAssoc->animId;
-		}
-
 		CVector vecFireOffset(fireOffsetX, fireOffsetY, fireOffsetZ);
 
 		ms_apWeaponInfos[weaponType].m_eWeaponFire = FindWeaponFireType(fireType);
@@ -154,12 +198,16 @@ CWeaponInfo::LoadWeaponData(void)
 		ms_apWeaponInfos[weaponType].m_fLifespan = lifeSpan;
 		ms_apWeaponInfos[weaponType].m_fSpread = spread;
 		ms_apWeaponInfos[weaponType].m_vecFireOffset = vecFireOffset;
-		ms_apWeaponInfos[weaponType].m_AnimToPlay = animId;
 		ms_apWeaponInfos[weaponType].m_fAnimLoopStart = animLoopStart / 30.0f;
 		ms_apWeaponInfos[weaponType].m_fAnimLoopEnd = animLoopEnd / 30.0f;
+		ms_apWeaponInfos[weaponType].m_fAnim2LoopStart = anim2LoopStart / 30.0f;
+		ms_apWeaponInfos[weaponType].m_fAnim2LoopEnd = anim2LoopEnd / 30.0f;
 		ms_apWeaponInfos[weaponType].m_fAnimFrameFire = delayBetweenAnimAndFire / 30.0f;
 		ms_apWeaponInfos[weaponType].m_fAnim2FrameFire = delayBetweenAnim2AndFire / 30.0f;
+		ms_apWeaponInfos[weaponType].m_fAnimBreakout = animBreakout / 30.0f;
 		ms_apWeaponInfos[weaponType].m_nModelId = modelId;
+		ms_apWeaponInfos[weaponType].m_nModel2Id = modelId2;
+
 		ms_apWeaponInfos[weaponType].m_bUseGravity = flags;
 		ms_apWeaponInfos[weaponType].m_bSlowsDown = flags >> 1;
 		ms_apWeaponInfos[weaponType].m_bDissipates = flags >> 2;
@@ -171,6 +219,37 @@ CWeaponInfo::LoadWeaponData(void)
 		ms_apWeaponInfos[weaponType].m_b1stPerson = flags >> 8;
 		ms_apWeaponInfos[weaponType].m_bHeavy = flags >> 9;
 		ms_apWeaponInfos[weaponType].m_bThrow = flags >> 10;
+		ms_apWeaponInfos[weaponType].m_bReloadLoop2Start = flags >> 11;
+		ms_apWeaponInfos[weaponType].m_bUse2nd = flags >> 12;
+		ms_apWeaponInfos[weaponType].m_bGround2nd = flags >> 13;
+		ms_apWeaponInfos[weaponType].m_bFinish3rd = flags >> 14;
+		ms_apWeaponInfos[weaponType].m_bReload = flags >> 15;
+		ms_apWeaponInfos[weaponType].m_bFightMode = flags >> 16;
+		ms_apWeaponInfos[weaponType].m_bCrouchFire = flags >> 17;
+		ms_apWeaponInfos[weaponType].m_bCop3rd = flags >> 18;
+		ms_apWeaponInfos[weaponType].m_bGround3rd = flags >> 19;
+		ms_apWeaponInfos[weaponType].m_bPartialAttack = flags >> 20;
+		ms_apWeaponInfos[weaponType].m_bAnimDetonate = flags >> 21;
+
+		ms_apWeaponInfos[weaponType].m_nWeaponSlot = weaponSlot;
+
+		if (animLoopEnd < 98.0f && weaponType != WEAPONTYPE_FLAMETHROWER && !CWeapon::IsShotgun(weaponType))
+			ms_apWeaponInfos[weaponType].m_nFiringRate = ((ms_apWeaponInfos[weaponType].m_fAnimLoopEnd - ms_apWeaponInfos[weaponType].m_fAnimLoopStart) * 900.0f);
+
+		if (weaponType == WEAPONTYPE_DETONATOR || weaponType == WEAPONTYPE_HELICANNON)
+			modelId = -1;
+		else if (weaponType == WEAPONTYPE_DETONATOR_GRENADE)
+			modelId = MI_BOMB;
+
+		if (modelId != -1)
+			((CWeaponModelInfo*)CModelInfo::GetModelInfo(modelId))->SetWeaponInfo(weaponType);
+
+		for (int i = 0; i < NUM_ANIM_ASSOC_GROUPS; i++) {
+			if (!strcmp(animToPlay, CAnimManager::GetAnimGroupName((AssocGroupId)i))) {
+				ms_apWeaponInfos[weaponType].m_AnimToPlay = (AssocGroupId)i;
+				break;
+			}
+		}
 	}
 }
 
@@ -192,6 +271,7 @@ CWeaponInfo::FindWeaponFireType(char *name)
 	if (strcmp(name, "INSTANT_HIT") == 0) return WEAPON_FIRE_INSTANT_HIT;
 	if (strcmp(name, "PROJECTILE") == 0) return WEAPON_FIRE_PROJECTILE;
 	if (strcmp(name, "AREA_EFFECT") == 0) return WEAPON_FIRE_AREA_EFFECT;
+	if (strcmp(name, "CAMERA") == 0) return WEAPON_FIRE_CAMERA;
 	Error("Unknown weapon fire type, WeaponInfo.cpp");
 	return WEAPON_FIRE_INSTANT_HIT;
 }
diff --git a/src/weapons/WeaponInfo.h b/src/weapons/WeaponInfo.h
index c89dd482..e7013004 100644
--- a/src/weapons/WeaponInfo.h
+++ b/src/weapons/WeaponInfo.h
@@ -1,12 +1,16 @@
 #pragma once
 
+#include "AnimManager.h"
 #include "AnimationId.h"
 #include "WeaponType.h"
 
+enum AssocGroupId;
+
 class CWeaponInfo {
-//	static CWeaponInfo(&ms_apWeaponInfos)[14];
-	static CWeaponInfo ms_apWeaponInfos[WEAPONTYPE_LAST_WEAPONTYPE];
+	static CWeaponInfo ms_apWeaponInfos[WEAPONTYPE_TOTALWEAPONS];
 public:
+	static int32 ms_aMaxAmmoForWeapon[WEAPONTYPE_TOTALWEAPONS];
+
 	eWeaponFire m_eWeaponFire;
 	float m_fRange;
 	uint32 m_nFiringRate;
@@ -18,13 +22,16 @@ public:
 	float m_fLifespan;
 	float m_fSpread;
 	CVector m_vecFireOffset;
-	AnimationId m_AnimToPlay;
-	AnimationId m_Anim2ToPlay;
+	AssocGroupId m_AnimToPlay;
 	float m_fAnimLoopStart;
 	float m_fAnimLoopEnd;
 	float m_fAnimFrameFire;
+	float m_fAnim2LoopStart;
+	float m_fAnim2LoopEnd;
 	float m_fAnim2FrameFire;
+	float m_fAnimBreakout;
 	int32 m_nModelId;
+	int32 m_nModel2Id;
 	// flags
 	uint8 m_bUseGravity : 1;
 	uint8 m_bSlowsDown : 1;
@@ -34,9 +41,24 @@ public:
 	uint8 m_bExplodes : 1;
 	uint8 m_bCanAim : 1;
 	uint8 m_bCanAimWithArm : 1;
+
 	uint8 m_b1stPerson : 1;
 	uint8 m_bHeavy : 1;
 	uint8 m_bThrow : 1;
+	uint8 m_bReloadLoop2Start : 1;
+	uint8 m_bUse2nd : 1;
+	uint8 m_bGround2nd : 1;
+	uint8 m_bFinish3rd : 1;
+	uint8 m_bReload : 1;
+	
+	uint8 m_bFightMode : 1;
+	uint8 m_bCrouchFire : 1;
+	uint8 m_bCop3rd : 1;
+	uint8 m_bGround3rd : 1;
+	uint8 m_bPartialAttack : 1;
+	uint8 m_bAnimDetonate : 1;
+
+	uint32 m_nWeaponSlot;
 
 	static void Initialise(void);
 	static void LoadWeaponData(void);
@@ -46,4 +68,4 @@ public:
 	static void Shutdown(void);
 };
 
-VALIDATE_SIZE(CWeaponInfo, 0x54);
\ No newline at end of file
+VALIDATE_SIZE(CWeaponInfo, 0x64);
diff --git a/src/weapons/WeaponType.h b/src/weapons/WeaponType.h
index b45740b7..65d715ec 100644
--- a/src/weapons/WeaponType.h
+++ b/src/weapons/WeaponType.h
@@ -3,20 +3,44 @@
 enum eWeaponType
 {
 	WEAPONTYPE_UNARMED,
+	WEAPONTYPE_BRASSKNUCKLE,
+	WEAPONTYPE_SCREWDRIVER,
+	WEAPONTYPE_GOLFCLUB,
+	WEAPONTYPE_NIGHTSTICK,
+	WEAPONTYPE_KNIFE,
 	WEAPONTYPE_BASEBALLBAT,
+	WEAPONTYPE_HAMMER,
+	WEAPONTYPE_CLEAVER,
+	WEAPONTYPE_MACHETE,
+	WEAPONTYPE_KATANA,
+	WEAPONTYPE_CHAINSAW,
+	WEAPONTYPE_GRENADE,
+	WEAPONTYPE_DETONATOR_GRENADE,
+	WEAPONTYPE_TEARGAS,
+	WEAPONTYPE_MOLOTOV,
+	WEAPONTYPE_ROCKET,
 	WEAPONTYPE_COLT45,
-	WEAPONTYPE_UZI,
+	WEAPONTYPE_PYTHON,
 	WEAPONTYPE_SHOTGUN,
-	WEAPONTYPE_AK47,
-	WEAPONTYPE_M16,
+	WEAPONTYPE_SPAS12_SHOTGUN,
+	WEAPONTYPE_STUBBY_SHOTGUN,
+	WEAPONTYPE_TEC9,
+	WEAPONTYPE_UZI,
+	WEAPONTYPE_SILENCED_INGRAM,
+	WEAPONTYPE_MP5,
+	WEAPONTYPE_M4,
+	WEAPONTYPE_RUGER,
 	WEAPONTYPE_SNIPERRIFLE,
+	WEAPONTYPE_LASERSCOPE,
 	WEAPONTYPE_ROCKETLAUNCHER,
 	WEAPONTYPE_FLAMETHROWER,
-	WEAPONTYPE_MOLOTOV,
-	WEAPONTYPE_GRENADE,
+	WEAPONTYPE_M60,
+	WEAPONTYPE_MINIGUN,
 	WEAPONTYPE_DETONATOR,
 	WEAPONTYPE_HELICANNON,
-	WEAPONTYPE_LAST_WEAPONTYPE,
+	WEAPONTYPE_CAMERA,
+	WEAPONTYPE_TOTALWEAPONS = 37,
+	WEAPONTYPE_HEALTH = 37,
 	WEAPONTYPE_ARMOUR,
 	WEAPONTYPE_RAMMEDBYCAR,
 	WEAPONTYPE_RUNOVERBYCAR,
@@ -25,9 +49,12 @@ enum eWeaponType
 	WEAPONTYPE_DROWNING,
 	WEAPONTYPE_FALL,
 	WEAPONTYPE_UNIDENTIFIED,
-	
-	WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
-	WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
+	WEAPONTYPE_ANYMELEE,
+	WEAPONTYPE_ANYWEAPON
+};
+
+enum {
+	TOTAL_WEAPON_SLOTS = 10,
 };
 
 enum eWeaponFire {
@@ -35,7 +62,7 @@ enum eWeaponFire {
 	WEAPON_FIRE_INSTANT_HIT,
 	WEAPON_FIRE_PROJECTILE,
 	WEAPON_FIRE_AREA_EFFECT,
-	WEAPON_FIRE_USE
+	WEAPON_FIRE_CAMERA
 };
 
 // Taken from MTA SA, seems it's unchanged