Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

115 files changed, 3066 insertions, 2141 deletions

diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp
index 28d30ec7d1..7618259e69 100644
--- a/engines/lastexpress/data/animation.cpp
+++ b/engines/lastexpress/data/animation.cpp
@@ -32,10 +32,8 @@
 
 #include "common/events.h"
 #include "common/rational.h"
-#include "common/rect.h"
 #include "common/stream.h"
 #include "common/system.h"
-#include "common/textconsole.h"
 
 #include "engines/engine.h"
 
@@ -232,7 +230,7 @@ AnimFrame *Animation::processChunkFrame(Common::SeekableReadStream *in, const Ch
 	i.read(str, false);
 
 	// Decode the frame
-	AnimFrame *f = new AnimFrame(str, i);
+	AnimFrame *f = new AnimFrame(str, i, true);
 
 	// Delete the temporary chunk buffer
 	delete str;
@@ -250,7 +248,7 @@ void Animation::processChunkAudio(Common::SeekableReadStream *in, const Chunk &c
 		// Read Snd header
 		uint32 header1 = in->readUint32LE();
 		uint16 header2 = in->readUint16LE();
-		warning("Start ADPCM: %d, %d", header1, header2);
+		debugC(4, kLastExpressDebugSound, "Start ADPCM: %d, %d", header1, header2);
 		size -= 6;
 	}
 
@@ -272,7 +270,7 @@ void Animation::play() {
 			draw(s);
 
 			// XXX: Update the screen
-			g_system->copyRectToScreen((byte *)s->pixels, s->pitch, 0, 0, s->w, s->h);
+			g_system->copyRectToScreen(s->pixels, s->pitch, 0, 0, s->w, s->h);
 
 			// Free the temporary surface
 			s->free();
diff --git a/engines/lastexpress/data/background.cpp b/engines/lastexpress/data/background.cpp
index 3d866c26f9..60379251a3 100644
--- a/engines/lastexpress/data/background.cpp
+++ b/engines/lastexpress/data/background.cpp
@@ -107,6 +107,7 @@ byte *Background::decodeComponent(Common::SeekableReadStream *in, uint32 inSize,
 		return NULL;
 
 	// Initialize the decoding
+	memset(out, 0, outSize * sizeof(byte));
 	uint32 inPos = 0;
 	uint32 outPos = 0;
 
diff --git a/engines/lastexpress/data/cursor.cpp b/engines/lastexpress/data/cursor.cpp
index 86a66b49d9..d176d963d1 100644
--- a/engines/lastexpress/data/cursor.cpp
+++ b/engines/lastexpress/data/cursor.cpp
@@ -91,9 +91,9 @@ void Cursor::setStyle(CursorStyle style) {
 
 	// Reuse the screen pixel format
 	Graphics::PixelFormat pf = g_system->getScreenFormat();
-	CursorMan.replaceCursor((const byte *)getCursorImage(style),
+	CursorMan.replaceCursor(getCursorImage(style),
 	                        32, 32, _cursors[style].hotspotX, _cursors[style].hotspotY,
-	                        0, 1, &pf);
+	                        0, false, &pf);
 }
 
 const uint16 *Cursor::getCursorImage(CursorStyle style) const {
@@ -128,7 +128,7 @@ Common::Rect Icon::draw(Graphics::Surface *surface) {
 		for (int i = 0; i < 32; i++) {
 
 			// Adjust brightness
-			if (_brightnessIndex == -1)
+			if (_brightnessIndex == -1 || _brightnessIndex >= ARRAYSIZE(brigthnessData))
 				*s = *image;
 			else
 				*s = (*image & brigthnessData[_brightnessIndex]) >> _brightnessIndex;
diff --git a/engines/lastexpress/data/font.cpp b/engines/lastexpress/data/font.cpp
index 79cf64e617..8ac1afce9a 100644
--- a/engines/lastexpress/data/font.cpp
+++ b/engines/lastexpress/data/font.cpp
@@ -149,7 +149,7 @@ uint8 Font::getCharWidth(uint16 c) const{
 uint16 Font::getStringWidth(Common::String str) const {
 	uint16 width = 0;
 	for (uint i = 0; i < str.size(); i++)
-		width += getCharWidth((unsigned) (int)str[i]);
+		width += getCharWidth((unsigned char)str[i]);
 
 	return width;
 }
@@ -185,8 +185,8 @@ void Font::drawChar(Graphics::Surface *surface, int16 x, int16 y, uint16 c) {
 Common::Rect Font::drawString(Graphics::Surface *surface, int16 x, int16 y, Common::String str) {
 	int16 currentX = x;
 	for (uint i = 0; i < str.size(); i++) {
-		drawChar(surface, currentX, y, (unsigned) (int)str[i]);
-		currentX += getCharWidth((unsigned) (int)str[i]);
+		drawChar(surface, currentX, y, (unsigned char)str[i]);
+		currentX += getCharWidth((unsigned char)str[i]);
 	}
 
 	return Common::Rect(x, y, x + currentX, y + (int16)_charHeight);
diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp
index 8f279ffbb3..fdb1ac6d46 100644
--- a/engines/lastexpress/data/scene.cpp
+++ b/engines/lastexpress/data/scene.cpp
@@ -28,7 +28,6 @@
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-#include "common/textconsole.h"
 #include "common/stream.h"
 
 namespace LastExpress {
@@ -122,7 +121,7 @@ bool SceneHotspot::isInside(const Common::Point &point) {
 // Scene
 Scene::~Scene() {
 	// Free the hotspots
-	for (int i = 0; i < (int)_hotspots.size(); i++)
+	for (uint i = 0; i < _hotspots.size(); i++)
 		delete _hotspots[i];
 }
 
@@ -172,7 +171,7 @@ bool Scene::checkHotSpot(const Common::Point &coord, SceneHotspot **hotspot) {
 	bool found = false;
 	int _location = 0;
 
-	for (int i = 0; i < (int)_hotspots.size(); i++) {
+	for (uint i = 0; i < _hotspots.size(); i++) {
 		if (_hotspots[i]->isInside(coord)) {
 			if (_location <= _hotspots[i]->location) {
 				_location = _hotspots[i]->location;
@@ -224,7 +223,7 @@ Common::String Scene::toString() {
 	// Hotspots
 	if (_hotspots.size() != 0) {
 		output += "\nHotspots:\n";
-		for (int i = 0; i < (int)_hotspots.size(); i++)
+		for (uint i = 0; i < _hotspots.size(); i++)
 			output += _hotspots[i]->toString() + "\n";
 	}
 
@@ -241,7 +240,7 @@ SceneLoader::~SceneLoader() {
 
 void SceneLoader::clear() {
 	// Remove all scenes
-	for (int i = 0; i < (int)_scenes.size(); i++)
+	for (uint i = 0; i < _scenes.size(); i++)
 		delete _scenes[i];
 
 	_scenes.clear();
@@ -292,9 +291,9 @@ Scene *SceneLoader::get(SceneIndex index) {
 		return NULL;
 
 	// Load the hotspots if needed
-	_scenes[(int)index]->loadHotspots(_stream);
+	_scenes[(uint)index]->loadHotspots(_stream);
 
-	return _scenes[(int)index];
+	return _scenes[(uint)index];
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp
index a62348f6c0..a5bcba84cd 100644
--- a/engines/lastexpress/data/sequence.cpp
+++ b/engines/lastexpress/data/sequence.cpp
@@ -27,7 +27,6 @@
 #include "lastexpress/debug.h"
 
 #include "common/stream.h"
-#include "common/textconsole.h"
 
 namespace LastExpress {
 
@@ -77,7 +76,7 @@ void FrameInfo::read(Common::SeekableReadStream *in, bool isSequence) {
 
 // AnimFrame
 
-AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f) : _palette(NULL) {
+AnimFrame::AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f, bool ignoreSubtype) : _palette(NULL), _ignoreSubtype(ignoreSubtype) {
 	_palSize = 1;
 	// TODO: use just the needed rectangle
 	_image.create(640, 480, Graphics::PixelFormat::createFormatCLUT8());
diff --git a/engines/lastexpress/data/sequence.h b/engines/lastexpress/data/sequence.h
index 9987eae48e..610a55cebf 100644
--- a/engines/lastexpress/data/sequence.h
+++ b/engines/lastexpress/data/sequence.h
@@ -49,8 +49,9 @@
 	    byte {1}      - Compression type
 	    byte {1}      - Subtype (determines which set of decompression functions will be called) => 0, 1, 2, 3
 	    byte {1}      - Unknown
+	    byte {1}      - Keep previous frame while drawing
+	    byte {1}      - Unknown
 	    byte {1}      - Unknown
-		uint16 {2}    - Unknown
 	    byte {1}      - Sound action
 	    byte {1}      - Unknown
 	    uint32 {4}    - positionId
@@ -129,7 +130,7 @@ struct FrameInfo {
 
 class AnimFrame : public Drawable {
 public:
-	AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f);
+	AnimFrame(Common::SeekableReadStream *in, const FrameInfo &f, bool ignoreSubtype = false);
 	~AnimFrame();
 	Common::Rect draw(Graphics::Surface *s);
 
@@ -146,6 +147,7 @@ private:
 	uint16 _palSize;
 	uint16 *_palette;
 	Common::Rect _rect;
+	bool _ignoreSubtype;
 };
 
 class Sequence {
diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp
index a9bee6155d..a77e4a06c6 100644
--- a/engines/lastexpress/data/snd.cpp
+++ b/engines/lastexpress/data/snd.cpp
@@ -28,11 +28,9 @@
 #include "lastexpress/debug.h"
 
 #include "audio/decoders/adpcm_intern.h"
-#include "audio/audiostream.h"
 #include "common/debug.h"
 #include "common/memstream.h"
 #include "common/system.h"
-#include "common/textconsole.h"
 
 namespace LastExpress {
 
@@ -358,6 +356,8 @@ public:
 			Audio::ADPCMStream(stream, disposeAfterUse, size, 44100, 1, blockSize) {
 		_currentFilterId = -1;
 		_nextFilterId = filterId;
+		_stepAdjust1 = 0;
+		_stepAdjust2 = 0;
 	}
 
 	int readBuffer(int16 *buffer, const int numSamples) {
@@ -378,7 +378,7 @@ public:
 
 				// Get current filter
 				_currentFilterId = _nextFilterId;
-				_nextFilterId = -1;
+				//_nextFilterId = -1; // FIXME: the filter id should be recomputed based on the sound entry status for each block
 
 				// No filter: skip decoding
 				if (_currentFilterId == -1)
@@ -455,7 +455,9 @@ void SimpleSound::play(Audio::AudioStream *as) {
 //////////////////////////////////////////////////////////////////////////
 StreamedSound::StreamedSound() : _as(NULL), _loaded(false) {}
 
-StreamedSound::~StreamedSound() {}
+StreamedSound::~StreamedSound() {
+	_as = NULL;
+}
 
 bool StreamedSound::load(Common::SeekableReadStream *stream, int32 filterId) {
 	if (!stream)
@@ -484,6 +486,9 @@ bool StreamedSound::isFinished() {
 }
 
 void StreamedSound::setFilterId(int32 filterId) {
+	if (!_as)
+		return;
+
 	((LastExpress_ADPCMStream *)_as)->setFilterId(filterId);
 }
 
@@ -521,6 +526,7 @@ void AppendableSound::queueBuffer(Common::SeekableReadStream *bufferIn) {
 	// Setup the ADPCM decoder
 	uint32 sizeIn = (uint32)bufferIn->size();
 	Audio::AudioStream *adpcm = makeDecoder(bufferIn, sizeIn);
+	((LastExpress_ADPCMStream *)adpcm)->setFilterId(16);
 
 	// Queue the stream
 	_as->queueAudioStream(adpcm);
diff --git a/engines/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp
index 0be832cbdd..4d19c02aa7 100644
--- a/engines/lastexpress/data/subtitle.cpp
+++ b/engines/lastexpress/data/subtitle.cpp
@@ -32,7 +32,6 @@
 #include "common/debug.h"
 #include "common/rect.h"
 #include "common/stream.h"
-#include "common/textconsole.h"
 
 namespace LastExpress {
 
@@ -151,7 +150,7 @@ SubtitleManager::~SubtitleManager() {
 }
 
 void SubtitleManager::reset() {
-	for (int i = 0; i < (int)_subtitles.size(); i++)
+	for (uint i = 0; i < _subtitles.size(); i++)
 		delete _subtitles[i];
 
 	_subtitles.clear();
@@ -211,10 +210,10 @@ void SubtitleManager::setTime(uint16 time) {
 	_currentIndex = -1;
 
 	// Find the appropriate line to show
-	for (int16 i = 0; i < (int16)_subtitles.size(); i++) {
+	for (uint i = 0; i < _subtitles.size(); i++) {
 		if ((time >= _subtitles[i]->getTimeStart()) && (time <= _subtitles[i]->getTimeStop())) {
 			// Keep the index of the line to show
-			_currentIndex = i;
+			_currentIndex = (int16)i;
 			return;
 		}
 	}
@@ -238,7 +237,7 @@ Common::Rect SubtitleManager::draw(Graphics::Surface *surface) {
 
 	// Draw the current line
 	assert(_currentIndex >= 0 && _currentIndex < (int16)_subtitles.size());
-	return _subtitles[_currentIndex]->draw(surface, _font);
+	return _subtitles[(uint16)_currentIndex]->draw(surface, _font);
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp
index dc2807db63..db3a3e3962 100644
--- a/engines/lastexpress/debug.cpp
+++ b/engines/lastexpress/debug.cpp
@@ -28,13 +28,13 @@
 #include "lastexpress/data/cursor.h"
 #include "lastexpress/data/scene.h"
 #include "lastexpress/data/sequence.h"
-#include "lastexpress/data/snd.h"
 #include "lastexpress/data/subtitle.h"
 
 #include "lastexpress/fight/fight.h"
 
 #include "lastexpress/game/action.h"
 #include "lastexpress/game/beetle.h"
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
@@ -44,15 +44,12 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
 #include "common/debug-channels.h"
-#include "common/events.h"
 #include "common/md5.h"
 
 namespace LastExpress {
@@ -88,7 +85,6 @@ Debugger::Debugger(LastExpressEngine *engine) : _engine(engine), _command(NULL),
 	DCmd_Register("entity",    WRAP_METHOD(Debugger, cmdEntity));
 
 	// Misc
-	DCmd_Register("loadgame",  WRAP_METHOD(Debugger, cmdLoadGame));
 	DCmd_Register("chapter",   WRAP_METHOD(Debugger, cmdSwitchChapter));
 	DCmd_Register("clear",     WRAP_METHOD(Debugger, cmdClear));
 
@@ -142,6 +138,9 @@ void Debugger::copyCommand(int argc, const char **argv) {
 
 	for (int i = 0; i < _numParams; i++) {
 		_commandParams[i] = (char *)malloc(strlen(argv[i]) + 1);
+		if (_commandParams[i] == NULL)
+			error("[Debugger::copyCommand] Cannot allocate memory for command parameters");
+
 		memset(_commandParams[i], 0, strlen(argv[i]) + 1);
 		strcpy(_commandParams[i], argv[i]);
 	}
@@ -155,9 +154,18 @@ void Debugger::callCommand() {
 		(*_command)(_numParams, const_cast<const char **>(_commandParams));
 }
 
-void Debugger::loadArchive(ArchiveIndex index) const {
-	_engine->getResourceManager()->loadArchive(index);
-	getScenes()->loadSceneDataFile(index);
+bool Debugger::loadArchive(int index) {
+	if (index < 1 || index > 3) {
+		DebugPrintf("Invalid cd number (was: %d, valid: [1-3])\n", index);
+		return false;
+	}
+
+	if (!_engine->getResourceManager()->loadArchive((ArchiveIndex)index))
+		return false;
+
+	getScenes()->loadSceneDataFile((ArchiveIndex)index);
+
+	return true;
 }
 
 // Restore loaded archive
@@ -236,8 +244,10 @@ bool Debugger::cmdListFiles(int argc, const char **argv) {
 		Common::String filter(const_cast<char *>(argv[1]));
 
 		// Load the proper archive
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		Common::ArchiveMemberList list;
 		int count = _engine->getResourceManager()->listMatchingMembers(list, filter);
@@ -320,8 +330,10 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) {
 		Common::String filename(const_cast<char *>(argv[1]));
 		filename += ".seq";
 
-		if (argc == 4)
-			loadArchive((ArchiveIndex)getNumber(argv[3]));
+		if (argc == 4) {
+			if (!loadArchive(getNumber(argv[3])))
+				return true;
+		}
 
 		if (!_engine->getResourceManager()->hasFile(filename)) {
 			DebugPrintf("Cannot find file: %s\n", filename.c_str());
@@ -380,8 +392,10 @@ bool Debugger::cmdShowBg(int argc, const char **argv) {
 	if (argc == 2 || argc == 3) {
 		Common::String filename(const_cast<char *>(argv[1]));
 
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		if (!_engine->getResourceManager()->hasFile(filename + ".BG")) {
 			DebugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str());
@@ -433,8 +447,10 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) {
 		Common::String filename(const_cast<char *>(argv[1]));
 		filename += ".seq";
 
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		if (!_engine->getResourceManager()->hasFile(filename)) {
 			DebugPrintf("Cannot find file: %s\n", filename.c_str());
@@ -508,8 +524,10 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) {
 bool Debugger::cmdPlaySnd(int argc, const char **argv) {
 	if (argc == 2 || argc == 3) {
 
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		// Add .SND at the end of the filename if needed
 		Common::String name(const_cast<char *>(argv[1]));
@@ -523,7 +541,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) {
 
 		_engine->_system->getMixer()->stopAll();
 
-		_soundStream->load(getArchive(name));
+		_soundStream->load(getArchive(name), 16);
 
 		if (argc == 3)
 			restoreArchive();
@@ -545,8 +563,10 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) {
 	if (argc == 2 || argc == 3) {
 		Common::String filename(const_cast<char *>(argv[1]));
 
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		filename += ".sbe";
 
@@ -608,11 +628,13 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) {
 	if (argc == 2 || argc == 3) {
 		Common::String name(const_cast<char *>(argv[1]));
 
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		// If we got a nis filename, check that the file exists
-		if (name.contains('.') && _engine->getResourceManager()->hasFile(name)) {
+		if (name.contains('.') && !_engine->getResourceManager()->hasFile(name)) {
 			DebugPrintf("Cannot find file: %s\n", name.c_str());
 			return true;
 		}
@@ -665,8 +687,10 @@ bool Debugger::cmdLoadScene(int argc, const char **argv) {
 		SceneIndex index = (SceneIndex)getNumber(argv[1]);
 
 		// Check args
-		if (argc == 3)
-			loadArchive((ArchiveIndex)getNumber(argv[2]));
+		if (argc == 3) {
+			if (!loadArchive(getNumber(argv[2])))
+				return true;
+		}
 
 		if (index > 2500) {
 			DebugPrintf("Error: invalid index value (0-2500)");
@@ -1094,30 +1118,6 @@ label_error:
 }
 
 /**
- * Command: loads a game
- *
- * @param argc The argument count.
- * @param argv The values.
- *
- * @return true if it was handled, false otherwise
- */
-bool Debugger::cmdLoadGame(int argc, const char **argv) {
-	if (argc == 2) {
-		int id = getNumber(argv[1]);
-
-		if (id == 0 || id > 6)
-			goto error;
-
-		getSaveLoad()->loadGame((GameId)(id - 1));
-	} else {
-error:
-		DebugPrintf("Syntax: loadgame <id> (id=1-6)\n");
-	}
-
-	return true;
-}
-
-/**
  * Command: switch to a specific chapter
  *
  * @param argc The argument count.
diff --git a/engines/lastexpress/debug.h b/engines/lastexpress/debug.h
index d9ba6f47a1..532cb83717 100644
--- a/engines/lastexpress/debug.h
+++ b/engines/lastexpress/debug.h
@@ -79,7 +79,6 @@ private:
 	bool cmdShow(int argc, const char **argv);
 	bool cmdEntity(int argc, const char **argv);
 
-	bool cmdLoadGame(int argc, const char **argv);
 	bool cmdSwitchChapter(int argc, const char **argv);
 	bool cmdClear(int argc, const char **argv);
 
@@ -87,7 +86,7 @@ private:
 	void copyCommand(int argc, const char **argv);
 	int getNumber(const char *arg) const;
 
-	void loadArchive(ArchiveIndex index) const;
+	bool loadArchive(int index);
 	void restoreArchive() const;
 
 	Debuglet *_command;
diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp
index 82a6520522..2fdeef910a 100644
--- a/engines/lastexpress/detection.cpp
+++ b/engines/lastexpress/detection.cpp
@@ -173,7 +173,7 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO1(GUIO_NOASPECT)
 	},
-	
+
 	// The Last Express (Russian)
 	//   expressw.exe 1999-04-05 15:33:56
 	//   express.exe  ???
@@ -211,6 +211,7 @@ public:
 		return "LastExpress Engine (C) 1997 Smoking Car Productions";
 	}
 
+protected:
 	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
 };
 
diff --git a/engines/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp
index 301c52e142..406b017d3a 100644
--- a/engines/lastexpress/entities/abbot.cpp
+++ b/engines/lastexpress/entities/abbot.cpp
@@ -34,9 +34,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -60,10 +58,10 @@ Abbot::Abbot(LastExpressEngine *engine) : Entity(engine, kEntityAbbot) {
 	ADD_CALLBACK_FUNCTION(Abbot, chapter2);
 	ADD_CALLBACK_FUNCTION(Abbot, chapter3);
 	ADD_CALLBACK_FUNCTION(Abbot, chapter3Handler);
-	ADD_CALLBACK_FUNCTION(Abbot, function19);
-	ADD_CALLBACK_FUNCTION(Abbot, function20);
-	ADD_CALLBACK_FUNCTION(Abbot, function21);
-	ADD_CALLBACK_FUNCTION(Abbot, function22);
+	ADD_CALLBACK_FUNCTION(Abbot, conversationWithBoutarel);
+	ADD_CALLBACK_FUNCTION(Abbot, readPaper);
+	ADD_CALLBACK_FUNCTION(Abbot, goToLunch);
+	ADD_CALLBACK_FUNCTION(Abbot, haveLunch);
 	ADD_CALLBACK_FUNCTION(Abbot, function23);
 	ADD_CALLBACK_FUNCTION(Abbot, function24);
 	ADD_CALLBACK_FUNCTION(Abbot, function25);
@@ -261,7 +259,7 @@ IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler)
 			getData()->entityPosition = kPosition_6470;
 			getData()->location = kLocationInsideCompartment;
 
-			setup_function19();
+			setup_conversationWithBoutarel();
 			break;
 		}
 		break;
@@ -274,7 +272,7 @@ IMPLEMENT_FUNCTION(18, Abbot, chapter3Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(19, Abbot, function19)
+IMPLEMENT_FUNCTION(19, Abbot, conversationWithBoutarel)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -313,21 +311,21 @@ IMPLEMENT_FUNCTION(19, Abbot, function19)
 
 		case 3:
 			getSavePoints()->push(kEntityAbbot, kEntityBoutarel, kAction122288808);
-			setup_function20();
+			setup_readPaper();
 			break;
 		}
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(20, Abbot, function20)
+IMPLEMENT_FUNCTION(20, Abbot, readPaper)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionNone:
 		if (getState()->time > kTime1966500 && getEntities()->isInRestaurant(kEntityBoutarel))
-			setup_function21();
+			setup_goToLunch();
 		break;
 
 	case kActionDefault:
@@ -337,7 +335,7 @@ IMPLEMENT_FUNCTION(20, Abbot, function20)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(21, Abbot, function21)
+IMPLEMENT_FUNCTION(21, Abbot, goToLunch)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -395,7 +393,7 @@ IMPLEMENT_FUNCTION(21, Abbot, function21)
 			break;
 
 		case 7:
-			setup_function22();
+			setup_haveLunch();
 			break;
 		}
 		break;
@@ -411,13 +409,13 @@ IMPLEMENT_FUNCTION(21, Abbot, function21)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Abbot, function22)
+IMPLEMENT_FUNCTION(22, Abbot, haveLunch)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1971000, params->param1, kEntityAbbot, kEntityServers0, kAction218586752);
+		Entity::timeCheckSavepoint(kTime1971000, params->param1, kEntityAbbot, kEntityServers0, kAction218586752);
 
 		if (getState()->time > kTime1989000 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			getData()->inventoryItem = kItemNone;
@@ -516,7 +514,8 @@ IMPLEMENT_FUNCTION(24, Abbot, function24)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 900);
+		if (!Entity::updateParameter(params->param1, getState()->time, 900))
+			break;
 
 		setup_function25();
 		break;
@@ -617,7 +616,8 @@ IMPLEMENT_FUNCTION(26, Abbot, function26)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, 4500);
+		if (!Entity::updateParameter(params->param2, getState()->time, 4500))
+			break;
 
 		if (getEntities()->isSomebodyInsideRestaurantOrSalon())
 			setup_function27();
@@ -691,7 +691,7 @@ IMPLEMENT_FUNCTION(28, Abbot, function28)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime2052000, params->param1, 1, setup_function29);
+		Entity::timeCheckCallback(kTime2052000, params->param1, 1, WRAP_SETUP_FUNCTION(Abbot, setup_function29));
 		break;
 
 	case kActionDefault:
@@ -770,7 +770,7 @@ IMPLEMENT_FUNCTION(29, Abbot, function29)
 			getSavePoints()->push(kEntityAbbot, kEntityBoutarel, kAction122358304);
 			getEntities()->drawSequenceLeft(kEntityAbbot, "508B");
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -864,7 +864,8 @@ IMPLEMENT_FUNCTION(31, Abbot, function31)
 		if (!params->param1)
 			break;
 
-		UPDATE_PARAM(params->param5, getState()->time, 450);
+		if (!Entity::updateParameter(params->param5, getState()->time, 450))
+			break;
 
 		setCallback(6);
 		setup_callbackActionRestaurantOrSalon();
@@ -920,7 +921,8 @@ IMPLEMENT_FUNCTION(31, Abbot, function31)
 			getSavePoints()->push(kEntityAbbot, kEntityAlexei, kAction122288808);
 			params->param1 = 1;
 
-			UPDATE_PARAM(params->param5, getState()->time, 450);
+			if (!Entity::updateParameter(params->param5, getState()->time, 450))
+				break;
 
 			setCallback(6);
 			setup_callbackActionRestaurantOrSalon();
@@ -1163,7 +1165,8 @@ IMPLEMENT_FUNCTION(36, Abbot, function36)
 			break;
 
 		case 2:
-			UPDATE_PARAM(params->param4, getState()->time, 900);
+			if (!Entity::updateParameter(params->param4, getState()->time, 900))
+				break;
 
 			getSound()->playSound(kEntityAbbot, "Abb3042");
 			break;
@@ -1287,7 +1290,7 @@ IMPLEMENT_FUNCTION_II(40, Abbot, function40, CarIndex, EntityPosition)
 
 	case kActionNone:
 		if (getEntities()->updateEntity(kEntityAbbot, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else if (!getEvent(kEventAbbotInvitationDrink)
 			    && getEntities()->isDistanceBetweenEntities(kEntityAbbot, kEntityPlayer, 1000)
 			    && !getEntities()->isInsideCompartments(kEntityPlayer)
@@ -1302,7 +1305,7 @@ IMPLEMENT_FUNCTION_II(40, Abbot, function40, CarIndex, EntityPosition)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityAbbot, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionCallback:
@@ -1321,7 +1324,7 @@ IMPLEMENT_FUNCTION(41, Abbot, chapter4Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime2358000, params->param1, kEntityAbbot, kEntityServers0, kAction218128129);
+		Entity::timeCheckSavepoint(kTime2358000, params->param1, kEntityAbbot, kEntityServers0, kAction218128129);
 
 		if (getState()->time > kTime2389500 && getEntities()->isSomebodyInsideRestaurantOrSalon())
 			setup_function42();
@@ -1425,10 +1428,12 @@ IMPLEMENT_FUNCTION(43, Abbot, function43)
 		}
 
 label_callback_1:
-		TIME_CHECK(kTime2466000, params->param5, setup_function44);
+		if (Entity::timeCheck(kTime2466000, params->param5, WRAP_SETUP_FUNCTION(Abbot, setup_function44)))
+			break;
 
 		if (params->param3) {
-			UPDATE_PARAM(params->param6, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param6, getState()->timeTicks, 75))
+				break;
 
 			params->param2 = 1;
 			params->param3 = 0;
@@ -1542,7 +1547,7 @@ IMPLEMENT_FUNCTION(45, Abbot, function45)
 		getData()->car = kCarRedSleeping;
 		getData()->location = kLocationOutsideCompartment;
 
-		RESET_ENTITY_STATE(kEntityVerges, Verges, setup_function38);
+		RESET_ENTITY_STATE(kEntityVerges, Verges, setup_resetState);
 
 		getEntities()->drawSequenceLeft(kEntityAbbot, "617Ec");
 		getEntities()->enterCompartment(kEntityAbbot, kObjectCompartmentC, true);
@@ -1646,14 +1651,14 @@ IMPLEMENT_FUNCTION(48, Abbot, function48)
 		if (ENTITY_PARAM(0, 1))
 			getData()->inventoryItem = kItemInvalid;
 
-		UPDATE_PARAM_PROC(params->param1, getState()->time, 1800)
+		if (Entity::updateParameter(params->param1, getState()->time, 1800)) {
 			getData()->inventoryItem = kItemNone;
 
 			setCallback(4);
 			setup_updatePosition("126C", kCarRedSleeping, 52);
-		UPDATE_PARAM_PROC_END
+		}
 
-		TIME_CHECK_CALLBACK_INVENTORY(kTime2533500, params->param2, 5, setup_callbackActionRestaurantOrSalon);
+		Entity::timeCheckCallbackInventory(kTime2533500, params->param2, 5, WRAP_SETUP_FUNCTION(Abbot, setup_callbackActionRestaurantOrSalon));
 		break;
 
 	case kAction1:
@@ -1705,7 +1710,7 @@ IMPLEMENT_FUNCTION(48, Abbot, function48)
 			getEntities()->drawSequenceLeft(kEntityAbbot, "126B");
 			params->param1 = 0;
 
-			TIME_CHECK_CALLBACK_INVENTORY(kTime2533500, params->param2, 5, setup_callbackActionRestaurantOrSalon);
+			Entity::timeCheckCallbackInventory(kTime2533500, params->param2, 5, WRAP_SETUP_FUNCTION(Abbot, setup_callbackActionRestaurantOrSalon));
 			break;
 
 		case 5:
@@ -1750,7 +1755,8 @@ IMPLEMENT_FUNCTION(49, Abbot, pickBomb)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->timeTicks, 150);
+		if (!Entity::updateParameter(params->param1, getState()->timeTicks, 150))
+			break;
 
 		getSavePoints()->push(kEntityAbbot, kEntityAbbot, kAction157489665);
 		break;
diff --git a/engines/lastexpress/entities/abbot.h b/engines/lastexpress/entities/abbot.h
index 462f5a491e..dc3e86db54 100644
--- a/engines/lastexpress/entities/abbot.h
+++ b/engines/lastexpress/entities/abbot.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_ABBOT_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -157,10 +156,10 @@ public:
 	 * Handle Chapter 3 events
 	 */
 	DECLARE_FUNCTION(chapter3Handler)
-	DECLARE_FUNCTION(function19)
-	DECLARE_FUNCTION(function20)
-	DECLARE_FUNCTION(function21)
-	DECLARE_FUNCTION(function22)
+	DECLARE_FUNCTION(conversationWithBoutarel)
+	DECLARE_FUNCTION(readPaper)
+	DECLARE_FUNCTION(goToLunch)
+	DECLARE_FUNCTION(haveLunch)
 	DECLARE_FUNCTION(function23)
 	DECLARE_FUNCTION(function24)
 	DECLARE_FUNCTION(function25)
diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp
index 54c2d87b89..115c890f6f 100644
--- a/engines/lastexpress/entities/alexei.cpp
+++ b/engines/lastexpress/entities/alexei.cpp
@@ -31,9 +31,6 @@
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -207,7 +204,7 @@ IMPLEMENT_FUNCTION(13, Alexei, function13)
 			getData()->entityPosition = kPosition_7500;
 			getEntities()->clearSequences(kEntityAlexei);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -242,7 +239,7 @@ IMPLEMENT_FUNCTION(14, Alexei, function14)
 		getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 		getEntities()->exitCompartment(kEntityAlexei, kObjectCompartment2, true);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -254,7 +251,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_CHECK(params->param2, getState()->time, params->param1)
+		if (Entity::updateParameterCheck(params->param2, getState()->time, params->param1)) {
 			if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 				getData()->location = kLocationOutsideCompartment;
 
@@ -292,7 +289,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->drawSequenceLeft(kEntityAlexei, "103B");
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -312,12 +309,13 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue)
 			getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObjectHandleInsideBathroom, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param5) {
-			UPDATE_PARAM(CURRENT_PARAM(1, 1), getState()->timeTicks, 75);
+			if (!Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->timeTicks, 75))
+				break;
 
 			params->param5 = 0;
 			params->param6 = 1;
@@ -448,7 +446,7 @@ IMPLEMENT_FUNCTION(17, Alexei, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler)
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -485,7 +483,9 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, 90))
+				break;
+
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 61);
 		} else {
 			params->param3 = 0;
@@ -689,7 +689,7 @@ IMPLEMENT_FUNCTION(21, Alexei, function21)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_CHECK(params->param2, getState()->time, params->param1)
+		if (Entity::updateParameterCheck(params->param2, getState()->time, params->param1)) {
 			getData()->location = kLocationOutsideCompartment;
 			getData()->inventoryItem = kItemNone;
 
@@ -751,7 +751,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(params->param2, getState()->time, params->param2)
+		if (Entity::updateParameter(params->param2, getState()->time, params->param2)) {
 			if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 				getData()->location = kLocationOutsideCompartment;
 				getData()->inventoryItem = kItemNone;
@@ -760,7 +760,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 				setup_updatePosition("103D", kCarRestaurant, 52);
 				break;
 			}
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (params->param3 == kTimeInvalid || getState()->time <= kTime1111500)
 			break;
@@ -978,7 +978,7 @@ IMPLEMENT_FUNCTION(26, Alexei, function26)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime1512000, params->param1, setup_function27)
+		Entity::timeCheck(kTime1512000, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_function27));
 		break;
 
 	case kActionDefault:
@@ -1333,25 +1333,26 @@ IMPLEMENT_FUNCTION(35, Alexei, function35)
 
 	case kActionNone:
 		if (getEntities()->isInSalon(kEntityPlayer)) {
-			UPDATE_PARAM_PROC(params->param2, getState()->time, 2700)
+			if (Entity::updateParameter(params->param2, getState()->time, 2700)) {
 				setCallback(1);
 				setup_callbackActionRestaurantOrSalon();
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		} else {
 			params->param2 = 0;
 		}
 
-		UPDATE_PARAM_PROC(params->param3, getState()->time, params->param1)
+		if (Entity::updateParameter(params->param3, getState()->time, params->param1)) {
 			if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 				setCallback(3);
 				setup_function15();
 				break;
 			}
-		UPDATE_PARAM_PROC_END
+		}
 
 label_callback_3:
-		UPDATE_PARAM(params->param4, getState()->time, 9000);
+		if (!Entity::updateParameter(params->param4, getState()->time, 9000))
+			break;
 
 		setCallback(4);
 		setup_callbackActionRestaurantOrSalon();
@@ -1378,7 +1379,7 @@ label_callback_3:
 
 		case 2:
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -1400,7 +1401,8 @@ IMPLEMENT_FUNCTION(36, Alexei, function36)
 		if (params->param3 || params->param2)
 			break;
 
-		UPDATE_PARAM(params->param4, getState()->timeTicks, params->param1);
+		if (!Entity::updateParameter(params->param4, getState()->timeTicks, params->param1))
+			break;
 
 		getEntities()->drawSequenceRight(kEntityAlexei, "124B");
 
@@ -1448,7 +1450,7 @@ IMPLEMENT_FUNCTION(36, Alexei, function36)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/alexei.h b/engines/lastexpress/entities/alexei.h
index 262826ae42..9792385863 100644
--- a/engines/lastexpress/entities/alexei.h
+++ b/engines/lastexpress/entities/alexei.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_ALEXEI_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/alouan.cpp b/engines/lastexpress/entities/alouan.cpp
index cd79870559..e834e1f7cb 100644
--- a/engines/lastexpress/entities/alouan.cpp
+++ b/engines/lastexpress/entities/alouan.cpp
@@ -28,9 +28,6 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -89,22 +86,22 @@ IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(6, Alouan, compartment6)
-	COMPARTMENT_TO(Alouan, kObjectCompartment6, kPosition_4070, "621Cf", "621Df");
+	Entity::goToCompartment(savepoint, kObjectCompartment6, kPosition_4070, "621Cf", "621Df");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(7, Alouan, compartment8)
-	COMPARTMENT_TO(Alouan, kObjectCompartment8, kPosition_2740, "621Ch", "621Dh");
+	Entity::goToCompartment(savepoint, kObjectCompartment8, kPosition_2740, "621Ch", "621Dh");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(8, Alouan, compartment6to8)
-	COMPARTMENT_FROM_TO(Alouan, kObjectCompartment6, kPosition_4070, "621Bf", kObjectCompartment8, kPosition_2740, "621Ah");
+	Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment6, kPosition_4070, "621Bf", kObjectCompartment8, kPosition_2740, "621Ah");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(9, Alouan, compartment8to6)
-	COMPARTMENT_FROM_TO(Alouan, kObjectCompartment8, kPosition_2740, "621Bh", kObjectCompartment6, kPosition_4070, "621Af");
+	Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment8, kPosition_2740, "621Bh", kObjectCompartment6, kPosition_4070, "621Af");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -114,7 +111,7 @@ IMPLEMENT_FUNCTION(10, Alouan, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alouan, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -134,7 +131,8 @@ IMPLEMENT_FUNCTION(11, Alouan, chapter1Handler)
 
 	case kActionNone:
 
-		TIME_CHECK_CALLBACK(kTime1096200, params->param1, 1, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime1096200, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6)))
+			break;
 
 label_callback1:
 		if (getState()->time > kTime1162800 && !params->param2) {
@@ -284,21 +282,28 @@ IMPLEMENT_FUNCTION(16, Alouan, chapter3Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTimeCitySalzbourg, params->param1, 1, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTimeCitySalzbourg, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6)))
+			break;
 
 label_callback1:
-		if (params->param2 != kTimeInvalid && getState()->time > kTime1989000)
-			TIME_CHECK_CAR(kTime2119500, params->param5, 5, setup_compartment8);
+		if (params->param2 != kTimeInvalid && getState()->time > kTime1989000) {
+			if (Entity::timeCheckCar(kTime2119500, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8)))
+				break;
+		}
 
 label_callback2:
-		TIME_CHECK_CALLBACK_1(kTime2052000, params->param3, 3, setup_playSound, "Har1005");
+		if (Entity::timeCheckCallback(kTime2052000, params->param3, 3, "Har1005", WRAP_SETUP_FUNCTION_S(Alouan, setup_playSound)))
+			break;
 
 label_callback3:
-		TIME_CHECK_CALLBACK(kTime2133000, params->param4, 4, setup_compartment6to8);
+		if (Entity::timeCheckCallback(kTime2133000, params->param4, 4, WRAP_SETUP_FUNCTION(Alouan, setup_compartment6to8)))
+			break;
 
 label_callback4:
-		if (params->param5 != kTimeInvalid && getState()->time > kTime2151000)
-			TIME_CHECK_CAR(kTime2241000, params->param5, 5, setup_compartment8);
+		if (params->param5 != kTimeInvalid && getState()->time > kTime2151000) {
+			if (Entity::timeCheckCar(kTime2241000, params->param5, 5, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8)))
+				break;
+		}
 		break;
 
 	case kActionDefault:
@@ -355,11 +360,14 @@ IMPLEMENT_FUNCTION(18, Alouan, chapter4Handler)
 		break;
 
 	case kActionNone:
-		if (params->param1 != kTimeInvalid)
-			TIME_CHECK_CAR(kTime2443500, params->param1, 1, setup_compartment8);
+		if (params->param1 != kTimeInvalid) {
+			if (Entity::timeCheckCar(kTime2443500, params->param1, 1, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8)))
+				break;
+		}
 
 label_callback1:
-		TIME_CHECK_CALLBACK(kTime2455200, params->param2, 2, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime2455200, params->param2, 2, WRAP_SETUP_FUNCTION(Alouan, setup_compartment8to6)))
+			break;
 
 label_callback2:
 		if (getState()->time > kTime2475000 && !params->param3) {
@@ -441,7 +449,9 @@ IMPLEMENT_FUNCTION(22, Alouan, function22)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 2700);
+		if (!Entity::updateParameter(params->param1, getState()->time, 2700))
+			break;
+
 		setup_function23();
 		break;
 
diff --git a/engines/lastexpress/entities/alouan.h b/engines/lastexpress/entities/alouan.h
index c6a6beddd9..91254a449a 100644
--- a/engines/lastexpress/entities/alouan.h
+++ b/engines/lastexpress/entities/alouan.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_ALOUAN_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp
index b13aa21f6d..f8768032b5 100644
--- a/engines/lastexpress/entities/anna.cpp
+++ b/engines/lastexpress/entities/anna.cpp
@@ -34,9 +34,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -200,16 +198,17 @@ IMPLEMENT_FUNCTION(12, Anna, function12)
 			params->param2 = 1;
 
 		if (params->param6) {
-			UPDATE_PARAM_PROC(params->param7, getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param7, getState()->timeTicks, 75)) {
 				getSavePoints()->push(kEntityAnna, kEntityAnna, kActionEndSound);
 
 				params->param6 = 0;
 				params->param7 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param4) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 75))
+				break;
 
 			params->param4 = 0;
 			params->param5 = 1;
@@ -227,7 +226,7 @@ IMPLEMENT_FUNCTION(12, Anna, function12)
 
 	case kActionEndSound:
 		if (params->param2) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -289,7 +288,7 @@ IMPLEMENT_FUNCTION(12, Anna, function12)
 			getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject53, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -424,12 +423,13 @@ IMPLEMENT_FUNCTION_IS(15, Anna, function15, TimeValue)
 			getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject53, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param5) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 75))
+				break;
 
 			params->param5 = 0;
 			params->param6 = 1;
@@ -547,7 +547,7 @@ IMPLEMENT_FUNCTION(16, Anna, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Anna, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -577,7 +577,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32)
 
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -615,7 +615,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32)
 		}
 
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionCallback:
@@ -664,20 +664,21 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue)
 	case kActionNone:
 		if (params->param1 && params->param1 < getState()->time && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			getData()->inventoryItem = kItemNone;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param5 && !params->param4) {
-			UPDATE_PARAM_PROC(params->param6, getState()->time, 900)
+			if (Entity::updateParameter(params->param6, getState()->time, 900)) {
 				params->param2 |= kItemScarf;
 				params->param5 = 0;
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param3) {
-			UPDATE_PARAM(params->param7, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param7, getState()->timeTicks, 90))
+				break;
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 61);
 		} else {
@@ -757,7 +758,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue)
 	case kAction259136835:
 	case kAction268773672:
 		getData()->inventoryItem = kItemNone;
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -1151,15 +1152,16 @@ IMPLEMENT_FUNCTION(29, Anna, function29)
 
 	case kActionNone:
 		if (params->param2) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 900)
+			if (Entity::updateParameter(params->param3, getState()->time, 900)) {
 				getData()->inventoryItem = (InventoryItem)(getData()->inventoryItem | kItemScarf);
 				params->param2 = 0;
 				params->param3 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 90))
+				break;
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 55);
 		} else {
@@ -1281,7 +1283,9 @@ IMPLEMENT_FUNCTION(30, Anna, function30)
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 90))
+				break;
+
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 55);
 		} else {
 			params->param5 = 0;
@@ -1411,15 +1415,15 @@ IMPLEMENT_FUNCTION(34, Anna, function34)
 
 	case kActionNone:
 		if (!params->param1 && getEntities()->isPlayerPosition(kCarRedSleeping, 60)) {
-			UPDATE_PARAM_PROC(params->param2, getState()->time, 150)
+			if (Entity::updateParameter(params->param2, getState()->time, 150)) {
 				setCallback(1);
 				setup_draw("419B");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback_1:
-		TIME_CHECK(kTime1489500, params->param3, setup_function35);
+		Entity::timeCheck(kTime1489500, params->param3, WRAP_SETUP_FUNCTION(Anna, setup_function35));
 		break;
 
 	case kActionKnock:
@@ -1485,7 +1489,8 @@ IMPLEMENT_FUNCTION(35, Anna, function35)
 		if (!params->param1)
 			break;
 
-		UPDATE_PARAM(params->param3, getState()->timeTicks, 75);
+		if (!Entity::updateParameter(params->param3, getState()->timeTicks, 75))
+			break;
 
 		switch (params->param2) {
 		default:
@@ -1666,7 +1671,7 @@ IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition)
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -1687,7 +1692,7 @@ IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition)
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -1799,7 +1804,8 @@ IMPLEMENT_FUNCTION(41, Anna, function41)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, 2700);
+		if (!Entity::updateParameter(params->param2, getState()->time, 2700))
+			break;
 
 		params->param5++;
 		switch (params->param5) {
@@ -1985,7 +1991,7 @@ IMPLEMENT_FUNCTION_I(45, Anna, function45, bool)
 
 		case 2:
 			getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF, true);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2092,11 +2098,11 @@ IMPLEMENT_FUNCTION(48, Anna, function48)
 			break;
 
 		if (params->param3 != kTimeInvalid && getState()->time > kTime1969200) {
-			UPDATE_PARAM_PROC_TIME(kTime1983600, (!getEntities()->isInRestaurant(kEntityPlayer) || getSoundQueue()->isBuffered(kEntityBoutarel)), params->param3, 150)
+			if (Entity::updateParameterTime(kTime1983600, (!getEntities()->isInRestaurant(kEntityPlayer) || getSoundQueue()->isBuffered(kEntityBoutarel)), params->param3, 150)) {
 				setCallback(3);
 				setup_playSound("Aug3007A");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback_4:
@@ -2195,7 +2201,7 @@ IMPLEMENT_FUNCTION(49, Anna, leaveTableWithAugust)
 		getSavePoints()->push(kEntityAnna, kEntityTables3, kActionDrawTablesWithChairs, "010M");
 		getEntities()->clearSequences(kEntityAugust);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -2386,22 +2392,23 @@ IMPLEMENT_FUNCTION(53, Anna, function53)
 
 	case kActionNone:
 		if (getProgress().field_48 && params->param5 != kTimeInvalid) {
-			UPDATE_PARAM_PROC_TIME(kTime2065500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param5, 150)
+			if (Entity::updateParameterTime(kTime2065500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param5, 150)) {
 				setup_function54();
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param3) {
-			UPDATE_PARAM_PROC(params->param6, getState()->time, 9000)
+			if (Entity::updateParameter(params->param6, getState()->time, 9000)) {
 				params->param4 = !params->param4;
 				getEntities()->drawSequenceLeft(kEntityAnna, params->param4 ? "417B" : "417A");
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param7, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param7, getState()->timeTicks, 75))
+				break;
 
 			CursorStyle cursor = getEntities()->isInsideCompartment(kEntityMax, kCarRedSleeping, kPosition_4070) ? kCursorHand : kCursorNormal;
 
@@ -2537,17 +2544,19 @@ IMPLEMENT_FUNCTION(54, Anna, function54)
 
 	case kActionNone:
 		if (params->param3) {
-			TIME_CHECK(kTime2079000, params->param5, setup_function55);
+			if (Entity::timeCheck(kTime2079000, params->param5, WRAP_SETUP_FUNCTION(Anna, setup_function55)))
+				break;
 
-			UPDATE_PARAM_PROC(params->param6, getState()->time, 9000)
+			if (Entity::updateParameter(params->param6, getState()->time, 9000)) {
 				params->param4 = !params->param4;
 				getEntities()->drawSequenceLeft(kEntityAnna, params->param4 ? "417B" : "417A");
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param7, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param7, getState()->timeTicks, 75))
+				break;
 
 			CursorStyle cursor = getEntities()->isInsideCompartment(kEntityMax, kCarRedSleeping, kPosition_4070) ? kCursorHand : kCursorNormal;
 
@@ -2894,7 +2903,8 @@ IMPLEMENT_FUNCTION(59, Anna, function59)
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			CursorStyle style = getEntities()->isInsideCompartment(kEntityMax, kCarRedSleeping, kPosition_4070) ? kCursorHand : kCursorNormal;
 			getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorNormal, style);
@@ -3040,7 +3050,7 @@ IMPLEMENT_FUNCTION(60, Anna, function60)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityAnna);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3268,7 +3278,8 @@ IMPLEMENT_FUNCTION(67, Anna, chapter4Handler)
 
 	case kActionNone:
 		if (getEntities()->isPlayerPosition(kCarRedSleeping, 46)) {
-			UPDATE_PARAM_GOTO(params->param4, getState()->timeTicks, 30, label_next);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 30))
+				goto label_next;
 
 			getScenes()->loadSceneFromPosition(kCarRedSleeping, 8);
 		}
@@ -3277,7 +3288,8 @@ IMPLEMENT_FUNCTION(67, Anna, chapter4Handler)
 
 label_next:
 		if (params->param1) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
@@ -3407,7 +3419,8 @@ IMPLEMENT_FUNCTION(69, Anna, function69)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param2, getState()->time, 4500);
+			if (!Entity::updateParameter(params->param2, getState()->time, 4500))
+				break;
 
 			getData()->car = kCarRedSleeping;
 			getData()->entityPosition = kPosition_9270;
@@ -3417,7 +3430,7 @@ IMPLEMENT_FUNCTION(69, Anna, function69)
 			break;
 		}
 
-		TIME_CHECK_CALLBACK(kTime2535300, params->param3, 4, setup_callbackActionRestaurantOrSalon);
+		Entity::timeCheckCallback(kTime2535300, params->param3, 4, WRAP_SETUP_FUNCTION(Anna, setup_callbackActionRestaurantOrSalon));
 		break;
 
 	case kActionDefault:
@@ -3533,7 +3546,7 @@ IMPLEMENT_FUNCTION(71, Anna, function71)
 		getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF);
 		getData()->entityPosition = kPosition_4070;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -3589,7 +3602,7 @@ IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition)
 
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -3602,7 +3615,7 @@ IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else if (!getEvent(kEventAnnaTired))
 			getData()->inventoryItem = kItemInvalid;
 		break;
@@ -3911,7 +3924,8 @@ IMPLEMENT_FUNCTION(80, Anna, function80)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->timeTicks, 450);
+		if (!Entity::updateParameter(params->param1, getState()->timeTicks, 450))
+			break;
 
 		getSound()->playSound(kEntityPlayer, "Kro5001", kFlagDefault);
 		break;
@@ -3980,7 +3994,8 @@ IMPLEMENT_FUNCTION(81, Anna, finalSequence)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->timeTicks, 180);
+		if (!Entity::updateParameter(params->param1, getState()->timeTicks, 180))
+			break;
 
 		getSound()->playSound(kEntityTrain, "LIB069");
 		getLogic()->gameOver(kSavegameTypeIndex, 2, kSceneNone, true);
diff --git a/engines/lastexpress/entities/anna.h b/engines/lastexpress/entities/anna.h
index 72c6db4bd9..205ff9d42c 100644
--- a/engines/lastexpress/entities/anna.h
+++ b/engines/lastexpress/entities/anna.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_ANNA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index cfde8a2d6f..dbae7bad20 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -36,9 +36,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -150,7 +148,7 @@ IMPLEMENT_FUNCTION_END
 IMPLEMENT_FUNCTION_SI(7, August, enterExitCompartment3, ObjectIndex)
 	if (savepoint.action == kAction4) {
 		getEntities()->exitCompartment(kEntityAugust, (ObjectIndex)params->param4);
-		CALLBACK_ACTION();
+		callbackAction();
 		return;
 	}
 
@@ -177,7 +175,7 @@ IMPLEMENT_FUNCTION_IIS(10, August, callSavepointNoDrawing, EntityIndex, ActionIn
 		if (!params->param6)
 			getSavePoints()->call(kEntityAugust, (EntityIndex)params->param1, (ActionIndex)params->param2, (char *)&params->seq);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction10:
@@ -233,7 +231,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue)
 	case kActionNone:
 		if (params->param1 < getState()->time && !params->param2) {
 			params->param2 = 1;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -262,7 +260,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue)
 
 		case 1:
 			if (ENTITY_PARAM(0, 1)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -272,7 +270,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue)
 		case 2:
 		case 3:
 			if (ENTITY_PARAM(0, 1)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -289,7 +287,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue)
 
 		case 5:
 			if (ENTITY_PARAM(0, 1)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -308,7 +306,7 @@ IMPLEMENT_FUNCTION_II(18, August, updateEntity2, CarIndex, EntityPosition)
 
 	case kActionNone:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else if (getEntities()->isDistanceBetweenEntities(kEntityAugust, kEntityPlayer, 1000)
 		        && !getEntities()->isInGreenCarEntrance(kEntityPlayer)
 				&& !getEntities()->isInsideCompartments(kEntityPlayer)
@@ -316,14 +314,14 @@ IMPLEMENT_FUNCTION_II(18, August, updateEntity2, CarIndex, EntityPosition)
 
 			if (getData()->car == kCarGreenSleeping || getData()->car == kCarRedSleeping) {
 				ENTITY_PARAM(0, 1) = 1;
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 		}
 		break;
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -407,7 +405,7 @@ IMPLEMENT_FUNCTION_II(19, August, function19, bool, bool)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityAugust);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -503,7 +501,7 @@ IMPLEMENT_FUNCTION_I(20, August, function20, bool)
 		getObjects()->update(kObjectCompartment3, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 		getEntities()->exitCompartment(kEntityAugust, kObjectCompartment3, true);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -520,12 +518,13 @@ IMPLEMENT_FUNCTION_I(21, August, function21, TimeValue)
 
 			getObjects()->update(kObjectCompartment3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param2) {
-			UPDATE_PARAM_GOTO(params->param8, getState()->timeTicks, 75, label_continue);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 75))
+				goto label_continue;
 
 			params->param2 = 0;
 			params->param3 = 1;
@@ -540,10 +539,10 @@ label_continue:
 			break;
 
 		if (params->param6) {
-			UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->time, 6300)
+			if (Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->time, 6300)) {
 				params->param6 = 0;
 				CURRENT_PARAM(1, 1) = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!params->param4
@@ -753,7 +752,7 @@ IMPLEMENT_FUNCTION(22, August, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(August, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -786,7 +785,7 @@ IMPLEMENT_FUNCTION_I(23, August, function23, TimeValue)
 			} else {
 				getEntities()->exitCompartment(kEntityAugust, kObjectCompartment1, true);
 				getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 			break;
 		}
@@ -806,7 +805,7 @@ IMPLEMENT_FUNCTION_I(23, August, function23, TimeValue)
 			}
 
 label_callback_8:
-			UPDATE_PARAM_PROC(CURRENT_PARAM(1, 4), getState()->timeTicks, 75)
+			if (Entity::updateParameter(CURRENT_PARAM(1, 4), getState()->timeTicks, 75)) {
 				getEntities()->exitCompartment(kEntityAugust, kObjectCompartment1, true);
 
 				if (getProgress().eventCorpseMovedFromFloor) {
@@ -822,7 +821,7 @@ label_callback_8:
 					setup_savegame(kSavegameTypeEvent, kEventAugustFindCorpse);
 				}
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 
 label_callback_9:
 			if (params->param3 && params->param1 < getState()->time && !CURRENT_PARAM(1, 5)) {
@@ -842,7 +841,8 @@ label_callback_9:
 			break;
 
 		if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) {
-			UPDATE_PARAM(CURRENT_PARAM(1, 2), getState()->timeTicks, 75);
+			if (!Entity::updateParameter(CURRENT_PARAM(1, 2), getState()->timeTicks, 75))
+				break;
 
 			getObjects()->update(kObjectCompartment1, kEntityAugust, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal);
 
@@ -867,7 +867,7 @@ label_callback_9:
 
 				if (params->param8 >= 3) {
 					getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
-					CALLBACK_ACTION();
+					callbackAction();
 					break;
 				}
 
@@ -959,7 +959,7 @@ label_callback_9:
 
 		case 2:
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -986,7 +986,7 @@ label_callback_9:
 
 			getScenes()->loadScene(kScene41);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 5:
@@ -1028,7 +1028,7 @@ label_callback_9:
 
 		case 12:
 			getData()->location = kLocationOutsideCompartment;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 13:
@@ -1056,7 +1056,7 @@ label_callback_9:
 
 			getScenes()->loadScene(kScene41);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 15:
@@ -1096,7 +1096,7 @@ IMPLEMENT_FUNCTION(24, August, dinner)
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 61);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -1485,7 +1485,8 @@ IMPLEMENT_FUNCTION(30, August, restaurant)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param3, getState()->timeTicks, 75);
+		if (!Entity::updateParameter(params->param3, getState()->timeTicks, 75))
+			break;
 
 		getData()->inventoryItem = kItemInvalid;
 		break;
@@ -1634,9 +1635,9 @@ IMPLEMENT_FUNCTION(32, August, function32)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC_TIME(kTime1179000, (!getEntities()->isInSalon(kEntityAnna) || getEntities()->isInSalon(kEntityPlayer)), params->param6, 0);
+		if (Entity::updateParameterTime(kTime1179000, (!getEntities()->isInSalon(kEntityAnna) || getEntities()->isInSalon(kEntityPlayer)), params->param6, 0)) {
 			getSavePoints()->push(kEntityAugust, kEntityAnna, kAction123712592);
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (params->param1 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			if (!params->param4) {
@@ -1645,18 +1646,19 @@ IMPLEMENT_FUNCTION(32, August, function32)
 			}
 
 			if (params->param7 != kTimeInvalid && params->param4 < getState()->time) {
-				UPDATE_PARAM_PROC_TIME(params->param5, getEntities()->isInSalon(kEntityPlayer), params->param7, 0);
+				if (Entity::updateParameterTime((TimeValue)params->param5, getEntities()->isInSalon(kEntityPlayer), params->param7, 0)) {
 					getData()->location = kLocationOutsideCompartment;
 
 					setCallback(5);
 					setup_updatePosition("109D", kCarRestaurant, 56);
 					break;
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
 		if (params->param3) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 90))
+				break;
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 55);
 		} else {
@@ -1813,7 +1815,7 @@ IMPLEMENT_FUNCTION(36, August, chapter2Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1755000, params->param2, kEntityAugust, kEntityServers0, kAction252568704);
+		Entity::timeCheckSavepoint(kTime1755000, params->param2, kEntityAugust, kEntityServers0, kAction252568704);
 
 		if (getState()->time > kTime1773000 && params->param1 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			getData()->inventoryItem = kItemNone;
@@ -1904,7 +1906,7 @@ IMPLEMENT_FUNCTION(37, August, function37)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_1(kTime1791000, params->param2, 5, setup_function20, true);
+		Entity::timeCheckCallback(kTime1791000, params->param2, 5, true, WRAP_SETUP_FUNCTION_B(August, setup_function20));
 		break;
 
 	case kActionDefault:
@@ -1962,9 +1964,9 @@ IMPLEMENT_FUNCTION(38, August, function38)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1801800, params->param1, kEntityAugust, kEntityRebecca, kAction155980128);
+		Entity::timeCheckSavepoint(kTime1801800, params->param1, kEntityAugust, kEntityRebecca, kAction155980128);
 
-		TIME_CHECK_CALLBACK(kTime1820700, params->param2, 3, setup_callbackActionRestaurantOrSalon);
+		Entity::timeCheckCallback(kTime1820700, params->param2, 3, WRAP_SETUP_FUNCTION(August, setup_callbackActionRestaurantOrSalon));
 		break;
 
 	case kActionDefault:
@@ -2110,7 +2112,7 @@ IMPLEMENT_FUNCTION_II(41, August, function41, CarIndex, EntityPosition)
 			getData()->inventoryItem = kItemNone;
 
 		if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -2147,7 +2149,7 @@ IMPLEMENT_FUNCTION_II(41, August, function41, CarIndex, EntityPosition)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -2172,7 +2174,7 @@ IMPLEMENT_FUNCTION_III(42, August, function42, CarIndex, EntityPosition, bool)
 		if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -2191,7 +2193,7 @@ IMPLEMENT_FUNCTION_III(42, August, function42, CarIndex, EntityPosition, bool)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -2212,7 +2214,7 @@ IMPLEMENT_FUNCTION(43, August, chapter3Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1953000, params->param2, kEntityAugust, kEntityAnna, kAction291662081);
+		Entity::timeCheckSavepoint(kTime1953000, params->param2, kEntityAugust, kEntityAnna, kAction291662081);
 
 		// Set as same position as Anna
 		if (params->param1) {
@@ -2402,7 +2404,7 @@ IMPLEMENT_FUNCTION_END
 IMPLEMENT_FUNCTION(46, August, function46)
 	switch (savepoint.action) {
 	default:
-		TIME_CHECK_CALLBACK(kTime2088000, params->param1, 1, setup_function47);
+		Entity::timeCheckCallback(kTime2088000, params->param1, 1, WRAP_SETUP_FUNCTION(August, setup_function47));
 		break;
 
 	case kActionNone:
@@ -2473,7 +2475,7 @@ IMPLEMENT_FUNCTION(47, August, function47)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2487,7 +2489,7 @@ IMPLEMENT_FUNCTION(48, August, function48)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeCityLinz, params->param1, setup_function49);
+		Entity::timeCheck(kTimeCityLinz, params->param1, WRAP_SETUP_FUNCTION(August, setup_function49));
 		break;
 
 	case kActionKnock:
@@ -2770,7 +2772,8 @@ IMPLEMENT_FUNCTION(54, August, function54)
 			getData()->inventoryItem = kItemInvalid;
 
 		if (!params->param2 && params->param1) {
-			UPDATE_PARAM(params->param5, getState()->time, params->param1);
+			if (!Entity::updateParameter(params->param5, getState()->time, params->param1))
+				break;
 
 			getData()->inventoryItem = kItemNone;
 			setup_function55();
@@ -3046,7 +3049,8 @@ IMPLEMENT_FUNCTION(60, August, function60)
 		if (!params->param1)
 			break;
 
-		UPDATE_PARAM(params->param3, getState()->time, 9000);
+		if (!Entity::updateParameter(params->param3, getState()->time, 9000))
+			break;
 
 		setCallback(1);
 		setup_callbackActionRestaurantOrSalon();
@@ -3142,7 +3146,8 @@ IMPLEMENT_FUNCTION(62, August, function62)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 900);
+		if (!Entity::updateParameter(params->param1, getState()->time, 900))
+			break;
 
 		getSound()->playSound(kEntityAugust, "Aug4003A");
 
@@ -3220,9 +3225,9 @@ IMPLEMENT_FUNCTION(63, August, function63)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(params->param3, getState()->time, 1800)
+		if (Entity::updateParameter(params->param3, getState()->time, 1800)) {
 			getData()->inventoryItem = kItemInvalid;
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (getState()->time > kTime2488500 && !params->param4) {
 			params->param4 = 1;
@@ -3231,7 +3236,8 @@ IMPLEMENT_FUNCTION(63, August, function63)
 			break;
 		}
 
-		UPDATE_PARAM(params->param5, getState()->timeTicks, params->param1);
+		if (!Entity::updateParameter(params->param5, getState()->timeTicks, params->param1))
+			break;
 
 		params->param2 = (params->param6 < 1 ? 1 : 0);
 
@@ -3388,7 +3394,8 @@ IMPLEMENT_FUNCTION(68, August, function68)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
@@ -3523,7 +3530,7 @@ IMPLEMENT_FUNCTION(69, August, unhookCars)
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 85, 1);
 			getSavePoints()->pushAll(kEntityAugust, kActionProceedChapter5);
 
-			RESET_ENTITY_STATE(kEntityVerges, Verges, setup_function42)
+			RESET_ENTITY_STATE(kEntityVerges, Verges, setup_end)
 		}
 		break;
 	}
diff --git a/engines/lastexpress/entities/august.h b/engines/lastexpress/entities/august.h
index 2cbb31b968..606321955b 100644
--- a/engines/lastexpress/entities/august.h
+++ b/engines/lastexpress/entities/august.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_AUGUST_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp
index 315b12a69e..219ddf901b 100644
--- a/engines/lastexpress/entities/boutarel.cpp
+++ b/engines/lastexpress/entities/boutarel.cpp
@@ -32,9 +32,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -231,7 +229,7 @@ IMPLEMENT_FUNCTION_I(11, Boutarel, function11, bool)
 		case 7:
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -249,7 +247,7 @@ IMPLEMENT_FUNCTION(12, Boutarel, enterTableWithMmeBoutarel)
 		getSavePoints()->push(kEntityBoutarel, kEntityTables2, kAction136455232);
 		getData()->location = kLocationInsideCompartment;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -276,7 +274,7 @@ IMPLEMENT_FUNCTION(13, Boutarel, leaveTableWithMmeBoutarel)
 		getSavePoints()->push(kEntityBoutarel, kEntityTables2, kActionDrawTablesWithChairs, "008F");
 		getEntities()->clearSequences(kEntityMmeBoutarel);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -358,7 +356,7 @@ IMPLEMENT_FUNCTION_I(14, Boutarel, function14, bool)
 			getEntities()->clearSequences(kEntityBoutarel);
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -416,7 +414,7 @@ IMPLEMENT_FUNCTION_IS(15, Boutarel, function15, bool)
 		case 5:
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -464,7 +462,7 @@ IMPLEMENT_FUNCTION_IS(16, Boutarel, function16, bool)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityBoutarel);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -478,10 +476,13 @@ IMPLEMENT_FUNCTION_IS(17, Boutarel, function17, TimeValue)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_ACTION(params->param1, params->param6);
+		if (Entity::timeCheckCallbackAction((TimeValue)params->param1, params->param6))
+			break;
 
 		if (params->param5) {
-			UPDATE_PARAM(params->param7, getState()->timeTicks, 90)
+			if (!Entity::updateParameter(params->param7, getState()->timeTicks, 90))
+				break;
+
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 51);
 		} else {
 			params->param7 = 0;
@@ -511,12 +512,13 @@ IMPLEMENT_FUNCTION_I(18, Boutarel, function18, TimeValue)
 			getObjects()->update(kObjectCompartmentC, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject50, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param2) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param2 = 0;
 			params->param3 = 1;
@@ -615,7 +617,7 @@ IMPLEMENT_FUNCTION(19, Boutarel, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Boutarel, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -644,14 +646,14 @@ IMPLEMENT_FUNCTION(20, Boutarel, function20)
 			break;
 
 		if (!params->param2) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 4500)
+			if (Entity::updateParameter(params->param3, getState()->time, 4500)) {
 				setCallback(3);
 				setup_playSound("MRB1078A");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		TIME_CHECK_CALLBACK_1(kTime1138500, params->param4, 4, setup_function14, false);
+		Entity::timeCheckCallback(kTime1138500, params->param4, 4, false, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 		break;
 
 	case kActionDefault:
@@ -676,13 +678,13 @@ IMPLEMENT_FUNCTION(20, Boutarel, function20)
 			break;
 
 		case 3:
-			TIME_CHECK_CALLBACK_1(kTime1138500, params->param4, 4, setup_function14, false);
+			Entity::timeCheckCallback(kTime1138500, params->param4, 4, false, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 			break;
 
 		case 4:
 			getSavePoints()->push(kEntityBoutarel, kEntityCooks, kAction224849280);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -834,7 +836,7 @@ IMPLEMENT_FUNCTION(24, Boutarel, chapter2Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_1(kTime1759500, params->param2, 1, setup_function14, false);
+		Entity::timeCheckCallback(kTime1759500, params->param2, 1, false, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 		break;
 
 	case kActionDefault:
@@ -934,9 +936,9 @@ IMPLEMENT_FUNCTION(29, Boutarel, function29)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(params->param2, getState()->time, 450)
+		if (Entity::updateParameter(params->param2, getState()->time, 450)) {
 			getSavePoints()->push(kEntityBoutarel, kEntityServers1, kAction256200848);
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (!params->param1)
 			break;
@@ -959,7 +961,7 @@ IMPLEMENT_FUNCTION(29, Boutarel, function29)
 			}
 		}
 
-		TIME_CHECK_CALLBACK_1(kTime2002500, params->param4, 1, setup_function14, true);
+		Entity::timeCheckCallback(kTime2002500, params->param4, 1, true, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 		break;
 
 	case kActionDefault:
@@ -972,7 +974,7 @@ IMPLEMENT_FUNCTION(29, Boutarel, function29)
 			break;
 
 		case 1:
-			TIME_CHECK_CALLBACK_1(kTime2002500, params->param4, 1, setup_function14, true);
+			Entity::timeCheckCallback(kTime2002500, params->param4, 1, true, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 			break;
 
 		case 2:
@@ -1045,7 +1047,7 @@ IMPLEMENT_FUNCTION(32, Boutarel, chapter4Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime2367000, params->param1, setup_function33);
+		Entity::timeCheck(kTime2367000, params->param1, WRAP_SETUP_FUNCTION(Boutarel, setup_function33));
 		break;
 
 	case kActionDefault:
@@ -1063,7 +1065,7 @@ IMPLEMENT_FUNCTION(33, Boutarel, function33)
 
 	case kActionNone:
 		if (params->param1)
-			TIME_CHECK_CALLBACK_1(kTime2389500, params->param2, 3, setup_function14, false);
+			Entity::timeCheckCallback(kTime2389500, params->param2, 3, false, WRAP_SETUP_FUNCTION_B(Boutarel, setup_function14));
 		break;
 
 	case kActionDefault:
@@ -1111,7 +1113,8 @@ IMPLEMENT_FUNCTION(34, Boutarel, function34)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime2470500, params->param1, setup_function35);
+		if (Entity::timeCheck(kTime2470500, params->param1, WRAP_SETUP_FUNCTION(Boutarel, setup_function35)))
+			break;
 
 		if (getState()->time > kTime2457000 && getEvent(kEventAugustDrink)) {
 			getSavePoints()->push(kEntityBoutarel, kEntityAbbot, kAction159003408);
diff --git a/engines/lastexpress/entities/boutarel.h b/engines/lastexpress/entities/boutarel.h
index 5eb264631c..04838f6527 100644
--- a/engines/lastexpress/entities/boutarel.h
+++ b/engines/lastexpress/entities/boutarel.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_BOUTAREL_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp
index 4ef2dc50e8..d373432710 100644
--- a/engines/lastexpress/entities/chapters.cpp
+++ b/engines/lastexpress/entities/chapters.cpp
@@ -63,11 +63,9 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/menu/menu.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/sound/queue.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -152,7 +150,7 @@ IMPLEMENT_FUNCTION(5, Chapters, resetMainEntities)
 	RESET_ENTITY_STATE(kEntityVesna, Vesna, setup_reset);
 	RESET_ENTITY_STATE(kEntityYasmin, Yasmin, setup_reset);
 
-	CALLBACK_ACTION();
+	callbackAction();
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -191,7 +189,7 @@ IMPLEMENT_FUNCTION(6, Chapters, chapter1End)
 
 			getScenes()->loadScene(kScene41);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			getSound()->playSound(kEntityPlayer, "LIB014");
 			getSound()->playSound(kEntityPlayer, "LIB015", kFlagDefault, 15);
@@ -386,12 +384,6 @@ IMPLEMENT_FUNCTION(7, Chapters, chapter1Init)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-#define PLAY_STEAM() { \
-	getSoundQueue()->resetState(); \
-	getSound()->playSteam((CityIndex)ENTITY_PARAM(0, 4)); \
-	ENTITY_PARAM(0, 2) = 0; \
-	}
-
 IMPLEMENT_FUNCTION(8, Chapters, chapter1Handler)
 	switch (savepoint.action) {
 	default:
@@ -401,21 +393,28 @@ IMPLEMENT_FUNCTION(8, Chapters, chapter1Handler)
 		if (!getProgress().isTrainRunning || getState()->time >= kTime1458000)
 			goto label_processStations;
 
-		UPDATE_PARAM_PROC(params->param6, getState()->timeTicks, params->param2)
+		if (Entity::updateParameter(params->param6, getState()->timeTicks, params->param2)) {
 			// Play sound FX
 			getSound()->playLocomotiveSound();
 
 			params->param2 = 225 * (4 * rnd(5) + 20);
 			params->param6 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
 label_processStations:
 		// Process stations
-		TIME_CHECK_CALLBACK_2(kTime1039500, params->param7, 1, setup_savegame, kSavegameTypeTime, kTimeNone);
+		if (getState()->time > kTime1039500 && !params->param7) {
+			params->param7 = 1;
+			setCallback(1);
+			setup_savegame(kSavegameTypeTime, kTimeNone);
+
+			break;
+		}
 
 label_enter_epernay:
 		// Entering Epernay station
-		TIME_CHECK_CALLBACK_2(kTimeEnterEpernay, params->param8, 1, setup_enterStation, "Epernay", kCityEpernay);
+		if (timeCheckEnterStation(kTimeEnterEpernay, params->param8, 1, "Epernay", kCityEpernay))
+			break;
 
 label_exit_epernay:
 		// Exiting Epernay station
@@ -445,19 +444,23 @@ label_enter_chalons:
 			goto label_exit_strasbourg;
 
 		// Entering Chalons station
-		TIME_CHECK_CALLBACK_2(kTimeEnterChalons, CURRENT_PARAM(1, 3), 5, setup_enterStation, "Chalons", kCityChalons);
+		if (timeCheckEnterStation(kTimeEnterChalons, CURRENT_PARAM(1, 3), 5, "Chalons", kCityChalons))
+			break;
 
 label_exit_chalons:
 		// Exiting Chalons station
-		TIME_CHECK_CALLBACK_1(kTimeExitChalons, CURRENT_PARAM(1, 4), 6, setup_exitStation, "Chalons");
+		if (timeCheckExitStation(kTimeExitChalons, CURRENT_PARAM(1, 4), 6, "Chalons"))
+			break;
 
 label_enter_barleduc:
 		// Entering Bar-Le-Duc station
-		TIME_CHECK_CALLBACK_2(kTimeCityBarLeDuc, CURRENT_PARAM(1, 5), 7, setup_enterStation, "BarLeDuc", kCityBarleduc);
+		if (timeCheckEnterStation(kTimeCityBarLeDuc, CURRENT_PARAM(1, 5), 7, "BarLeDuc", kCityBarleduc))
+			break;
 
 label_exit_barleduc:
 		// Exiting Bar-Le-Duc station
-		TIME_CHECK_CALLBACK_1(kTimeExitBarLeDuc, CURRENT_PARAM(1, 6), 8, setup_exitStation, "BarLeDuc");
+		if (timeCheckExitStation(kTimeExitBarLeDuc, CURRENT_PARAM(1, 6), 8, "BarLeDuc"))
+			break;
 
 label_enter_nancy:
 		if (getState()->time > kTime1260000 && !CURRENT_PARAM(1, 7)) {
@@ -466,50 +469,67 @@ label_enter_nancy:
 		}
 
 		// Entering Nancy station
-		TIME_CHECK_CALLBACK_2(kTimeCityNancy, CURRENT_PARAM(1, 8), 9, setup_enterStation, "Nancy", kCityNancy);
+		if (timeCheckEnterStation(kTimeCityNancy, CURRENT_PARAM(1, 8), 9, "Nancy", kCityNancy))
+			break;
 
 label_exit_nancy:
 		// Exiting Nancy station
-		TIME_CHECK_CALLBACK_1(kTimeExitNancy, CURRENT_PARAM(2, 1), 10, setup_exitStation, "Nancy");
+		if (timeCheckExitStation(kTimeExitNancy, CURRENT_PARAM(2, 1), 10, "Nancy"))
+			break;
 
 label_enter_luneville:
 		// Entering Luneville station
-		TIME_CHECK_CALLBACK_2(kTimeCityLuneville, CURRENT_PARAM(2, 2), 11, setup_enterStation, "Luneville", kCityLuneville);
+		if (timeCheckEnterStation(kTimeCityLuneville, CURRENT_PARAM(2, 2), 11, "Luneville", kCityLuneville))
+			break;
 
 label_exit_luneville:
 		// Exiting Luneville station
-		TIME_CHECK_CALLBACK_1(kTimeExitLuneville, CURRENT_PARAM(2, 3), 12, setup_exitStation, "Luneville");
+		if (timeCheckExitStation(kTimeExitLuneville, CURRENT_PARAM(2, 3), 12, "Luneville"))
+			break;
 
 label_enter_avricourt:
 		// Entering Avricourt station
-		TIME_CHECK_CALLBACK_2(kTimeCityAvricourt, CURRENT_PARAM(2, 4), 13, setup_enterStation, "Avricourt", kCityAvricourt);
+		if (timeCheckEnterStation(kTimeCityAvricourt, CURRENT_PARAM(2, 4), 13, "Avricourt", kCityAvricourt))
+			break;
 
 label_exit_avricourt:
 		// Exiting Avricourt station
-		TIME_CHECK_CALLBACK_1(kTimeExitAvricourt, CURRENT_PARAM(2, 5), 14, setup_exitStation, "Avricourt");
+		if (timeCheckExitStation(kTimeExitAvricourt, CURRENT_PARAM(2, 5), 14, "Avricourt"))
+			break;
 
 label_enter_deutschavricourt:
 		// Entering Deutsch-Avricourt station
-		TIME_CHECK_CALLBACK_2(kTimeCityDeutschAvricourt, CURRENT_PARAM(2, 6), 15, setup_enterStation, "DeutschA", kCityDeutschAvricourt);
+		if (timeCheckEnterStation(kTimeCityDeutschAvricourt, CURRENT_PARAM(2, 6), 15, "DeutschA", kCityDeutschAvricourt))
+			break;
 
 label_exit_deutschavricourt:
 		// Exiting Avricourt station
-		TIME_CHECK_CALLBACK_1(kTimeExitDeutschAvricourt, CURRENT_PARAM(2, 7), 16, setup_exitStation, "DeutschA");
+		if (timeCheckExitStation(kTimeExitDeutschAvricourt, CURRENT_PARAM(2, 7), 16, "DeutschA"))
+			break;
 
 label_enter_strasbourg:
-		TIME_CHECK_CALLBACK_2(kTimeCityStrasbourg, CURRENT_PARAM(2, 8), 17, setup_savegame, kSavegameTypeTime, kTimeNone);
+		if (getState()->time > kTimeCityStrasbourg && !CURRENT_PARAM(2, 8)) {
+			CURRENT_PARAM(2, 8) = 1;
+			setCallback(17);
+			setup_savegame(kSavegameTypeTime, kTimeNone);
+
+			break;
+		}
 
 label_exit_strasbourg:
 		// Exiting Strasbourg station
-		TIME_CHECK_CALLBACK_1(kTimeExitStrasbourg, CURRENT_PARAM(3, 1), 19, setup_exitStation, "Strasbou");
+		if (timeCheckExitStation(kTimeExitStrasbourg, CURRENT_PARAM(3, 1), 19, "Strasbou"))
+			break;
 
 label_enter_badenoos:
 		// Entering Baden Oos station
-		TIME_CHECK_CALLBACK_2(kTimeCityBadenOos, CURRENT_PARAM(3, 2), 20, setup_enterStation, "BadenOos", kCityBadenOos);
+		if (timeCheckEnterStation(kTimeCityBadenOos, CURRENT_PARAM(3, 2), 20, "BadenOos", kCityBadenOos))
+			break;
 
 label_exit_badenoos:
 		// Exiting Baden Oos station
-		TIME_CHECK_CALLBACK_1(kTimeExitBadenOos, CURRENT_PARAM(3, 3), 21, setup_exitStation, "BadenOos");
+		if (timeCheckExitStation(kTimeExitBadenOos, CURRENT_PARAM(3, 3), 21, "BadenOos"))
+			break;
 
 label_chapter1_next:
 		if (getState()->time > kTimeChapter1End3 && ! CURRENT_PARAM(3, 4)) {
@@ -524,43 +544,43 @@ label_chapter1_next:
 			getSavePoints()->push(kEntityChapters, kEntityTrain, kActionTrainStopRunning);
 
 			if (getEntityData(kEntityPlayer)->location != kLocationOutsideTrain) {
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			if (getEntities()->isOutsideAlexeiWindow()) {
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			if (getEntities()->isOutsideAnnaWindow()) {
 				getScenes()->loadSceneFromPosition(kCarRedSleeping, 49);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			CarIndex car = getEntityData(kEntityPlayer)->car;
 			if (car < kCarRedSleeping || car > kCarCoalTender) {
 				if (car < kCarBaggageRear || car > kCarGreenSleeping) {
-					PLAY_STEAM();
+					playSteam();
 					break;
 				}
 
 				if (getEntities()->isPlayerPosition(kCarGreenSleeping, 98)) {
 					getSound()->playSound(kEntityPlayer, "LIB015");
 					getScenes()->loadSceneFromPosition(kCarGreenSleeping, 71);
-					PLAY_STEAM();
+					playSteam();
 					break;
 				}
 
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 82);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 82);
-			PLAY_STEAM();
+			playSteam();
 			break;
 		}
 
@@ -817,7 +837,8 @@ IMPLEMENT_FUNCTION(12, Chapters, chapter2Handler)
 		if (!getProgress().isTrainRunning)
 			break;
 
-		UPDATE_PARAM(params->param2, getState()->timeTicks, params->param1);
+		if (!Entity::updateParameter(params->param2, getState()->timeTicks, params->param1))
+			break;
 
 		getSound()->playLocomotiveSound();
 
@@ -903,15 +924,15 @@ IMPLEMENT_FUNCTION(15, Chapters, chapter3Handler)
 
 	case kActionNone:
 		if (getProgress().isTrainRunning) {
-			UPDATE_PARAM_PROC(params->param4, getState()->timeTicks, params->param1)
+			if (Entity::updateParameter(params->param4, getState()->timeTicks, params->param1)) {
 				getSound()->playLocomotiveSound();
 
 				params->param1 = 225 * (4 * rnd(5) + 20);
 				params->param4 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		UPDATE_PARAM_PROC(params->param5, getState()->timeTicks, params->param2)
+		if (Entity::updateParameter(params->param5, getState()->timeTicks, params->param2)) {
 			switch (rnd(2)) {
 			default:
 				break;
@@ -927,30 +948,38 @@ IMPLEMENT_FUNCTION(15, Chapters, chapter3Handler)
 
 			params->param2 = 225 * (4 * rnd(6) + 8);
 			params->param5 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
-		TIME_CHECK_CALLBACK_2(kTimeEnterSalzbourg, params->param6, 1, setup_enterStation, "Salzburg", kCitySalzbourg);
+		if (timeCheckEnterStation(kTimeEnterSalzbourg, params->param6, 1, "Salzburg", kCitySalzbourg))
+			break;
 
 label_callback_1:
-		TIME_CHECK_CALLBACK_1(kTimeExitSalzbourg, params->param7, 2, setup_exitStation, "Salzburg");
+		if (timeCheckExitStation(kTimeExitSalzbourg, params->param7, 2, "Salzburg"))
+			break;
 
 label_callback_2:
-		TIME_CHECK_CALLBACK_2(kTimeEnterAttnangPuchheim, params->param8, 3, setup_enterStation, "Attnang", kCityAttnangPuchheim);
+		if (timeCheckEnterStation(kTimeEnterAttnangPuchheim, params->param8, 3, "Attnang", kCityAttnangPuchheim))
+			break;
 
 label_callback_3:
-		TIME_CHECK_CALLBACK_1(kTimeExitAttnangPuchheim, CURRENT_PARAM(1, 1), 4, setup_exitStation, "Attnang");
+		if (timeCheckExitStation(kTimeExitAttnangPuchheim, CURRENT_PARAM(1, 1), 4, "Attnang"))
+			break;
 
 label_callback_4:
-		TIME_CHECK_CALLBACK_2(kTimeEnterWels, CURRENT_PARAM(1, 2), 5, setup_enterStation, "Wels", kCityWels);
+		if (timeCheckEnterStation(kTimeEnterWels, CURRENT_PARAM(1, 2), 5, "Wels", kCityWels))
+			break;
 
 label_callback_5:
-		TIME_CHECK_CALLBACK_1(kTimeEnterWels, CURRENT_PARAM(1, 3), 6, setup_exitStation, "Wels");
+		if (timeCheckExitStation(kTimeEnterWels, CURRENT_PARAM(1, 3), 6, "Wels"))
+			break;
 
 label_callback_6:
-		TIME_CHECK_CALLBACK_2(kTimeEnterLinz, CURRENT_PARAM(1, 4), 7, setup_enterStation, "Linz", kCityLinz);
+		if (timeCheckEnterStation(kTimeEnterLinz, CURRENT_PARAM(1, 4), 7, "Linz", kCityLinz))
+			break;
 
 label_callback_7:
-		TIME_CHECK_CALLBACK_1(kTimeCityLinz, CURRENT_PARAM(1, 5), 8, setup_exitStation, "Linz");
+		if (timeCheckExitStation(kTimeCityLinz, CURRENT_PARAM(1, 5), 8, "Linz"))
+			break;
 
 label_callback_8:
 		if (getState()->time > kTime2187000 && !CURRENT_PARAM(1, 6)) {
@@ -958,7 +987,7 @@ label_callback_8:
 			getState()->timeDelta = 5;
 		}
 
-		TIME_CHECK_CALLBACK_2(kTimeCityVienna, CURRENT_PARAM(1, 7), 9, setup_enterStation, "Vienna", kCityVienna);
+		timeCheckEnterStation(kTimeCityVienna, CURRENT_PARAM(1, 7), 9, "Vienna", kCityVienna);
 		break;
 
 	case kActionEndSound:
@@ -1202,15 +1231,15 @@ IMPLEMENT_FUNCTION(19, Chapters, chapter4Handler)
 
 	case kActionNone:
 		if (getProgress().isTrainRunning) {
-			UPDATE_PARAM_PROC(params->param6, getState()->timeTicks, params->param4);
+			if (Entity::updateParameter(params->param6, getState()->timeTicks, params->param4)) {
 				getSound()->playLocomotiveSound();
 
 				params->param4 = 225 * (4 * rnd(5) + 20);
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		UPDATE_PARAM_PROC(params->param7, getState()->timeTicks, params->param5)
+		if (Entity::updateParameter(params->param7, getState()->timeTicks, params->param5)) {
 			switch (rnd(2)) {
 			default:
 				break;
@@ -1226,12 +1255,14 @@ IMPLEMENT_FUNCTION(19, Chapters, chapter4Handler)
 
 			params->param5 = 225 * (4 * rnd(6) + 8);
 			params->param7 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
-		TIME_CHECK_CALLBACK_2(kTimeEnterPoszony, params->param8, 1, setup_enterStation, "Pozsony", kCityPoszony);
+		if (timeCheckEnterStation(kTimeEnterPoszony, params->param8, 1, "Pozsony", kCityPoszony))
+			break;
 
 label_exitPozsony:
-		TIME_CHECK_CALLBACK_1(kTimeExitPoszony, CURRENT_PARAM(1, 1), 2, setup_exitStation, "Pozsony");
+		if (timeCheckExitStation(kTimeExitPoszony, CURRENT_PARAM(1, 1), 2, "Pozsony"))
+			break;
 
 label_enterGalanta:
 		if (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) {
@@ -1244,10 +1275,12 @@ label_enterGalanta:
 		if (params->param1)
 			goto label_callback_4;
 
-		TIME_CHECK_CALLBACK_2(kTimeEnterGalanta, CURRENT_PARAM(1, 3), 3, setup_enterStation, "Galanta", kCityGalanta);
+		if (timeCheckEnterStation(kTimeEnterGalanta, CURRENT_PARAM(1, 3), 3, "Galanta", kCityGalanta))
+			break;
 
 label_exitGalanta:
-		TIME_CHECK_CALLBACK_1(kTimeExitGalanta, CURRENT_PARAM(1, 4), 4, setup_exitStation, "Galanta");
+		if (timeCheckExitStation(kTimeExitGalanta, CURRENT_PARAM(1, 4), 4, "Galanta"))
+			break;
 
 label_callback_4:
 		if (getState()->time > kTime2470500 && !CURRENT_PARAM(1, 5)) {
@@ -1280,43 +1313,43 @@ label_callback_4:
 			getSavePoints()->push(kEntityChapters, kEntityTrain, kActionTrainStopRunning);
 
 			if (getEntityData(kEntityPlayer)->location != kLocationOutsideTrain) {
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			if (getEntities()->isOutsideAlexeiWindow()) {
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			if (getEntities()->isOutsideAnnaWindow()) {
 				getScenes()->loadSceneFromPosition(kCarRedSleeping, 49);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			CarIndex car = getEntityData(kEntityPlayer)->car;
 			if (car < kCarRedSleeping || car > kCarCoalTender) {
 				if (car < kCarBaggageRear || car > kCarGreenSleeping) {
-					PLAY_STEAM();
+					playSteam();
 					break;
 				}
 
 				if (getEntities()->isPlayerPosition(kCarGreenSleeping, 98)) {
 					getSound()->playSound(kEntityPlayer, "LIB015");
 					getScenes()->loadSceneFromPosition(kCarGreenSleeping, 71);
-					PLAY_STEAM();
+					playSteam();
 					break;
 				}
 
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 82);
-				PLAY_STEAM();
+				playSteam();
 				break;
 			}
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 82);
-			PLAY_STEAM();
+			playSteam();
 			break;
 		}
 
@@ -1815,7 +1848,37 @@ void Chapters::enterExitHelper(bool isEnteringStation) {
 		ENTITY_PARAM(0, 3) = 1;
 	}
 
-	CALLBACK_ACTION();
+	callbackAction();
+}
+
+void Chapters::playSteam() const {
+	getSoundQueue()->resetState();
+	getSound()->playSteam((CityIndex)ENTITY_PARAM(0, 4));
+	ENTITY_PARAM(0, 2) = 0;
+}
+
+bool Chapters::timeCheckEnterStation(TimeValue timeValue, uint &parameter, byte callback, const char *sequence, CityIndex cityIndex) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		setup_enterStation(sequence, cityIndex);
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Chapters::timeCheckExitStation(TimeValue timeValue, uint &parameter, byte callback, const char *sequence) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		setup_exitStation(sequence);
+
+		return true;
+	}
+
+	return false;
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/chapters.h b/engines/lastexpress/entities/chapters.h
index 353d3a6b5b..fb52ea3ee4 100644
--- a/engines/lastexpress/entities/chapters.h
+++ b/engines/lastexpress/entities/chapters.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_CHAPTERS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -154,8 +153,11 @@ public:
 	DECLARE_FUNCTION(chapter5Handler)
 
 private:
+	bool timeCheckEnterStation(TimeValue timeValue, uint &parameter, byte callback, const char *sequence, CityIndex cityIndex);
+	bool timeCheckExitStation(TimeValue timeValue, uint &parameter, byte callback, const char *sequence);
 	void enterExitStation(const SavePoint &savepoint, bool isEnteringStation);
 	void enterExitHelper(bool isEnteringStation);
+	void playSteam() const;
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/cooks.cpp b/engines/lastexpress/entities/cooks.cpp
index 42e888cc7c..5e8a2df8cb 100644
--- a/engines/lastexpress/entities/cooks.cpp
+++ b/engines/lastexpress/entities/cooks.cpp
@@ -29,9 +29,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -96,7 +94,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3)
 	case kActionDrawScene:
 		if (!getEntities()->isInKitchen(kEntityPlayer)) {
 			getEntities()->clearSequences(kEntityCooks);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -108,7 +106,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3)
 					if (!getEntities()->hasValidFrame(kEntityCooks)) {
 						getSound()->playSound(kEntityCooks, "LIB015");
 						getEntities()->clearSequences(kEntityCooks);
-						CALLBACK_ACTION();
+						callbackAction();
 					}
 					break;
 				}
@@ -122,7 +120,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3)
 		if (params->param1 && !getEntities()->hasValidFrame(kEntityCooks)) {
 			getSound()->playSound(kEntityCooks, "LIB015");
 			getEntities()->clearSequences(kEntityCooks);
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -182,7 +180,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4)
 	case kActionDrawScene:
 		if (!getEntities()->isInKitchen(kEntityPlayer)) {
 			getEntities()->clearSequences(kEntityCooks);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -194,7 +192,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4)
 					if (!getEntities()->hasValidFrame(kEntityCooks)) {
 						getSound()->playSound(kEntityCooks, "LIB015");
 						getEntities()->clearSequences(kEntityCooks);
-						CALLBACK_ACTION();
+						callbackAction();
 					}
 					break;
 				}
@@ -208,7 +206,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4)
 		if (params->param1 && !getEntities()->hasValidFrame(kEntityCooks)) {
 			getSound()->playSound(kEntityCooks, "LIB015");
 			getEntities()->clearSequences(kEntityCooks);
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -241,7 +239,7 @@ IMPLEMENT_FUNCTION(5, Cooks, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Cooks, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -262,7 +260,8 @@ IMPLEMENT_FUNCTION(6, Cooks, chapter1Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param4, getState()->time, params->param2);
+		if (!Entity::updateParameter(params->param4, getState()->time, params->param2))
+			break;
 
 		// Broken plate sound
 		getSound()->playSound(kEntityPlayer, "LIB122",  getSound()->getSoundFlag(kEntityCooks));
@@ -375,7 +374,8 @@ IMPLEMENT_FUNCTION(9, Cooks, chapter2Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param3, getState()->time, params->param1);
+		if (!Entity::updateParameter(params->param3, getState()->time, params->param1))
+			break;
 
 		// Broken plate sound
 		getSound()->playSound(kEntityPlayer, "LIB122",  getSound()->getSoundFlag(kEntityCooks));
@@ -434,12 +434,12 @@ IMPLEMENT_FUNCTION(11, Cooks, chapter3Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(params->param4, getState()->time, params->param2)
+		if (Entity::updateParameter(params->param4, getState()->time, params->param2)) {
 			// Broken plate sound
 			getSound()->playSound(kEntityPlayer, "LIB122",  getSound()->getSoundFlag(kEntityCooks));
 			params->param2 = 225 * (4 * rnd(30) + 120);
 			params->param4 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (getState()->time > kTime2079000 && !params->param5) {
 			params->param1 = 0;
@@ -526,7 +526,8 @@ IMPLEMENT_FUNCTION(13, Cooks, chapter4Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param3, getState()->time, params->param1)
+		if (!Entity::updateParameter(params->param3, getState()->time, params->param1))
+			break;
 
 		// Broken plate sound
 		getSound()->playSound(kEntityPlayer, "LIB122",  getSound()->getSoundFlag(kEntityCooks));
diff --git a/engines/lastexpress/entities/cooks.h b/engines/lastexpress/entities/cooks.h
index 3ab7d35161..f01d0b2ca0 100644
--- a/engines/lastexpress/entities/cooks.h
+++ b/engines/lastexpress/entities/cooks.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_COOKS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp
index c3e7e37b88..b604277903 100644
--- a/engines/lastexpress/entities/coudert.cpp
+++ b/engines/lastexpress/entities/coudert.cpp
@@ -32,22 +32,11 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
 
-#define SAVEGAME_BLOOD_JACKET() \
-	if (getProgress().jacket == kJacketBlood \
-		&& getEntities()->isDistanceBetweenEntities(kEntityCoudert, kEntityPlayer, 1000) \
-		&& !getEntities()->isInsideCompartments(kEntityPlayer) \
-		&& !getEntities()->checkFields10(kEntityPlayer)) { \
-		setCallback(1); \
-		setup_savegame(kSavegameTypeEvent, kEventMertensBloodJacket); \
-	}
-
 Coudert::Coudert(LastExpressEngine *engine) : Entity(engine, kEntityCoudert) {
 	ADD_CALLBACK_FUNCTION(Coudert, reset);
 	ADD_CALLBACK_FUNCTION(Coudert, bloodJacket);
@@ -126,11 +115,11 @@ IMPLEMENT_FUNCTION_S(2, Coudert, bloodJacket)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -153,7 +142,7 @@ IMPLEMENT_FUNCTION_SI(3, Coudert, enterExitCompartment, ObjectIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		return;
 
 	case kActionCallback:
@@ -175,15 +164,15 @@ IMPLEMENT_FUNCTION(4, Coudert, callbackActionOnDirection)
 
 	case kActionNone:
 		if (getData()->direction != kDirectionRight) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -202,7 +191,7 @@ IMPLEMENT_FUNCTION_SIII(5, Coudert, enterExitCompartment2, ObjectIndex, EntityPo
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		return;
 
 	case kActionCallback:
@@ -223,11 +212,11 @@ IMPLEMENT_FUNCTION_S(6, Coudert, playSound)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -252,11 +241,11 @@ IMPLEMENT_FUNCTION_NOSETUP(7, Coudert, playSound16)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -296,7 +285,7 @@ IMPLEMENT_FUNCTION_II(9, Coudert, updateEntity, CarIndex, EntityPosition)
 			if (getEntities()->updateEntity(kEntityCoudert, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 				getData()->inventoryItem = kItemNone;
 
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 			break;
 		}
@@ -332,7 +321,7 @@ IMPLEMENT_FUNCTION_II(9, Coudert, updateEntity, CarIndex, EntityPosition)
 			params->param3 = kItemInvalid;
 
 		if (getEntities()->updateEntity(kEntityCoudert, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionCallback:
@@ -365,11 +354,12 @@ IMPLEMENT_FUNCTION_I(10, Coudert, updateFromTime, uint32)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 
-		UPDATE_PARAM(params->param2, getState()->time, params->param1);
+		if (!Entity::updateParameter(params->param2, getState()->time, params->param1))
+			break;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -388,11 +378,12 @@ IMPLEMENT_FUNCTION_I(11, Coudert, updateFromTicks, uint32)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 
-		UPDATE_PARAM(params->param2, getState()->timeTicks, params->param1);
+		if (!Entity::updateParameter(params->param2, getState()->timeTicks, params->param1))
+			break;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -412,7 +403,7 @@ IMPLEMENT_FUNCTION_I(12, Coudert, excuseMe, EntityIndex)
 		return;
 
 	if (getSoundQueue()->isBuffered(kEntityCoudert)) {
-		CALLBACK_ACTION();
+		callbackAction();
 		return;
 	}
 
@@ -452,7 +443,7 @@ IMPLEMENT_FUNCTION_I(12, Coudert, excuseMe, EntityIndex)
 			getSound()->playSound(kEntityCoudert, "JAC1112E");
 	}
 
-	CALLBACK_ACTION();
+	callbackAction();
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -462,7 +453,7 @@ IMPLEMENT_FUNCTION_II(13, Coudert, function13, bool, EntityIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 
 		if (!params->param2 && !params->param3) {
 
@@ -487,7 +478,8 @@ IMPLEMENT_FUNCTION_II(13, Coudert, function13, bool, EntityIndex)
 			}
 		}
 
-		UPDATE_PARAM(params->param5, getState()->timeTicks, 225);
+		if (!Entity::updateParameter(params->param5, getState()->timeTicks, 225))
+			break;
 
 		getData()->inventoryItem = kItemNone;
 		setCallback(5);
@@ -561,7 +553,7 @@ IMPLEMENT_FUNCTION_II(13, Coudert, function13, bool, EntityIndex)
 		case 5:
 		case 6:
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 9:
@@ -584,7 +576,7 @@ IMPLEMENT_FUNCTION_I(14, Coudert, function14, EntityIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionDefault:
@@ -629,7 +621,7 @@ IMPLEMENT_FUNCTION_I(14, Coudert, function14, EntityIndex)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -706,7 +698,7 @@ IMPLEMENT_FUNCTION_I(15, Coudert, function15, bool)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -724,7 +716,7 @@ IMPLEMENT_FUNCTION(16, Coudert, function16)
 			ENTITY_PARAM(2, 1) = 0;
 			getInventory()->setLocationAndProcess(kItem5, kObjectLocation1);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -743,7 +735,7 @@ IMPLEMENT_FUNCTION(16, Coudert, function16)
 			if (!getEntities()->isPlayerPosition(kCarRedSleeping, 2))
 				getData()->entityPosition = kPosition_2088;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -761,7 +753,7 @@ IMPLEMENT_FUNCTION_I(17, Coudert, function17, bool)
 
 		if (ENTITY_PARAM(2, 1)) {
 			ENTITY_PARAM(2, 1) = 0;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -789,7 +781,7 @@ IMPLEMENT_FUNCTION_I(17, Coudert, function17, bool)
 		case 1:
 		case 2:
 		case 3:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -817,7 +809,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18)
 			getEntities()->drawSequenceLeft(kEntityCoudert, "627K");
 			getScenes()->loadSceneFromItemPosition(kItem5);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -849,7 +841,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18)
 			break;
 
 		case 2:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -857,7 +849,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18)
 			ENTITY_PARAM(0, 1) = 0;
 			getSavePoints()->push(kEntityCoudert, kEntityCoudert, kActionDrawScene);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -876,14 +868,14 @@ IMPLEMENT_FUNCTION_I(19, Coudert, function19, bool)
 		 || ENTITY_PARAM(2, 4) || ENTITY_PARAM(2, 6)) {
 			getInventory()->setLocationAndProcess(kItem5, kObjectLocation1);
 			ENTITY_PARAM(2, 1) = 1;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (ENTITY_PARAM(0, 3) || ENTITY_PARAM(0, 5) || ENTITY_PARAM(0, 4)) {
 			getScenes()->loadSceneFromItemPosition(kItem5);
 			ENTITY_PARAM(2, 1) = 1;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -903,7 +895,7 @@ IMPLEMENT_FUNCTION_I(19, Coudert, function19, bool)
 			getEntities()->drawSequenceLeft(kEntityCoudert, ENTITY_PARAM(0, 2) ? "627B" : "627E");
 			ENTITY_PARAM(0, 1) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -916,11 +908,12 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(CURRENT_PARAM(1, 3), getState()->time, 300)
+		if (Entity::updateParameter(CURRENT_PARAM(1, 3), getState()->time, 300)) {
 			getSound()->playSound(kEntityPlayer, "ZFX1004", getSound()->getSoundFlag(kEntityCoudert));
-		UPDATE_PARAM_PROC_END
+		}
 
-		UPDATE_PARAM(CURRENT_PARAM(1, 4), getState()->time, 900);
+		if (!Entity::updateParameter(CURRENT_PARAM(1, 4), getState()->time, 900))
+			break;
 
 		getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1);
 
@@ -930,7 +923,7 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex)
 		if (params->param2)
 			getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param7, (ObjectLocation)params->param8, (CursorStyle)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2));
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionKnock:
@@ -999,7 +992,8 @@ IMPLEMENT_FUNCTION(21, Coudert, function21)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment("627Zh", kObjectCompartmentH);
@@ -1044,7 +1038,7 @@ IMPLEMENT_FUNCTION(21, Coudert, function21)
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1073,7 +1067,7 @@ IMPLEMENT_FUNCTION(21, Coudert, function21)
 			getData()->location = kLocationOutsideCompartment;
 			getSavePoints()->push(kEntityCoudert, kEntityIvo, kAction123852928);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1100,7 +1094,8 @@ IMPLEMENT_FUNCTION(22, Coudert, function22)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment("627Rg", kObjectCompartmentG);
@@ -1145,7 +1140,7 @@ IMPLEMENT_FUNCTION(22, Coudert, function22)
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1174,7 +1169,7 @@ IMPLEMENT_FUNCTION(22, Coudert, function22)
 			getData()->location = kLocationOutsideCompartment;
 			getSavePoints()->push(kEntityCoudert, kEntityMilos, kAction123852928);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1225,7 +1220,7 @@ IMPLEMENT_FUNCTION(23, Coudert, function23)
 
 		case 3:
 			getEntities()->exitCompartment(kEntityCoudert, kObjectCompartmentF, true);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1296,7 +1291,7 @@ IMPLEMENT_FUNCTION(25, Coudert, function25)
 			getData()->location = kLocationOutsideCompartment;
 			getSavePoints()->push(kEntityCoudert, kEntityRebecca, kAction123852928);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1311,7 +1306,8 @@ IMPLEMENT_FUNCTION(26, Coudert, function26)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment2("627Zd", kObjectCompartmentD, kPosition_5790, kPosition_6130);
@@ -1357,7 +1353,7 @@ IMPLEMENT_FUNCTION(26, Coudert, function26)
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1375,7 +1371,7 @@ IMPLEMENT_FUNCTION(26, Coudert, function26)
 			getData()->location = kLocationOutsideCompartment;
 			getSavePoints()->push(kEntityCoudert, kEntityMmeBoutarel, kAction123852928);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1402,7 +1398,8 @@ IMPLEMENT_FUNCTION(27, Coudert, function27)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment2("627Rc", kObjectCompartmentC, kPosition_6470, kPosition_6130);
@@ -1446,7 +1443,7 @@ IMPLEMENT_FUNCTION(27, Coudert, function27)
 
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1473,7 +1470,7 @@ IMPLEMENT_FUNCTION(27, Coudert, function27)
 			getData()->location = kLocationOutsideCompartment;
 			getSavePoints()->push(kEntityCoudert, kEntityBoutarel, kAction123852928);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1515,7 +1512,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex)
 	case kActionDefault:
 		switch (parameters->param1) {
 		default:
-			CALLBACK_ACTION();
+			callbackAction();
 			// Stop processing here
 			return;
 
@@ -1615,7 +1612,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex)
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1654,7 +1651,7 @@ IMPLEMENT_FUNCTION_I(31, Coudert, function31, uint32)
 
 		case 2:
 		case 3:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1699,7 +1696,7 @@ IMPLEMENT_FUNCTION(32, Coudert, function32)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1726,7 +1723,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
 				setup_updateEntity(kCarRedSleeping, kPosition_540);
 			}
 		} else {
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -1763,7 +1760,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
 		case 4:
 			ENTITY_PARAM(2, 6) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 5:
@@ -1808,7 +1805,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33)
 		case 10:
 			ENTITY_PARAM(2, 6) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1882,7 +1879,7 @@ IMPLEMENT_FUNCTION_I(34, Coudert, function34, bool)
 			break;
 
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1902,7 +1899,8 @@ IMPLEMENT_FUNCTION_I(35, Coudert, function35, bool)
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 65);
 		}
 
-		UPDATE_PARAM(params->param2, getState()->time, 2700);
+		if (!Entity::updateParameter(params->param2, getState()->time, 2700))
+			break;
 
 		getSavePoints()->push(kEntityCoudert, kEntityMax, kActionMaxFreeFromCage);
 
@@ -1951,7 +1949,7 @@ IMPLEMENT_FUNCTION_I(35, Coudert, function35, bool)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1965,7 +1963,7 @@ IMPLEMENT_FUNCTION(36, Coudert, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTimeChapter1, params->param1, 1, setup_chapter1Handler)
+		Entity::timeCheckCallback(kTimeChapter1, params->param1, 1, WRAP_SETUP_FUNCTION(Coudert, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -2174,7 +2172,7 @@ IMPLEMENT_FUNCTION(39, Coudert, function39)
 			getSavePoints()->push(kEntityCoudert, kEntityVerges, kAction167854368);
 			ENTITY_PARAM(2, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2283,22 +2281,22 @@ label_callback_9:
 
 label_callback_10:
 		if (getState()->time > kTime1189800 && !ENTITY_PARAM(0, 1) && !ENTITY_PARAM(2, 1)) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 2700);
+			if (Entity::updateParameter(params->param3, getState()->time, 2700)) {
 				ENTITY_PARAM(0, 2) = 1;
 				ENTITY_PARAM(0, 1) = 1;
 
 				getEntities()->drawSequenceLeft(kEntityCoudert, "697F");
 
 				params->param3 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!ENTITY_PARAM(0, 2))
 			break;
 
-		TIME_CHECK_OBJECT(kTime1107000, params->param4, kObject111, kObjectLocation2);
-		TIME_CHECK_OBJECT(kTime1161000, params->param5, kObject111, kObjectLocation3);
-		TIME_CHECK_OBJECT(kTime1206000, params->param6, kObject111, kObjectLocation4);
+		timeCheckObject(kTime1107000, params->param4, kObject111, kObjectLocation2);
+		timeCheckObject(kTime1161000, params->param5, kObject111, kObjectLocation3);
+		timeCheckObject(kTime1206000, params->param6, kObject111, kObjectLocation4);
 		break;
 
 	case kAction1:
@@ -2536,7 +2534,7 @@ IMPLEMENT_FUNCTION(41, Coudert, function41)
 		case 18:
 			getSavePoints()->push(kEntityCoudert, kEntityMilos, kAction208228224);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2827,28 +2825,34 @@ label_callback_12:
 		}
 
 label_callback_13:
-		TIME_CHECK_CALLBACK(kTime2088900, params->param1, 14, setup_function32);
+		if (Entity::timeCheckCallback(kTime2088900, params->param1, 14, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_14:
-		TIME_CHECK_CALLBACK(kTime2119500, params->param2, 15, setup_function32);
+		if (Entity::timeCheckCallback(kTime2119500, params->param2, 15, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_15:
-		TIME_CHECK_CALLBACK(kTime2138400, params->param3, 16, setup_function32);
+		if (Entity::timeCheckCallback(kTime2138400, params->param3, 16, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_16:
-		TIME_CHECK_CALLBACK(kTime2147400, params->param4, 17, setup_function32);
+		if (Entity::timeCheckCallback(kTime2147400, params->param4, 17, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_17:
-		TIME_CHECK_CALLBACK(kTime2160000, params->param5, 18, setup_function32);
+		if (Entity::timeCheckCallback(kTime2160000, params->param5, 18, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_18:
-		TIME_CHECK_CALLBACK(kTime2205000, params->param6, 19, setup_function32);
+		if (Entity::timeCheckCallback(kTime2205000, params->param6, 19, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+			break;
 
 label_callback_19:
 		if (ENTITY_PARAM(0, 2)) {
-			TIME_CHECK_OBJECT(kTime2025000, params->param7, kObject111, kObjectLocation7);
-			TIME_CHECK_OBJECT(kTime2133000, params->param8, kObject111, kObjectLocation8);
-			TIME_CHECK_OBJECT(kTime2173500, CURRENT_PARAM(1, 1), kObject111, kObjectLocation9);
+			timeCheckObject(kTime2025000, params->param7, kObject111, kObjectLocation7);
+			timeCheckObject(kTime2133000, params->param8, kObject111, kObjectLocation8);
+			timeCheckObject(kTime2173500, CURRENT_PARAM(1, 1), kObject111, kObjectLocation9);
 		}
 		break;
 
@@ -3051,7 +3055,7 @@ IMPLEMENT_FUNCTION(46, Coudert, function46)
 			break;
 
 		case 11:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3116,7 +3120,7 @@ IMPLEMENT_FUNCTION_I(47, Coudert, function47, bool)
 			break;
 
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3164,7 +3168,7 @@ IMPLEMENT_FUNCTION(48, Coudert, function48)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3261,7 +3265,7 @@ IMPLEMENT_FUNCTION(49, Coudert, function49)
 			break;
 
 		case 11:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3347,7 +3351,7 @@ IMPLEMENT_FUNCTION(50, Coudert, function50)
 			break;
 
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3541,11 +3545,11 @@ label_callback_1:
 				params->param2 = (uint)(getState()->time + 4500);
 
 			if (params->param3 != kTimeInvalid) {
-				UPDATE_PARAM_PROC_TIME(params->param2, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param3, 0)
+				if (Entity::updateParameterTime((TimeValue)params->param2, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param3, 0)) {
 					setCallback(2);
 					setup_function55();
 					break;
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
@@ -3558,18 +3562,22 @@ label_callback_2:
 
 label_callback_3:
 		if (!params->param1) {
-			TIME_CHECK_CALLBACK(kTime2394000, params->param4, 4, setup_function56);
+			if (Entity::timeCheckCallback(kTime2394000, params->param4, 4, WRAP_SETUP_FUNCTION(Coudert, setup_function56)))
+				break;
 
 label_callback_4:
-			TIME_CHECK_CALLBACK(kTime2434500, params->param5, 5, setup_function32);
+			if (Entity::timeCheckCallback(kTime2434500, params->param5, 5, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+				break;
 
 label_callback_5:
-			TIME_CHECK_CALLBACK(kTime2448000, params->param6, 6, setup_function32);
+			if (Entity::timeCheckCallback(kTime2448000, params->param6, 6, WRAP_SETUP_FUNCTION(Coudert, setup_function32)))
+				break;
 		}
 
 label_callback_6:
 		if (getState()->time > kTime2538000 && !ENTITY_PARAM(0, 1) && !ENTITY_PARAM(2, 1)) {
-			UPDATE_PARAM(params->param7, getState()->time, 2700);
+			if (!Entity::updateParameter(params->param7, getState()->time, 2700))
+				break;
 
 			ENTITY_PARAM(0, 2) = 0;
 			ENTITY_PARAM(0, 1) = 1;
@@ -3696,7 +3704,7 @@ IMPLEMENT_FUNCTION(54, Coudert, function54)
 			break;
 
 		case 3:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3764,7 +3772,7 @@ IMPLEMENT_FUNCTION(55, Coudert, function55)
 			break;
 
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3868,7 +3876,7 @@ IMPLEMENT_FUNCTION(56, Coudert, function56)
 			break;
 
 		case 16:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -4034,7 +4042,8 @@ IMPLEMENT_FUNCTION(62, Coudert, function62)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
@@ -4168,7 +4177,7 @@ void Coudert::visitCompartment(const SavePoint &savepoint, EntityPosition positi
 
 		case 6:
 			getData()->location = kLocationOutsideCompartment;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/coudert.h b/engines/lastexpress/entities/coudert.h
index 45d13ce9bb..8303c80a32 100644
--- a/engines/lastexpress/entities/coudert.h
+++ b/engines/lastexpress/entities/coudert.h
@@ -24,8 +24,6 @@
 #define LASTEXPRESS_COUDERT_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
-
 namespace LastExpress {
 
 class LastExpressEngine;
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index e136ca4776..dad5e67392 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -22,22 +22,17 @@
 
 #include "lastexpress/entities/entity.h"
 
-#include "lastexpress/entities/entity_intern.h"
-
 #include "lastexpress/data/sequence.h"
 
 #include "lastexpress/game/action.h"
 #include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
-#include "lastexpress/game/scenes.h"
-#include "lastexpress/game/state.h"
+#include "lastexpress/game/object.h"
 #include "lastexpress/game/savegame.h"
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
+#include "lastexpress/game/scenes.h"
 
-#include "lastexpress/sound/sound.h"
-
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -55,6 +50,19 @@ EntityData::EntityCallData::~EntityCallData() {
 	SAFE_DELETE(sequence3);
 }
 
+void EntityData::EntityCallData::syncString(Common::Serializer &s, Common::String &string, uint length) const {
+	char seqName[13];
+	memset(&seqName, 0, length);
+
+	if (s.isSaving())
+		strcpy((char *)&seqName, string.c_str());
+
+	s.syncBytes((byte *)&seqName, length);
+
+	if (s.isLoading())
+		string = seqName;
+}
+
 void EntityData::EntityCallData::saveLoadWithSerializer(Common::Serializer &s) {
 	for (uint i = 0; i < ARRAYSIZE(callbacks); i++)
 		s.syncAsByte(callbacks[i]);
@@ -81,23 +89,19 @@ void EntityData::EntityCallData::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsByte(directionSwitch);
 
 	// Sync strings
-#define SYNC_STRING(varName, count) { \
-	char seqName[13]; \
-	memset(&seqName, 0, count); \
-	if (s.isSaving()) strcpy((char *)&seqName, varName.c_str()); \
-	s.syncBytes((byte *)&seqName, count); \
-	if (s.isLoading()) varName = seqName; \
-}
-
-	SYNC_STRING(sequenceName, 13);
-	SYNC_STRING(sequenceName2, 13);
-	SYNC_STRING(sequenceNamePrefix, 7);
-	SYNC_STRING(sequenceNameCopy, 13);
-
-#undef SYNC_STRING
+	syncString(s, sequenceName, 13);
+	syncString(s, sequenceName2, 13);
+	syncString(s, sequenceNamePrefix, 7);
+	syncString(s, sequenceNameCopy, 13);
 
 	// Skip pointers to frame & sequences
-	s.skip(5 * 4);
+	// (we are using a compressed stream, so we cannot seek on load)
+	if (s.isLoading()) {
+		byte empty[5 * 4];
+		s.syncBytes(empty, 5 * 4);
+	} else {
+		s.skip(5 * 4);
+	}
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -113,7 +117,7 @@ EntityData::EntityParameters *EntityData::getParameters(uint callback, byte inde
 	return _parameters[callback].parameters[index];
 }
 
-int EntityData::getCallback(uint callback) const {
+byte EntityData::getCallback(uint callback) const {
 	if (callback >= 16)
 		error("[EntityData::getCallback] Invalid callback value (was: %d, max: 16)", callback);
 
@@ -246,16 +250,38 @@ void Entity::savegame(const SavePoint &savepoint) {
 		break;
 
 	case kActionNone:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
 		getSaveLoad()->saveGame((SavegameType)params->param1, _entityIndex, (EventIndex)params->param2);
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 }
 
+void Entity::savegameBloodJacket() {
+	if (getProgress().jacket == kJacketBlood
+	 && getEntities()->isDistanceBetweenEntities(_entityIndex, kEntityPlayer, 1000)
+	 && !getEntities()->isInsideCompartments(kEntityPlayer)
+	 && !getEntities()->checkFields10(kEntityPlayer)) {
+		setCallback(1);
+
+		switch (_entityIndex) {
+		default:
+			break;
+
+		case kEntityCoudert:
+			setup_savegame(kSavegameTypeEvent, kEventCoudertBloodJacket);
+			break;
+
+		case kEntityMertens:
+			setup_savegame(kSavegameTypeEvent, kEventCoudertBloodJacket);
+			break;
+		}
+	}
+}
+
 void Entity::playSound(const SavePoint &savepoint, bool resetItem, SoundFlag flag) {
 	EXPOSE_PARAMS(EntityData::EntityParametersSIIS)
 
@@ -264,7 +290,7 @@ void Entity::playSound(const SavePoint &savepoint, bool resetItem, SoundFlag fla
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -284,7 +310,7 @@ void Entity::draw(const SavePoint &savepoint, bool handleExcuseMe) {
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
@@ -308,7 +334,7 @@ void Entity::draw2(const SavePoint &savepoint) {
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -326,8 +352,10 @@ void Entity::updateFromTicks(const SavePoint &savepoint) {
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->timeTicks, params->param1)
-		CALLBACK_ACTION();
+		if (Entity::updateParameter(params->param2, getState()->timeTicks, params->param1))
+			break;
+
+		callbackAction();
 		break;
 	}
 }
@@ -340,8 +368,10 @@ void Entity::updateFromTime(const SavePoint &savepoint) {
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, params->param1)
-		CALLBACK_ACTION();
+		if (Entity::updateParameter(params->param2, getState()->time, params->param1))
+			break;
+
+		callbackAction();
 		break;
 	}
 }
@@ -352,12 +382,12 @@ void Entity::callbackActionOnDirection(const SavePoint &savepoint) {
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
 		if (getData()->direction != kDirectionRight)
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 }
@@ -370,7 +400,7 @@ void Entity::callbackActionRestaurantOrSalon(const SavePoint &savepoint) {
 	case kActionNone:
 	case kActionDefault:
 		if (getEntities()->isSomebodyInsideRestaurantOrSalon())
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 }
@@ -395,7 +425,7 @@ void Entity::updateEntity(const SavePoint &savepoint, bool handleExcuseMe) {
 	case kActionNone:
 	case kActionDefault:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 }
@@ -410,7 +440,7 @@ void Entity::callSavepoint(const SavePoint &savepoint, bool handleExcuseMe) {
 	case kActionExitCompartment:
 		if (!CURRENT_PARAM(1, 1))
 			getSavePoints()->call(_entityIndex, (EntityIndex)params->param4, (ActionIndex)params->param5, (char *)&params->seq2);
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
@@ -448,7 +478,7 @@ void Entity::enterExitCompartment(const SavePoint &savepoint, EntityPosition pos
 		if (updateLocation)
 			getData()->location = kLocationInsideCompartment;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -468,6 +498,74 @@ void Entity::enterExitCompartment(const SavePoint &savepoint, EntityPosition pos
 	}
 }
 
+void Entity::goToCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, Common::String sequenceTo) {
+	switch (savepoint.action) {
+	default:
+		break;
+
+	case kActionDefault:
+		getData()->entityPosition = positionFrom;
+		setCallback(1);
+		setup_enterExitCompartment(sequenceFrom.c_str(), compartmentFrom);
+		break;
+
+	case kActionCallback:
+		switch (getCallback()) {
+		default:
+			break;
+
+		case 1:
+			setCallback(2);
+			setup_enterExitCompartment(sequenceTo.c_str(), compartmentFrom);
+			break;
+
+		case 2:
+			getData()->entityPosition = positionFrom;
+			getEntities()->clearSequences(_entityIndex);
+			callbackAction();
+			break;
+		}
+		break;
+	}
+}
+
+void Entity::goToCompartmentFromCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, ObjectIndex compartmentTo, EntityPosition positionTo, Common::String sequenceTo) {
+	switch (savepoint.action) {
+	default:
+		break;
+
+	case kActionDefault:
+		getData()->entityPosition = positionFrom;
+		getData()->location = kLocationOutsideCompartment;
+		setCallback(1);
+		setup_enterExitCompartment(sequenceFrom.c_str(), compartmentFrom);
+		break;
+
+	case kActionCallback:
+		switch (getCallback()) {
+		default:
+			break;
+
+		case 1:
+			setCallback(2);
+			setup_updateEntity(kCarGreenSleeping, positionTo);
+			break;
+
+		case 2:
+			setCallback(3);
+			setup_enterExitCompartment(sequenceTo.c_str(), compartmentTo);
+			break;
+
+		case 3:
+			getData()->location = kLocationInsideCompartment;
+			getEntities()->clearSequences(_entityIndex);
+			callbackAction();
+			break;
+		}
+		break;
+	}
+}
+
 void Entity::updatePosition(const SavePoint &savepoint, bool handleExcuseMe) {
 	EXPOSE_PARAMS(EntityData::EntityParametersSIII)
 
@@ -477,7 +575,7 @@ void Entity::updatePosition(const SavePoint &savepoint, bool handleExcuseMe) {
 
 	case kActionExitCompartment:
 		getEntities()->updatePositionExit(_entityIndex, (CarIndex)params->param4, (Position)params->param5);
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
@@ -494,4 +592,385 @@ void Entity::updatePosition(const SavePoint &savepoint, bool handleExcuseMe) {
 	}
 }
 
+void Entity::callbackAction() {
+	if (getData()->currentCall == 0)
+		error("[Entity::callbackAction] currentCall is already 0, cannot proceed");
+
+	getData()->currentCall--;
+
+	getSavePoints()->setCallback(_entityIndex, _callbacks[_data->getCurrentCallback()]);
+
+	getSavePoints()->call(_entityIndex, _entityIndex, kActionCallback);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Setup functions
+//////////////////////////////////////////////////////////////////////////
+void Entity::setup(const char *name, uint index) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s()", name);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIIII>();
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupI(const char *name, uint index, uint param1) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u)", name, param1);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIIII>();
+
+	EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
+	params->param1 = (unsigned int)param1;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupII(const char *name, uint index, uint param1, uint param2) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %u)", name, param1, param2);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIIII>();
+
+	EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
+	params->param1 = param1;
+	params->param2 = param2;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupIII(const char *name, uint index, uint param1, uint param2, uint param3) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %u, %u)", name, param1, param2, param3);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIIII>();
+
+	EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII *)_data->getCurrentParameters();
+	params->param1 = param1;
+	params->param2 = param2;
+	params->param3 = param3;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupS(const char *name, uint index, const char *seq1) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s)", name, seq1);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSIIS>();
+
+	EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSS(const char *name, uint index, const char *seq1, const char *seq2) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %s)", name, seq1, seq2);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSSII>();
+
+	EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+	strncpy(params->seq2, seq2, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSI(const char *name, uint index, const char *seq1, uint param4) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %u)", name, seq1, param4);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSIIS>();
+
+	EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+	params->param4 = param4;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSII(const char *name, uint index, const char *seq1, uint param4, uint param5) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %u, %u)", name, seq1, param4, param5);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSIIS>();
+
+	EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+	params->param4 = param4;
+	params->param5 = param5;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSIII(const char *name, uint index, const char *seq, uint param4, uint param5, uint param6) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %u, %u, %u)", name, seq, param4, param5, param6);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSIII>();
+
+	EntityData::EntityParametersSIII *params = (EntityData::EntityParametersSIII *)_data->getCurrentParameters();
+	strncpy(params->seq, seq, 12);
+	params->param4 = param4;
+	params->param5 = param5;
+	params->param6 = param6;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSIIS(const char *name, uint index, const char *seq1, uint param4, uint param5, const char *seq2) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %u, %u, %s)", name, seq1, param4, param5, seq2);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSIIS>();
+
+	EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS *)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+	params->param4 = param4;
+	params->param5 = param5;
+	strncpy(params->seq2, seq2, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupSSI(const char *name, uint index, const char *seq1, const char *seq2, uint param7) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%s, %s, %u)", name, seq1, seq2, param7);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersSSII>();
+
+	EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII *)_data->getCurrentParameters();
+	strncpy(params->seq1, seq1, 12);
+	strncpy(params->seq2, seq2, 12);
+	params->param7 = param7;
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupIS(const char *name, uint index, uint param1, const char *seq) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %s)", name, param1, seq);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersISII>();
+
+	EntityData::EntityParametersISII *params = (EntityData::EntityParametersISII *)_data->getCurrentParameters();
+	params->param1 = (unsigned int)param1;
+	strncpy(params->seq, seq, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupISS(const char *name, uint index, uint param1, const char *seq1, const char *seq2) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %s, %s)", name, param1, seq1, seq2);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersISSI>();
+
+	EntityData::EntityParametersISSI *params = (EntityData::EntityParametersISSI *)_data->getCurrentParameters();
+	params->param1 = param1;
+	strncpy(params->seq1, seq1, 12);
+	strncpy(params->seq2, seq2, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupIIS(const char *name, uint index, uint param1, uint param2, const char *seq) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %u, %s)", name, param1, param2, seq);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIISI>();
+
+	EntityData::EntityParametersIISI *params = (EntityData::EntityParametersIISI *)_data->getCurrentParameters();
+	params->param1 = param1;
+	params->param2 = param2;
+	strncpy(params->seq, seq, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+void Entity::setupIISS(const char *name, uint index, uint param1, uint param2, const char *seq1, const char *seq2) {
+	debugC(6, kLastExpressDebugLogic, "Entity: %s(%u, %u, %s, %s)", name, param1, param2, seq1, seq2);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]);
+	_data->setCurrentCallback(index);
+	_data->resetCurrentParameters<EntityData::EntityParametersIISS>();
+
+	EntityData::EntityParametersIISS *params = (EntityData::EntityParametersIISS *)_data->getCurrentParameters();
+	params->param1 = param1;
+	params->param2 = param2;
+	strncpy(params->seq1, seq1, 12);
+	strncpy(params->seq2, seq2, 12);
+
+	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// Helper functions
+//////////////////////////////////////////////////////////////////////////
+
+bool Entity::updateParameter(uint &parameter, uint timeType, uint delta) const {
+	if (!parameter)
+		parameter = (uint)(timeType + delta);
+
+	if (parameter >= timeType)
+		return false;
+
+	parameter = kTimeInvalid;
+
+	return true;
+}
+
+bool Entity::updateParameterTime(TimeValue timeValue, bool check, uint &parameter, uint delta) const {
+	if (getState()->time <= timeValue) {
+		if (check || !parameter)
+			parameter = (uint)(getState()->time + delta);
+	}
+
+	if (parameter >= getState()->time && getState()->time <= timeValue)
+		return false;
+
+	parameter = kTimeInvalid;
+
+	return true;
+}
+
+bool Entity::updateParameterCheck(uint &parameter, uint timeType, uint delta) const {
+	if (parameter && parameter >= timeType)
+		return false;
+
+	if (!parameter)
+		parameter = (uint)(timeType + delta);
+
+	return true;
+}
+
+bool Entity::timeCheck(TimeValue timeValue, uint &parameter, Common::Functor0<void> *function) const {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		(*function)();
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		(*function)();
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, const char *str, Common::Functor1<const char *, void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		(*function)(str);
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, bool check, Common::Functor1<bool, void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		(*function)(check);
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCallbackInventory(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		getData()->inventoryItem = kItemNone;
+		setCallback(callback);
+		(*function)();
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckCar(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function) {
+	if ((getState()->time <= timeValue && !getEntities()->isPlayerInCar(kCarGreenSleeping)) || !parameter)
+		parameter = (uint)getState()->time + 75;
+
+	if (getState()->time > timeValue || parameter < getState()->time) {
+		parameter = kTimeInvalid;
+		setCallback(callback);
+		(*function)();
+
+		return true;
+	}
+
+	return false;
+}
+
+void Entity::timeCheckSavepoint(TimeValue timeValue, uint &parameter, EntityIndex entity1, EntityIndex entity2, ActionIndex action) const {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		getSavePoints()->push(entity1, entity2, action);
+	}
+}
+
+void Entity::timeCheckObject(TimeValue timeValue, uint &parameter, ObjectIndex object, ObjectLocation location) const {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		getObjects()->updateLocation2(object, location);
+	}
+}
+
+bool Entity::timeCheckCallbackAction(TimeValue timeValue, uint &parameter) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		callbackAction();
+		return true;
+	}
+
+	return false;
+}
+
+bool Entity::timeCheckPlaySoundUpdatePosition(TimeValue timeValue, uint &parameter, byte callback, const char* sound, EntityPosition position) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		getData()->entityPosition = position;
+		setCallback(callback);
+		setup_playSound(sound);
+		return true;
+	}
+
+	return false;
+}
+
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 039f461c7b..c67d13db9e 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -41,10 +41,229 @@ class Sequence;
 class SequenceFrame;
 struct SavePoint;
 
+//////////////////////////////////////////////////////////////////////////
+// Declaration
+//////////////////////////////////////////////////////////////////////////
+#define DECLARE_FUNCTION(name) \
+	void setup_##name(); \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_FUNCTION_1(name, param1) \
+	void setup_##name(param1); \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_FUNCTION_2(name, param1, param2) \
+	void setup_##name(param1, param2); \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_FUNCTION_3(name, param1, param2, param3) \
+	void setup_##name(param1, param2, param3); \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_FUNCTION_4(name, param1, param2, param3, param4) \
+	void setup_##name(param1, param2, param3, param4); \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_FUNCTION_NOSETUP(name) \
+	void name(const SavePoint &savepoint);
+
+#define DECLARE_NULL_FUNCTION() \
+	void setup_nullfunction();
+
+//////////////////////////////////////////////////////////////////////////
+// Callbacks
+//////////////////////////////////////////////////////////////////////////
+#define ENTITY_CALLBACK(class, name, pointer) \
+	Common::Functor1Mem<const SavePoint&, void, class>(pointer, &class::name)
+
+#define ADD_CALLBACK_FUNCTION(class, name) \
+	_callbacks.push_back(new ENTITY_CALLBACK(class, name, this));
+
+#define ADD_NULL_FUNCTION() \
+	_callbacks.push_back(new ENTITY_CALLBACK(Entity, nullfunction, this));
+
+#define WRAP_SETUP_FUNCTION(className, method) \
+	new Common::Functor0Mem<void, className>(this, &className::method)
+
+#define WRAP_SETUP_FUNCTION_S(className, method) \
+	new Common::Functor1Mem<const char *, void, className>(this, &className::method)
+
+#define WRAP_SETUP_FUNCTION_B(className, method) \
+	new Common::Functor1Mem<bool, void, className>(this, &className::method)
+
+//////////////////////////////////////////////////////////////////////////
+// Parameters macros
+//////////////////////////////////////////////////////////////////////////
+#define CURRENT_PARAM(index, id) \
+	((EntityData::EntityParametersIIII*)_data->getCurrentParameters(index))->param##id
+
+#define ENTITY_PARAM(index, id) \
+	((EntityData::EntityParametersIIII*)_data->getParameters(8, index))->param##id
+
+//////////////////////////////////////////////////////////////////////////
+// Misc
+//////////////////////////////////////////////////////////////////////////
+#define RESET_ENTITY_STATE(entity, class, function) \
+	getEntities()->resetState(entity); \
+	((class *)getEntities()->get(entity))->function();
+
+//////////////////////////////////////////////////////////////////////////
+// Implementation
+//////////////////////////////////////////////////////////////////////////
+
+// Expose parameters and check validity
+#define EXPOSE_PARAMS(type) \
+	type *params = (type *)_data->getCurrentParameters(); \
+	if (!params) \
+		error("[EXPOSE_PARAMS] Trying to call an entity function with invalid parameters"); \
+
+// function signature without setup (we keep the index for consistency but never use it)
+#define IMPLEMENT_FUNCTION_NOSETUP(index, class, name) \
+	void class::name(const SavePoint &savepoint) { \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(index=" #index ")");
+
+// simple setup with no parameters
+#define IMPLEMENT_FUNCTION(index, class, name) \
+	void class::setup_##name() { \
+		Entity::setup(#class "::setup_" #name, index); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "() - action: %s", ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_END }
+
+// nullfunction call
+#define IMPLEMENT_NULL_FUNCTION(index, class) \
+	void class::setup_nullfunction() { \
+		Entity::setup(#class "::setup_nullfunction", index); \
+	}
+
+// setup with one uint parameter
+#define IMPLEMENT_FUNCTION_I(index, class, name, paramType) \
+	void class::setup_##name(paramType param1) { \
+		Entity::setupI(#class "::setup_" #name, index, param1); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d) - action: %s", params->param1, ACTION_NAME(savepoint.action));
+
+// setup with two uint parameters
+#define IMPLEMENT_FUNCTION_II(index, class, name, paramType1, paramType2) \
+	void class::setup_##name(paramType1 param1, paramType2 param2) { \
+		Entity::setupII(#class "::setup_" #name, index, param1, param2); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d) - action: %s", params->param1, params->param2, ACTION_NAME(savepoint.action));
+
+// setup with three uint parameters
+#define IMPLEMENT_FUNCTION_III(index, class, name, paramType1, paramType2, paramType3) \
+	void class::setup_##name(paramType1 param1, paramType2 param2, paramType3 param3) { \
+		Entity::setupIII(#class "::setup_" #name, index, param1, param2, param3); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %d) - action: %s", params->param1, params->param2, params->param3, ACTION_NAME(savepoint.action));
+
+// setup with one char *parameter
+#define IMPLEMENT_FUNCTION_S(index, class, name) \
+	void class::setup_##name(const char *seq1) { \
+		Entity::setupS(#class "::setup_" #name, index, seq1); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s) - action: %s", (char *)&params->seq1, ACTION_NAME(savepoint.action));
+
+// setup with one char *parameter and one uint
+#define IMPLEMENT_FUNCTION_SI(index, class, name, paramType2) \
+	void class::setup_##name(const char *seq1, paramType2 param4) { \
+		Entity::setupSI(#class "::setup_" #name, index, seq1, param4); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d) - action: %s", (char *)&params->seq1, params->param4, ACTION_NAME(savepoint.action));
+
+// setup with one char *parameter and two uints
+#define IMPLEMENT_FUNCTION_SII(index, class, name, paramType2, paramType3) \
+	void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5) { \
+		Entity::setupSII(#class "::setup_" #name, index, seq1, param4, param5); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d) - action: %s", (char *)&params->seq1, params->param4, params->param5, ACTION_NAME(savepoint.action));
+
+// setup with one char *parameter and three uints
+#define IMPLEMENT_FUNCTION_SIII(index, class, name, paramType2, paramType3, paramType4) \
+	void class::setup_##name(const char *seq, paramType2 param4, paramType3 param5, paramType4 param6) { \
+		Entity::setupSIII(#class "::setup_" #name, index, seq, param4, param5, param6); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSIII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %d) - action: %s", (char *)&params->seq, params->param4, params->param5, params->param6, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_SIIS(index, class, name, paramType2, paramType3) \
+	void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5, const char *seq2) { \
+		Entity::setupSIIS(#class "::setup_" #name, index, seq1, param4, param5, seq2); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %s) - action: %s", (char *)&params->seq1, params->param4, params->param5, (char *)&params->seq2, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_SS(index, class, name) \
+	void class::setup_##name(const char *seq1, const char *seq2) { \
+		Entity::setupSS(#class "::setup_" #name, index, seq1, seq2); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSSII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s) - action: %s", (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_SSI(index, class, name, paramType3) \
+	void class::setup_##name(const char *seq1, const char *seq2, paramType3 param7) { \
+		Entity::setupSSI(#class "::setup_" #name, index, seq1, seq2, param7); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersSSII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s, %d) - action: %s", (char *)&params->seq1, (char *)&params->seq2, params->param7, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_IS(index, class, name, paramType) \
+	void class::setup_##name(paramType param1, const char *seq) { \
+		Entity::setupIS(#class "::setup_" #name, index, param1, seq); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersISII) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s) - action: %s", params->param1, (char *)&params->seq, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_ISS(index, class, name, paramType) \
+	void class::setup_##name(paramType param1, const char *seq1, const char *seq2) { \
+		Entity::setupISS(#class "::setup_" #name, index, param1, seq1, seq2); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersISSI) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s, %s) - action: %s", params->param1, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_IIS(index, class, name, paramType1, paramType2) \
+	void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq) { \
+		Entity::setupIIS(#class "::setup_" #name, index, param1, param2, seq); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIISI) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s) - action: %s", params->param1, params->param2, (char *)&params->seq, ACTION_NAME(savepoint.action));
+
+#define IMPLEMENT_FUNCTION_IISS(index, class, name, paramType1, paramType2) \
+	void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq1, const char *seq2) { \
+		Entity::setupIISS(#class "::setup_" #name, index, param1, param2, seq1, seq2); \
+	} \
+	void class::name(const SavePoint &savepoint) { \
+		EXPOSE_PARAMS(EntityData::EntityParametersIISS) \
+		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s, %s) - action: %s", params->param1, params->param2, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
+
+
+//////////////////////////////////////////////////////////////////////////
 class EntityData : Common::Serializable {
 public:
 
-	struct EntityParameters : Common::Serializable{
+	struct EntityParameters : Common::Serializable {
 		virtual ~EntityParameters() {}
 		virtual Common::String toString() = 0;
 
@@ -596,6 +815,15 @@ public:
 			return str;
 		}
 
+		/**
+		 * Synchronizes a string.
+		 *
+		 * @param	s	  	The Common::Serializer to use.
+		 * @param	string	The string.
+		 * @param	length	Length of the string.
+		 */
+		void syncString(Common::Serializer &s, Common::String &string, uint length) const;
+
 		// Serializable
 		void saveLoadWithSerializer(Common::Serializer &s);
 	};
@@ -611,32 +839,30 @@ public:
 			params->parameters[i] = new T();
 	}
 
-	EntityCallData 	  *getCallData() { return &_data; }
+	EntityCallData       *getCallData() { return &_data; }
 
-	EntityParameters  *getParameters(uint callback, byte index) const;
-	EntityParameters  *getCurrentParameters(byte index = 0) { return getParameters(_data.currentCall, index); }
+	EntityParameters     *getParameters(uint callback, byte index) const;
+	EntityParameters     *getCurrentParameters(byte index = 0) { return getParameters(_data.currentCall, index); }
+	EntityCallParameters *getCurrentCallParameters() { return &_parameters[_data.currentCall]; }
 
-	int 			   getCallback(uint callback) const;
-	int				   getCurrentCallback() { return getCallback(_data.currentCall); }
-	void 			   setCallback(uint callback, byte index);
-	void 			   setCurrentCallback(uint index) { setCallback(_data.currentCall, index); }
+	byte                  getCallback(uint callback) const;
+	byte                  getCurrentCallback() { return getCallback(_data.currentCall); }
+	void                  setCallback(uint callback, byte index);
+	void                  setCurrentCallback(uint index) { setCallback(_data.currentCall, index); }
 
-	void               updateParameters(uint32 index) const;
+	void                  updateParameters(uint32 index) const;
 
 	// Serializable
-	void 			   saveLoadWithSerializer(Common::Serializer &ser);
+	void                  saveLoadWithSerializer(Common::Serializer &ser);
 
 private:
 
-	EntityCallData 		 _data;
+	EntityCallData       _data;
 	EntityCallParameters _parameters[9];
 };
 
 class Entity : Common::Serializable {
 public:
-
-	typedef Common::Functor1<const SavePoint&, void> Callback;
-
 	Entity(LastExpressEngine *engine, EntityIndex index);
 	virtual ~Entity();
 
@@ -657,6 +883,12 @@ public:
 	virtual void setup_chapter4() = 0;
 	virtual void setup_chapter5() = 0;
 
+	// Shared functions
+	virtual void setup_savegame(SavegameType, uint32) { error("[Entity::setup_savegame] Trying to call the parent setup function. Use the specific entity function directly"); }
+	virtual void setup_enterExitCompartment(const char *, ObjectIndex) { error("[Entity::setup_enterExitCompartment] Trying to call the parent setup function. Use the specific entity function directly"); }
+	virtual void setup_updateEntity(CarIndex, EntityPosition) { error("[Entity::setup_updateEntity] Trying to call the parent setup function. Use the specific entity function directly"); }
+	virtual void setup_playSound(const char*) { error("[Entity::setup_playSound] Trying to call the parent setup function. Use the specific entity function directly"); }
+
 	// Serializable
 	void saveLoadWithSerializer(Common::Serializer &ser) { _data->saveLoadWithSerializer(ser); }
 
@@ -664,10 +896,11 @@ public:
 
 protected:
 	LastExpressEngine *_engine;
+	typedef Common::Functor1<const SavePoint&, void> Callback;
 
-	EntityIndex				  _entityIndex;
-	EntityData 				 *_data;
-	Common::Array<Callback *> _callbacks;
+	EntityIndex                _entityIndex;
+	EntityData                *_data;
+	Common::Array<Callback *>  _callbacks;
 
 	/**
 	 * Saves the game
@@ -679,6 +912,13 @@ protected:
 	void savegame(const SavePoint &savepoint);
 
 	/**
+	 * Saves the game before being found out with a blood covered jacket.
+	 *
+	 * @param	saveFunction	The setup function to call to save the game
+	 */
+	void savegameBloodJacket();
+
+	/**
 	 * Play sound
 	 *
 	 * @param savepoint The savepoint
@@ -782,15 +1022,83 @@ protected:
 	void enterExitCompartment(const SavePoint &savepoint, EntityPosition position1 = kPositionNone, EntityPosition position2 = kPositionNone, CarIndex car = kCarNone, ObjectIndex compartment = kObjectNone, bool alternate = false, bool updateLocation = false);
 
 	/**
+	 * Go to compartment.
+	 *
+	 * @param	savepoint			 	The savepoint.
+	 * @param	compartmentFrom		 	The compartment from.
+	 * @param	positionFrom		 	The position from.
+	 * @param	sequenceFrom		 	The sequence from.
+	 * @param	sequenceTo			 	The sequence to.
+	 */
+	void goToCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, Common::String sequenceTo);
+
+	/**
+	 * Go to compartment from compartment.
+	 *
+	 * @param	savepoint			  	The savepoint.
+	 * @param	compartmentFrom		  	The compartment from.
+	 * @param	positionFrom		  	The position from.
+	 * @param	sequenceFrom		  	The sequence from.
+	 * @param	compartmentTo		  	The compartment to.
+	 * @param	positionTo			  	The position to.
+	 * @param	sequenceTo			  	The sequence to.
+	 */
+	void goToCompartmentFromCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, ObjectIndex compartmentTo, EntityPosition positionTo, Common::String sequenceTo);
+
+	/**
 	 * Updates the position
 	 *
-	 * @param savepoint 	 The savepoint
+	 * @param savepoint       The savepoint
 	 *                        - Sequence name
 	 *                        - CarIndex
 	 *                        - Position
 	 * @param handleExcuseMe true to handle excuseMe actions
 	 */
 	void updatePosition(const SavePoint &savepoint, bool handleExcuseMe = false);
+
+	/**
+	 * Store the current callback information and perform the callback action
+	 */
+	void callbackAction();
+
+	//////////////////////////////////////////////////////////////////////////
+	// Setup functions
+	//////////////////////////////////////////////////////////////////////////
+	void setup(const char *name, uint index);
+	void setupI(const char *name, uint index, uint param1);
+	void setupII(const char *name, uint index, uint param1, uint param2);
+	void setupIII(const char *name, uint index, uint param1, uint param2, uint param3);
+	void setupS(const char *name, uint index, const char *seq1);
+	void setupSS(const char *name, uint index, const char *seq1, const char *seq2);
+	void setupSI(const char *name, uint index, const char *seq1, uint param4);
+	void setupSII(const char *name, uint index, const char *seq1, uint param4, uint param5);
+	void setupSIII(const char *name, uint index, const char *seq, uint param4, uint param5, uint param6);
+	void setupSIIS(const char *name, uint index, const char *seq1, uint param4, uint param5, const char *seq2);
+	void setupSSI(const char *name, uint index, const char *seq1, const char *seq2, uint param7);
+	void setupIS(const char *name, uint index, uint param1, const char *seq);
+	void setupISS(const char *name, uint index, uint param1, const char *seq1, const char *seq2);
+	void setupIIS(const char *name, uint index, uint param1, uint param2, const char *seq);
+	void setupIISS(const char *name, uint index, uint param1, uint param2, const char *seq1, const char *seq2);
+
+	//////////////////////////////////////////////////////////////////////////
+	// Helper functions
+	//////////////////////////////////////////////////////////////////////////
+
+	bool updateParameter(uint &parameter, uint timeType, uint delta) const;
+	bool updateParameterCheck(uint &parameter, uint timeType, uint delta) const;
+	bool updateParameterTime(TimeValue timeValue, bool check, uint &parameter, uint delta) const;
+
+	bool timeCheck(TimeValue timeValue, uint &parameter, Common::Functor0<void> *function) const;
+	bool timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function);
+	bool timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, const char *str, Common::Functor1<const char *, void> *function);
+	bool timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, bool check, Common::Functor1<bool, void> *function);
+	bool timeCheckCallbackInventory(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function);
+	bool timeCheckCar(TimeValue timeValue, uint &parameter, byte callback, Common::Functor0<void> *function);
+	void timeCheckSavepoint(TimeValue timeValue, uint &parameter, EntityIndex entity1, EntityIndex entity2, ActionIndex action) const;
+	void timeCheckObject(TimeValue timeValue, uint &parameter, ObjectIndex index, ObjectLocation location) const;
+	bool timeCheckCallbackAction(TimeValue timeValue, uint &parameter);
+	bool timeCheckPlaySoundUpdatePosition(TimeValue timeValue, uint &parameter, byte callback, const char* sound, EntityPosition position);
+
 };
 
 
diff --git a/engines/lastexpress/entities/entity39.cpp b/engines/lastexpress/entities/entity39.cpp
index e786d153a0..1786cd2201 100644
--- a/engines/lastexpress/entities/entity39.cpp
+++ b/engines/lastexpress/entities/entity39.cpp
@@ -28,7 +28,6 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
diff --git a/engines/lastexpress/entities/entity39.h b/engines/lastexpress/entities/entity39.h
index 4335a9566e..54b65408c7 100644
--- a/engines/lastexpress/entities/entity39.h
+++ b/engines/lastexpress/entities/entity39.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_ENTITY39_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -72,4 +71,4 @@ private:
 
 } // End of namespace LastExpress
 
-#endif // LASTEXPRESS_##define##_H
+#endif // LASTEXPRESS_ENTITY39_H
diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h
index 2da0da15b3..fd803676a9 100644
--- a/engines/lastexpress/entities/entity_intern.h
+++ b/engines/lastexpress/entities/entity_intern.h
@@ -25,502 +25,6 @@
 
 namespace LastExpress {
 
-#define LOW_BYTE(w)           ((unsigned char)(((unsigned long)(w)) & 0xff))
-
-//////////////////////////////////////////////////////////////////////////
-// Callbacks
-#define ENTITY_CALLBACK(class, name, pointer) \
-	Common::Functor1Mem<const SavePoint&, void, class>(pointer, &class::name)
-
-#define ADD_CALLBACK_FUNCTION(class, name) \
-	_callbacks.push_back(new ENTITY_CALLBACK(class, name, this));
-
-#define ADD_NULL_FUNCTION() \
-	_callbacks.push_back(new ENTITY_CALLBACK(Entity, nullfunction, this));
-
-//////////////////////////////////////////////////////////////////////////
-// Declaration
-//////////////////////////////////////////////////////////////////////////
-
-#define DECLARE_FUNCTION(name) \
-	void setup_##name(); \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_FUNCTION_1(name, param1) \
-	void setup_##name(param1); \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_FUNCTION_2(name, param1, param2) \
-	void setup_##name(param1, param2); \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_FUNCTION_3(name, param1, param2, param3) \
-	void setup_##name(param1, param2, param3); \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_FUNCTION_4(name, param1, param2, param3, param4) \
-	void setup_##name(param1, param2, param3, param4); \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_FUNCTION_NOSETUP(name) \
-	void name(const SavePoint &savepoint);
-
-#define DECLARE_NULL_FUNCTION() \
-	void setup_nullfunction();
-
-//////////////////////////////////////////////////////////////////////////
-// Setup
-//////////////////////////////////////////////////////////////////////////
-
-#define IMPLEMENT_SETUP(class, callback_class, name, index) \
-void class::setup_##name() { \
-	BEGIN_SETUP(callback_class, name, index, EntityData::EntityParametersIIII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::setup_" #name "()"); \
-	END_SETUP() \
-}
-
-#define BEGIN_SETUP(class, name, index, type) \
-	_engine->getGameLogic()->getGameState()->getGameSavePoints()->setCallback(_entityIndex, _callbacks[index]); \
-	_data->setCurrentCallback(index); \
-	_data->resetCurrentParameters<type>();
-
-#define END_SETUP() \
-	_engine->getGameLogic()->getGameState()->getGameSavePoints()->call(_entityIndex, _entityIndex, kActionDefault);
-
-
-//////////////////////////////////////////////////////////////////////////
-// Implementation
-//////////////////////////////////////////////////////////////////////////
-
-// Expose parameters and check validity
-#define EXPOSE_PARAMS(type) \
-	type *params = (type *)_data->getCurrentParameters(); \
-	if (!params) \
-		error("[EXPOSE_PARAMS] Trying to call an entity function with invalid parameters"); \
-
-
-// function signature without setup (we keep the index for consistency but never use it)
-#define IMPLEMENT_FUNCTION_NOSETUP(index, class, name) \
-	void class::name(const SavePoint &savepoint) { \
-		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(index=" #index ")");
-
-// simple setup with no parameters
-#define IMPLEMENT_FUNCTION(index, class, name) \
-	IMPLEMENT_SETUP(class, class, name, index) \
-	void class::name(const SavePoint &savepoint) { \
-		EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
-		debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "() - action: %s", ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_END }
-
-// nullfunction call
-#define IMPLEMENT_NULL_FUNCTION(index, class) \
-	IMPLEMENT_SETUP(class, Entity, nullfunction, index)
-
-// setup with one uint parameter
-#define IMPLEMENT_FUNCTION_I(index, class, name, paramType) \
-	void class::setup_##name(paramType param1) { \
-	BEGIN_SETUP(class, name, index, EntityData::EntityParametersIIII) \
-	EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters(); \
-	params->param1 = (unsigned int)param1; \
-	END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d) - action: %s", params->param1, ACTION_NAME(savepoint.action));
-
-// setup with two uint parameters
-#define IMPLEMENT_FUNCTION_II(index, class, name, paramType1, paramType2) \
-	void class::setup_##name(paramType1 param1, paramType2 param2) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersIIII) \
-		EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters(); \
-		params->param1 = param1; \
-		params->param2 = param2; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d) - action: %s", params->param1, params->param2, ACTION_NAME(savepoint.action));
-
-// setup with three uint parameters
-#define IMPLEMENT_FUNCTION_III(index, class, name, paramType1, paramType2, paramType3) \
-	void class::setup_##name(paramType1 param1, paramType2 param2, paramType3 param3) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersIIII) \
-		EntityData::EntityParametersIIII *params = (EntityData::EntityParametersIIII*)_data->getCurrentParameters(); \
-		params->param1 = param1; \
-		params->param2 = param2; \
-		params->param3 = param3; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersIIII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %d) - action: %s", params->param1, params->param2, params->param3, ACTION_NAME(savepoint.action));
-
-// setup with one char *parameter
-#define IMPLEMENT_FUNCTION_S(index, class, name) \
-	void class::setup_##name(const char *seq1) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
-		EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s) - action: %s", (char *)&params->seq1, ACTION_NAME(savepoint.action));
-
-// setup with one char *parameter and one uint
-#define IMPLEMENT_FUNCTION_SI(index, class, name, paramType2) \
-	void class::setup_##name(const char *seq1, paramType2 param4) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
-		EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		params->param4 = param4; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d) - action: %s", (char *)&params->seq1, params->param4, ACTION_NAME(savepoint.action));
-
-// setup with one char *parameter and two uints
-#define IMPLEMENT_FUNCTION_SII(index, class, name, paramType2, paramType3) \
-	void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
-		EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		params->param4 = param4; \
-		params->param5 = param5; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d) - action: %s", (char *)&params->seq1, params->param4, params->param5, ACTION_NAME(savepoint.action));
-
-// setup with one char *parameter and three uints
-#define IMPLEMENT_FUNCTION_SIII(index, class, name, paramType2, paramType3, paramType4) \
-	void class::setup_##name(const char *seq, paramType2 param4, paramType3 param5, paramType4 param6) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIII) \
-		EntityData::EntityParametersSIII *params = (EntityData::EntityParametersSIII*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq, seq, 12); \
-		params->param4 = param4; \
-		params->param5 = param5; \
-		params->param6 = param6; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSIII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %d) - action: %s", (char *)&params->seq, params->param4, params->param5, params->param6, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_SIIS(index, class, name, paramType2, paramType3) \
-	void class::setup_##name(const char *seq1, paramType2 param4, paramType3 param5, const char *seq2) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSIIS) \
-		EntityData::EntityParametersSIIS *params = (EntityData::EntityParametersSIIS*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		params->param4 = param4; \
-		params->param5 = param5; \
-		strncpy((char *)&params->seq2, seq2, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSIIS) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %d, %d, %s) - action: %s", (char *)&params->seq1, params->param4, params->param5, (char *)&params->seq2, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_SS(index, class, name) \
-	void class::setup_##name(const char *seq1, const char *seq2) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSSII) \
-		EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		strncpy((char *)&params->seq2, seq2, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSSII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s) - action: %s", (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_SSI(index, class, name, paramType3) \
-	void class::setup_##name(const char *seq1, const char *seq2, paramType3 param7) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersSSII) \
-		EntityData::EntityParametersSSII *params = (EntityData::EntityParametersSSII*)_data->getCurrentParameters(); \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		strncpy((char *)&params->seq2, seq2, 12); \
-		params->param7 = param7; \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersSSII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%s, %s, %d) - action: %s", (char *)&params->seq1, (char *)&params->seq2, params->param7, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_IS(index, class, name, paramType) \
-	void class::setup_##name(paramType param1, const char *seq) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersISII) \
-		EntityData::EntityParametersISII *params = (EntityData::EntityParametersISII*)_data->getCurrentParameters(); \
-		params->param1 = (unsigned int)param1; \
-		strncpy((char *)&params->seq, seq, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersISII) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s) - action: %s", params->param1, (char *)&params->seq, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_ISS(index, class, name, paramType) \
-	void class::setup_##name(paramType param1, const char *seq1, const char *seq2) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersISSI) \
-		EntityData::EntityParametersISSI *params = (EntityData::EntityParametersISSI*)_data->getCurrentParameters(); \
-		params->param1 = param1; \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		strncpy((char *)&params->seq2, seq2, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersISSI) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %s, %s) - action: %s", params->param1, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_IIS(index, class, name, paramType1, paramType2) \
-	void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersIISI) \
-		EntityData::EntityParametersIISI *params = (EntityData::EntityParametersIISI*)_data->getCurrentParameters(); \
-		params->param1 = param1; \
-		params->param2 = param2; \
-		strncpy((char *)&params->seq, seq, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersIISI) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s) - action: %s", params->param1, params->param2, (char *)&params->seq, ACTION_NAME(savepoint.action));
-
-#define IMPLEMENT_FUNCTION_IISS(index, class, name, paramType1, paramType2) \
-	void class::setup_##name(paramType1 param1, paramType2 param2, const char *seq1, const char *seq2) { \
-		BEGIN_SETUP(class, name, index, EntityData::EntityParametersIISS) \
-		EntityData::EntityParametersIISS *params = (EntityData::EntityParametersIISS*)_data->getCurrentParameters(); \
-		params->param1 = param1; \
-		params->param2 = param2; \
-		strncpy((char *)&params->seq1, seq1, 12); \
-		strncpy((char *)&params->seq2, seq2, 12); \
-		END_SETUP() \
-	} \
-	void class::name(const SavePoint &savepoint) { \
-	EXPOSE_PARAMS(EntityData::EntityParametersIISS) \
-	debugC(6, kLastExpressDebugLogic, "Entity: " #class "::" #name "(%d, %d, %s, %s) - action: %s", params->param1, params->param2, (char *)&params->seq1, (char *)&params->seq2, ACTION_NAME(savepoint.action));
-
-
-//////////////////////////////////////////////////////////////////////////
-// Misc
-//////////////////////////////////////////////////////////////////////////
-#define RESET_ENTITY_STATE(entity, class, function) \
-	getEntities()->resetState(entity); \
-	((class *)getEntities()->get(entity))->function();
-
-//////////////////////////////////////////////////////////////////////////
-// Parameters macros (for default IIII parameters)
-//////////////////////////////////////////////////////////////////////////
-#define CURRENT_PARAM(index, id) \
-	((EntityData::EntityParametersIIII*)_data->getCurrentParameters(index))->param##id
-
-#define ENTITY_PARAM(index, id) \
-	((EntityData::EntityParametersIIII*)_data->getParameters(8, index))->param##id
-
-//////////////////////////////////////////////////////////////////////////
-// Time check macros
-//////////////////////////////////////////////////////////////////////////
-#define TIME_CHECK(timeValue, parameter, function) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		function(); \
-		break; \
-	}
-
-#define TIME_CHECK_SAVEPOINT(timeValue, parameter, entity1, entity2, action) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		getSavePoints()->push(entity1, entity2, action); \
-	}
-
-#define TIME_CHECK_CALLBACK(timeValue, parameter, callback, function) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		setCallback(callback); \
-		function(); \
-		break; \
-	}
-
-#define TIME_CHECK_CALLBACK_1(timeValue, parameter, callback, function, param1) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		setCallback(callback); \
-		function(param1); \
-		break; \
-	}
-
-#define TIME_CHECK_CALLBACK_2(timeValue, parameter, callback, function, param1, param2) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		setCallback(callback); \
-		function(param1, param2); \
-		break; \
-	}
-
-#define TIME_CHECK_CALLBACK_3(timeValue, parameter, callback, function, param1, param2, param3) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		setCallback(callback); \
-		function(param1, param2, param3); \
-		break; \
-	}
-
-#define TIME_CHECK_CALLBACK_INVENTORY(timeValue, parameter, callback, function) \
-	if (getState()->time > timeValue && !parameter) { \
-	parameter = 1; \
-	getData()->inventoryItem = kItemNone; \
-	setCallback(callback); \
-	function(); \
-	break; \
-	}
-
-#define TIME_CHECK_CALLBACK_ACTION(timeValue, parameter) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		CALLBACK_ACTION(); \
-		break; \
-	}
-
-#define TIME_CHECK_PLAYSOUND_UPDATEPOSITION(timeValue, parameter, callback, sound, position) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		getData()->entityPosition = position; \
-		setCallback(callback); \
-		setup_playSound(sound); \
-		break; \
-	}
-
-#define TIME_CHECK_OBJECT(timeValue, parameter, object, location) \
-	if (getState()->time > timeValue && !parameter) { \
-		parameter = 1; \
-		getObjects()->updateLocation2(object, location); \
-	}
-
-#define TIME_CHECK_CAR(timeValue, parameter, callback, function) {\
-	if ((getState()->time <= timeValue && !getEntities()->isPlayerInCar(kCarGreenSleeping)) || !parameter) \
-		parameter = (uint)getState()->time + 75; \
-	if (getState()->time > timeValue || parameter < getState()->time) { \
-		parameter = kTimeInvalid; \
-		setCallback(callback); \
-		function(); \
-		break; \
-	} \
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Callback action
-//////////////////////////////////////////////////////////////////////////
-#define CALLBACK_ACTION() { \
-	if (getData()->currentCall == 0) \
-		error("[CALLBACK_ACTION] currentCall is already 0, cannot proceed"); \
-	getData()->currentCall--; \
-	getSavePoints()->setCallback(_entityIndex, _callbacks[_data->getCurrentCallback()]); \
-	getSavePoints()->call(_entityIndex, _entityIndex, kActionCallback); \
-	}
-
-//////////////////////////////////////////////////////////////////////////
-// Param update
-//////////////////////////////////////////////////////////////////////////
-#define UPDATE_PARAM(parameter, type, value) { \
-	if (!parameter) \
-		parameter = (uint)(type + value); \
-	if (parameter >= type) \
-		break; \
-	parameter = kTimeInvalid; \
-}
-
-// Todo: replace with UPDATE_PARAM_PROC as appropriate
-#define UPDATE_PARAM_GOTO(parameter, type, value, label) { \
-	if (!parameter) \
-		parameter = (uint)(type + value); \
-	if (parameter >= type) \
-		goto label; \
-	parameter = kTimeInvalid; \
-}
-
-// Updating parameter with code inside the check
-#define UPDATE_PARAM_PROC(parameter, type, value) \
-	if (!parameter) \
-		parameter = (uint)(type + value); \
-	if (parameter < type) { \
-		parameter = kTimeInvalid;
-
-#define UPDATE_PARAM_PROC_TIME(timeValue, test, parameter, value) \
-	if (getState()->time <= timeValue) { \
-		if (test || !parameter) \
-			parameter = (uint)(getState()->time + value); \
-	} \
-	if (parameter < getState()->time || getState()->time > timeValue) { \
-		parameter = kTimeInvalid;
-
-#define UPDATE_PARAM_PROC_END }
-
-// Updating parameter with an added check (and code inside the check)
-#define UPDATE_PARAM_CHECK(parameter, type, value) \
-	if (!parameter || parameter < type) { \
-		if (!parameter) \
-			parameter = (uint)(type + value);
-
-//////////////////////////////////////////////////////////////////////////
-// Compartments
-//////////////////////////////////////////////////////////////////////////
-// Go from one compartment to another (or the same one if no optional args are passed
-#define COMPARTMENT_TO(class, compartmentFrom, positionFrom, sequenceFrom, sequenceTo) \
-	switch (savepoint.action) { \
-	default: \
-		break; \
-	case kActionDefault: \
-		getData()->entityPosition = positionFrom; \
-		setCallback(1); \
-		setup_enterExitCompartment(sequenceFrom, compartmentFrom); \
-		break; \
-	case kActionCallback: \
-		switch (getCallback()) { \
-		default: \
-			break; \
-		case 1: \
-			setCallback(2); \
-			setup_enterExitCompartment(sequenceTo, compartmentFrom); \
-			break; \
-		case 2: \
-			getData()->entityPosition = positionFrom; \
-			getEntities()->clearSequences(_entityIndex); \
-			CALLBACK_ACTION(); \
-		} \
-		break; \
-	}
-
-#define COMPARTMENT_FROM_TO(class, compartmentFrom, positionFrom, sequenceFrom, compartmentTo, positionTo, sequenceTo) \
-	switch (savepoint.action) { \
-	default: \
-		break; \
-	case kActionDefault: \
-		getData()->entityPosition = positionFrom; \
-		getData()->location = kLocationOutsideCompartment; \
-		setCallback(1); \
-		setup_enterExitCompartment(sequenceFrom, compartmentFrom); \
-		break; \
-	case kActionCallback: \
-		switch (getCallback()) { \
-		default: \
-			break; \
-		case 1: \
-			setCallback(2); \
-			setup_updateEntity(kCarGreenSleeping, positionTo); \
-			break; \
-		case 2: \
-			setCallback(3); \
-			setup_enterExitCompartment(sequenceTo, compartmentTo); \
-			break; \
-		case 3: \
-			getData()->location = kLocationInsideCompartment; \
-			getEntities()->clearSequences(_entityIndex); \
-			CALLBACK_ACTION(); \
-			break; \
-		} \
-		break; \
-	}
 
 } // End of namespace LastExpress
 
diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp
index 46cd790ffb..d2bbc9854c 100644
--- a/engines/lastexpress/entities/francois.cpp
+++ b/engines/lastexpress/entities/francois.cpp
@@ -32,7 +32,6 @@
 
 #include "lastexpress/sound/queue.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
@@ -114,7 +113,7 @@ IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition)
 
 	case kActionNone:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			if (!getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000)
 			 || !getInventory()->hasItem(kItemFirebird)
@@ -169,7 +168,7 @@ IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionCallback:
@@ -225,7 +224,7 @@ IMPLEMENT_FUNCTION(9, Francois, function9)
 
 		case 2:
 			getData()->location = kLocationOutsideCompartment;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -263,7 +262,7 @@ IMPLEMENT_FUNCTION(10, Francois, function10)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityFrancois);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -279,7 +278,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue)
 	case kActionNone:
 		if (!getSoundQueue()->isBuffered(kEntityFrancois)) {
 
-			UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->timeTicks, params->param6)
+			if (Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->timeTicks, params->param6)) {
 				switch (rnd(7)) {
 				default:
 					break;
@@ -312,7 +311,7 @@ IMPLEMENT_FUNCTION_I(11, Francois, function11, TimeValue)
 
 				params->param6 = 15 * rnd(7);
 				CURRENT_PARAM(1, 1) = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!getEntities()->hasValidFrame(kEntityFrancois) || !getEntities()->isWalkingOppositeToPlayer(kEntityFrancois))
@@ -442,7 +441,7 @@ label_callback:
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -465,7 +464,7 @@ label_callback:
 		getData()->field_4A3 = 30;
 		getData()->inventoryItem = kItemNone;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction205346192:
@@ -524,7 +523,7 @@ IMPLEMENT_FUNCTION(12, Francois, function12)
 			break;
 
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -609,7 +608,7 @@ IMPLEMENT_FUNCTION(13, Francois, function13)
 			break;
 
 		case 11:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -708,7 +707,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition)
 			break;
 
 		case 13:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -764,7 +763,7 @@ IMPLEMENT_FUNCTION(15, Francois, function15)
 
 		case 7:
 			if (!getEntities()->isInsideCompartment(kEntityMmeBoutarel, kCarRedSleeping, kPosition_5790)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -773,7 +772,7 @@ IMPLEMENT_FUNCTION(15, Francois, function15)
 			break;
 
 		case 8:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -830,7 +829,7 @@ IMPLEMENT_FUNCTION(16, Francois, function16)
 			getData()->entityPosition = kPosition_5790;
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -849,7 +848,7 @@ IMPLEMENT_FUNCTION(17, Francois, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Francois, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -867,7 +866,7 @@ IMPLEMENT_FUNCTION(18, Francois, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_1(kTimeParisEpernay, params->param1, 1, setup_function11, kTime1093500);
+		timeCheckCallback(kTimeParisEpernay, params->param1, 1, kTime1093500);
 		break;
 
 	case kActionCallback:
@@ -884,7 +883,7 @@ IMPLEMENT_FUNCTION(19, Francois, function19)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime1161000, params->param1, 2, setup_function12);
+		Entity::timeCheckCallback(kTime1161000, params->param1, 2, WRAP_SETUP_FUNCTION(Francois, setup_function12));
 		break;
 
 	case kAction101107728:
@@ -979,17 +978,21 @@ IMPLEMENT_FUNCTION(23, Francois, function23)
 		}
 
 label_callback_1:
-		TIME_CHECK_CALLBACK_1(kTime1764000, params->param1, 2, setup_playSound, "Fra2011");
+		if (Entity::timeCheckCallback(kTime1764000, params->param1, 2, "Fra2011", WRAP_SETUP_FUNCTION_S(Francois, setup_playSound)))
+			break;
 
 label_callback_2:
-		TIME_CHECK_CALLBACK(kTime1800000, params->param2, 3, setup_function13);
+		if (Entity::timeCheckCallback(kTime1800000, params->param2, 3, WRAP_SETUP_FUNCTION(Francois, setup_function13)))
+			break;
 
 label_callback_3:
 		if (!getInventory()->hasItem(kItemWhistle) && getInventory()->get(kItemWhistle)->location != kObjectLocation3) {
-			TIME_CHECK_CALLBACK_1(kTime1768500, params->param3, 4, setup_function11, kTime1773000);
+			if (timeCheckCallback(kTime1768500, params->param3, 4, kTime1773000))
+				break;
 
 label_callback_4:
-			TIME_CHECK_CALLBACK_1(kTime1827000, params->param4, 5, setup_function11, kTime1831500);
+			if (timeCheckCallback(kTime1827000, params->param4, 5, kTime1831500))
+				break;
 		}
 
 label_callback_5:
@@ -999,18 +1002,19 @@ label_callback_5:
 		}
 
 		if (params->param5 != kTimeInvalid) {
-			UPDATE_PARAM_PROC_TIME(kTimeEnd, !getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000), params->param5, 75);
+			if (Entity::updateParameterTime(kTimeEnd, !getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000), params->param5, 75)) {
 				setCallback(6);
 				setup_playSound("Fra2010");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback_6:
-		TIME_CHECK_CALLBACK_3(kTime1782000, params->param6, 7, setup_function14, kObjectCompartmentC, kPosition_6470, "c");
+		if (timeCheckCallbackCompartment(kTime1782000, params->param6, 7, kObjectCompartmentC, kPosition_6470, "c"))
+			break;
 
 label_callback_7:
-		TIME_CHECK_CALLBACK_3(kTime1813500, params->param7, 8, setup_function14, kObjectCompartmentF, kPosition_4070, "f");
+		timeCheckCallbackCompartment(kTime1813500, params->param7, 8, kObjectCompartmentF, kPosition_4070, "f");
 		break;
 
 	case kActionCallback:
@@ -1086,32 +1090,41 @@ IMPLEMENT_FUNCTION(25, Francois, chapter3Handler)
 			}
 
 label_callback_2:
-			TIME_CHECK_CALLBACK(kTime2025000, params->param3, 3, setup_function12);
+			if (Entity::timeCheckCallback(kTime2025000, params->param3, 3, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_3:
-			TIME_CHECK_CALLBACK(kTime2052000, params->param4, 4, setup_function12);
+			if (Entity::timeCheckCallback(kTime2052000, params->param4, 4, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_4:
-			TIME_CHECK_CALLBACK(kTime2079000, params->param5, 5, setup_function12);
+			if (Entity::timeCheckCallback(kTime2079000, params->param5, 5, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_5:
-			TIME_CHECK_CALLBACK(kTime2092500, params->param6, 6, setup_function12);
+			if (Entity::timeCheckCallback(kTime2092500, params->param6, 6, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_6:
-			TIME_CHECK_CALLBACK(kTime2173500, params->param7, 7, setup_function12);
+			if (Entity::timeCheckCallback(kTime2173500, params->param7, 7, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_7:
-			TIME_CHECK_CALLBACK(kTime2182500, params->param8, 8, setup_function12);
+			if (Entity::timeCheckCallback(kTime2182500, params->param8, 8, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_8:
-			TIME_CHECK_CALLBACK(kTime2241000, CURRENT_PARAM(1, 1), 9, setup_function12);
+			if (Entity::timeCheckCallback(kTime2241000, CURRENT_PARAM(1, 1), 9, WRAP_SETUP_FUNCTION(Francois, setup_function12)))
+				break;
 
 label_callback_9:
 			if (!getInventory()->hasItem(kItemWhistle) && getInventory()->get(kItemWhistle)->location != kObjectLocation3) {
-				TIME_CHECK_CALLBACK_1(kTime2011500, CURRENT_PARAM(1, 2), 10, setup_function11, kTime2016000);
+				if (timeCheckCallback(kTime2011500, CURRENT_PARAM(1, 2), 10, kTime2016000))
+					break;
 
 label_callback_10:
-				TIME_CHECK_CALLBACK_1(kTime2115000, CURRENT_PARAM(1, 3), 11, setup_function11, kTime2119500);
+				if (timeCheckCallback(kTime2115000, CURRENT_PARAM(1, 3), 11, kTime2119500))
+					break;
 			}
 
 label_callback_11:
@@ -1129,13 +1142,15 @@ label_callback_11:
 				}
 
 label_callback_12:
-				TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 5), 13, setup_function14, kObjectCompartmentE, kPosition_4840, "e");
+				if (timeCheckCallbackCompartment(kTime2040300, CURRENT_PARAM(1, 5), 13, kObjectCompartmentE, kPosition_4840, "e"))
+					break;
 
 label_callback_13:
-				TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 6), 14, setup_function14, kObjectCompartmentF, kPosition_4070, "f");
+				if (timeCheckCallbackCompartment(kTime2040300, CURRENT_PARAM(1, 6), 14, kObjectCompartmentF, kPosition_4070, "f"))
+					break;
 
 label_callback_14:
-				TIME_CHECK_CALLBACK_3(kTime2040300, CURRENT_PARAM(1, 7), 15, setup_function14, kObjectCompartmentB, kPosition_7500, "b");
+				timeCheckCallbackCompartment(kTime2040300, CURRENT_PARAM(1, 7), 15, kObjectCompartmentB, kPosition_7500, "b");
 			}
 		}
 		break;
@@ -1291,4 +1306,33 @@ IMPLEMENT_FUNCTION_END
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_NULL_FUNCTION(31, Francois)
 
+
+//////////////////////////////////////////////////////////////////////////
+// Helper functions
+//////////////////////////////////////////////////////////////////////////
+bool Francois::timeCheckCallbackCompartment(TimeValue timeValue, uint &parameter, byte callback, ObjectIndex compartment, EntityPosition position, const char* sequenceSuffix) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		setup_function14(compartment, position, sequenceSuffix);
+
+		return true;
+	}
+
+	return false;
+}
+
+bool Francois::timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, TimeValue timeValue2) {
+	if (getState()->time > timeValue && !parameter) {
+		parameter = 1;
+		setCallback(callback);
+		setup_function11(timeValue2);
+
+		return true;
+	}
+
+	return false;
+}
+
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/francois.h b/engines/lastexpress/entities/francois.h
index 19eca6fb50..51270fa4b6 100644
--- a/engines/lastexpress/entities/francois.h
+++ b/engines/lastexpress/entities/francois.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_FRANCOIS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -160,6 +159,10 @@ public:
 	DECLARE_FUNCTION(function30)
 
 	DECLARE_NULL_FUNCTION()
+
+private:
+	bool timeCheckCallbackCompartment(TimeValue timeValue, uint &parameter, byte callback, ObjectIndex compartment, EntityPosition position, const char* sequenceSuffix);
+	bool timeCheckCallback(TimeValue timeValue, uint &parameter, byte callback, TimeValue timeValue2);
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp
index daa50956d3..a912fa4ecb 100644
--- a/engines/lastexpress/entities/gendarmes.cpp
+++ b/engines/lastexpress/entities/gendarmes.cpp
@@ -31,7 +31,6 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -67,7 +66,7 @@ IMPLEMENT_FUNCTION(2, Gendarmes, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Gendarmes, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -195,7 +194,7 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition)
 			break;
 
 		case 1:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 2:
@@ -233,7 +232,7 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition)
 		case 6:
 			getData()->location = kLocationOutsideCompartment;
 			getEntities()->exitCompartment(kEntityGendarmes, (ObjectIndex)parameters2->param5);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -267,11 +266,12 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje
 			getSound()->playSound(kEntityGendarmes, "POL1046A", kFlagDefault);
 		}
 
-		UPDATE_PARAM(params->param7, getState()->timeTicks, 300);
+		if (!Entity::updateParameter(params->param7, getState()->timeTicks, 300))
+			break;
 
 		if (!params->param4 && getEntities()->isOutsideAlexeiWindow()) {
 			getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			if (getEntities()->isOutsideAlexeiWindow())
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
@@ -322,7 +322,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje
 			getLogic()->gameOver(kSavegameTypeIndex, 1, kSceneGameOverBloodJacket, true);
 
 			getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 4:
@@ -330,7 +330,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje
 			getLogic()->gameOver(kSavegameTypeIndex, 1, kSceneGameOverPolice1, true);
 
 			getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 5:
@@ -552,13 +552,14 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl
 	case kActionNone:
 		if (checkCallback) {
 			EXPOSE_PARAMS(EntityData::EntityParametersIIII);
-			TIME_CHECK_CALLBACK_ACTION(params->param1, params->param2);
+			if (Entity::timeCheckCallbackAction((TimeValue)params->param1, params->param2))
+				break;
 		}
 
 		if (shouldUpdateEntity) {
 			EXPOSE_PARAMS(EntityData::EntityParametersIIII);
 			if (getEntities()->updateEntity(kEntityGendarmes, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 		}
@@ -582,7 +583,7 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -599,7 +600,7 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl
 		if (shouldUpdateEntity) {
 			EXPOSE_PARAMS(EntityData::EntityParametersIIII);
 			if (getEntities()->updateEntity(kEntityGendarmes, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 		}
diff --git a/engines/lastexpress/entities/gendarmes.h b/engines/lastexpress/entities/gendarmes.h
index d999cfc1fd..a761643531 100644
--- a/engines/lastexpress/entities/gendarmes.h
+++ b/engines/lastexpress/entities/gendarmes.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_GENDARMES_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 #include "lastexpress/sound/sound.h"
 
diff --git a/engines/lastexpress/entities/hadija.cpp b/engines/lastexpress/entities/hadija.cpp
index 8ec972b939..e9abcd888a 100644
--- a/engines/lastexpress/entities/hadija.cpp
+++ b/engines/lastexpress/entities/hadija.cpp
@@ -28,10 +28,7 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -89,22 +86,22 @@ IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(6, Hadija, compartment6)
-	COMPARTMENT_TO(Hadija, kObjectCompartment6, kPosition_4070, "619Cf", "619Df");
+	Entity::goToCompartment(savepoint, kObjectCompartment6, kPosition_4070, "619Cf", "619Df");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(7, Hadija, compartment8)
-	COMPARTMENT_TO(Hadija, kObjectCompartment8, kPosition_2740, "619Ch", "619Dh");
+	Entity::goToCompartment(savepoint, kObjectCompartment8, kPosition_2740, "619Ch", "619Dh");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(8, Hadija, compartment6to8)
-	COMPARTMENT_FROM_TO(Hadija, kObjectCompartment6, kPosition_4070, "619Bf", kObjectCompartment8, kPosition_2740, "619Ah");
+	Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment6, kPosition_4070, "619Bf", kObjectCompartment8, kPosition_2740, "619Ah");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(9, Hadija, compartment8to6)
-	COMPARTMENT_FROM_TO(Hadija, kObjectCompartment8, kPosition_2740, "619Bh", kObjectCompartment6, kPosition_4070, "619Af");
+	Entity::goToCompartmentFromCompartment(savepoint, kObjectCompartment8, kPosition_2740, "619Bh", kObjectCompartment6, kPosition_4070, "619Af");
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -114,7 +111,7 @@ IMPLEMENT_FUNCTION(10, Hadija, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Hadija, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -133,10 +130,12 @@ IMPLEMENT_FUNCTION(11, Hadija, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_PLAYSOUND_UPDATEPOSITION(kTimeParisEpernay, params->param1, 1, "Har1100", kPosition_4840);
+		if (Entity::timeCheckPlaySoundUpdatePosition(kTimeParisEpernay, params->param1, 1, "Har1100", kPosition_4840))
+			break;
 
 label_callback1:
-		TIME_CHECK_CALLBACK(kTime1084500, params->param2, 2, setup_compartment6to8);
+		if (Entity::timeCheckCallback(kTime1084500, params->param2, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6to8)))
+			break;
 
 label_callback2:
 		if (params->param3 != kTimeInvalid && getState()->time > kTime1093500) {
@@ -164,7 +163,8 @@ label_callback2:
 		}
 
 label_callback3:
-		TIME_CHECK_CALLBACK(kTime1156500, params->param4, 4, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime1156500, params->param4, 4, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6)))
+			break;
 
 label_callback4:
 		if (params->param5 != kTimeInvalid && getState()->time > kTime1165500) {
@@ -254,7 +254,7 @@ IMPLEMENT_FUNCTION(14, Hadija, chapter2Handler)
 		}
 
 		if (params->param2 == kTimeInvalid || getState()->time <= kTime1786500) {
-			TIME_CHECK_CALLBACK(kTime1822500, params->param3, 2, setup_compartment8to6);
+			Entity::timeCheckCallback(kTime1822500, params->param3, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6));
 			break;
 		}
 
@@ -264,7 +264,7 @@ IMPLEMENT_FUNCTION(14, Hadija, chapter2Handler)
 				params->param2 = (uint)getState()->time + 75;
 
 			if (params->param2 >= getState()->time) {
-				TIME_CHECK_CALLBACK(kTime1822500, params->param3, 2, setup_compartment8to6);
+				Entity::timeCheckCallback(kTime1822500, params->param3, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6));
 				break;
 			}
 		}
@@ -281,7 +281,7 @@ IMPLEMENT_FUNCTION(14, Hadija, chapter2Handler)
 			break;
 
 		case 1:
-			TIME_CHECK_CALLBACK(kTime1822500, params->param3, 2, setup_compartment8to6);
+			Entity::timeCheckCallback(kTime1822500, params->param3, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6));
 			break;
 
 		case 2:
@@ -321,20 +321,26 @@ IMPLEMENT_FUNCTION(16, Hadija, chapter3Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime1998000, params->param1, 1, setup_compartment6to8);
+		if (Entity::timeCheckCallback(kTime1998000, params->param1, 1, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6to8)))
+			break;
 
 label_callback1:
-		TIME_CHECK_CALLBACK(kTime2020500, params->param2, 2, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime2020500, params->param2, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6)))
+			break;
 
 label_callback2:
-		TIME_CHECK_CALLBACK(kTime2079000, params->param3, 3, setup_compartment6to8);
+		if (Entity::timeCheckCallback(kTime2079000, params->param3, 3, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6to8)))
+			break;
 
 label_callback3:
-		TIME_CHECK_CALLBACK(kTime2187000, params->param4, 4, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime2187000, params->param4, 4, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6)))
+			break;
 
 label_callback4:
-		if (params->param5 != kTimeInvalid && getState()->time > kTime2196000)
-			TIME_CHECK_CAR(kTime2254500, params->param5, 5, setup_compartment6);
+		if (params->param5 != kTimeInvalid && getState()->time > kTime2196000) {
+			if (Entity::timeCheckCar(kTime2254500, params->param5, 5, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6)))
+				break;
+		}
 		break;
 
 	case kActionDefault:
@@ -387,18 +393,24 @@ IMPLEMENT_FUNCTION(18, Hadija, chapter4Handler)
 		break;
 
 	case kActionNone:
-		if (params->param1 != kTimeInvalid)
-			TIME_CHECK_CAR(kTime1714500, params->param1, 1, setup_compartment6);
+		if (params->param1 != kTimeInvalid) {
+			if (Entity::timeCheckCar(kTime1714500, params->param1, 1, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6)))
+				break;
+		}
 
 label_callback1:
-		TIME_CHECK_CALLBACK(kTime2367000, params->param2, 2, setup_compartment6to8);
+		if (Entity::timeCheckCallback(kTime2367000, params->param2, 2, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6to8)))
+			break;
 
 label_callback2:
-		TIME_CHECK_CALLBACK(kTime2421000, params->param3, 3, setup_compartment8to6);
+		if (Entity::timeCheckCallback(kTime2421000, params->param3, 3, WRAP_SETUP_FUNCTION(Hadija, setup_compartment8to6)))
+			break;
 
 label_callback3:
-		if (params->param4 != kTimeInvalid && getState()->time > kTime2425500)
-			TIME_CHECK_CAR(kTime2484000, params->param4, 4, setup_compartment6);
+		if (params->param4 != kTimeInvalid && getState()->time > kTime2425500) {
+			if (Entity::timeCheckCar(kTime2484000, params->param4, 4, WRAP_SETUP_FUNCTION(Hadija, setup_compartment6)))
+				break;
+		}
 		break;
 
 	case kActionCallback:
@@ -468,7 +480,9 @@ IMPLEMENT_FUNCTION(22, Hadija, function22)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 2700);
+		if (!Entity::updateParameter(params->param1, getState()->time, 2700))
+			break;
+
 		setup_function23();
 		break;
 
diff --git a/engines/lastexpress/entities/hadija.h b/engines/lastexpress/entities/hadija.h
index d2495955e0..545f21ee03 100644
--- a/engines/lastexpress/entities/hadija.h
+++ b/engines/lastexpress/entities/hadija.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_HADIJA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/ivo.cpp b/engines/lastexpress/entities/ivo.cpp
index f2261b438c..c53f4689fb 100644
--- a/engines/lastexpress/entities/ivo.cpp
+++ b/engines/lastexpress/entities/ivo.cpp
@@ -32,10 +32,7 @@
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -184,7 +181,7 @@ IMPLEMENT_FUNCTION(11, Ivo, function11)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityIvo);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 4:
@@ -193,7 +190,7 @@ IMPLEMENT_FUNCTION(11, Ivo, function11)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityIvo);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -210,7 +207,7 @@ IMPLEMENT_FUNCTION(12, Ivo, sitAtTableWithSalko)
 		getEntities()->clearSequences(kEntitySalko);
 		getSavePoints()->push(kEntityIvo, kEntityTables2, kAction136455232);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -231,7 +228,7 @@ IMPLEMENT_FUNCTION(13, Ivo, leaveTableWithSalko)
 		getSavePoints()->push(kEntityIvo, kEntityTables2, kActionDrawTablesWithChairs, "009E");
 		getEntities()->clearSequences(kEntitySalko);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -249,7 +246,7 @@ IMPLEMENT_FUNCTION(14, Ivo, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Ivo, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -374,7 +371,7 @@ IMPLEMENT_FUNCTION(18, Ivo, chapter2)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime1777500, params->param1, setup_function19);
+		Entity::timeCheck(kTime1777500, params->param1, WRAP_SETUP_FUNCTION(Ivo, setup_function19));
 		break;
 
 	case kActionDefault:
diff --git a/engines/lastexpress/entities/ivo.h b/engines/lastexpress/entities/ivo.h
index cd5cb7b6be..75814336e0 100644
--- a/engines/lastexpress/entities/ivo.h
+++ b/engines/lastexpress/entities/ivo.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_IVO_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp
index 2918b1e8bd..7860836a26 100644
--- a/engines/lastexpress/entities/kahina.cpp
+++ b/engines/lastexpress/entities/kahina.cpp
@@ -32,10 +32,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -90,7 +88,7 @@ IMPLEMENT_FUNCTION_END
 IMPLEMENT_FUNCTION_I(4, Kahina, updateFromTime, uint32)
 	if (savepoint.action == kAction137503360) {
 		ENTITY_PARAM(0, 2) = 1;
-		CALLBACK_ACTION();
+		callbackAction();
 	}
 
 	Entity::updateFromTime(savepoint);
@@ -111,7 +109,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 		if (params->param1 < getState()->time && !params->param2) {
 			params->param2 = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -141,7 +139,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 
 		case 1:
 			if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -151,7 +149,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 		case 2:
 		case 3:
 			if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -163,7 +161,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 
 		case 4:
 			if (ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -173,7 +171,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 
 		case 5:
 			if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -185,7 +183,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue)
 	case kAction137503360:
 		ENTITY_PARAM(0, 2) = 1;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -198,12 +196,12 @@ IMPLEMENT_FUNCTION_II(7, Kahina, updateEntity2, CarIndex, EntityPosition)
 
 	case kActionNone:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else if (getEntities()->isDistanceBetweenEntities(kEntityKahina, kEntityPlayer, 1000)
 				&& !getEntities()->isInGreenCarEntrance(kEntityPlayer)
 				&& !getEntities()->isInsideCompartments(kEntityPlayer)
@@ -211,14 +209,14 @@ IMPLEMENT_FUNCTION_II(7, Kahina, updateEntity2, CarIndex, EntityPosition)
 
 			if (getData()->car == kCarGreenSleeping || getData()->car == kCarRedSleeping) {
 				ENTITY_PARAM(0, 1) = 1;
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 		}
 		break;
 
 	case kAction137503360:
 		ENTITY_PARAM(0, 2) = 1;
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -249,7 +247,7 @@ IMPLEMENT_FUNCTION(10, Kahina, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Kahina, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -269,7 +267,7 @@ IMPLEMENT_FUNCTION(11, Kahina, chapter1Handler)
 		return;
 
 	if (getProgress().jacket != kJacketOriginal)
-		TIME_CHECK_SAVEPOINT(kTime1107000, params->param1, kEntityKahina, kEntityMertens, kAction238732837);
+		Entity::timeCheckSavepoint(kTime1107000, params->param1, kEntityKahina, kEntityMertens, kAction238732837);
 
 	if (getProgress().eventMertensKronosInvitation)
 		setup_function12();
@@ -282,7 +280,7 @@ IMPLEMENT_FUNCTION(12, Kahina, function12)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime1485000, params->param2, setup_function13);
+		Entity::timeCheck(kTime1485000, params->param2, WRAP_SETUP_FUNCTION(Kahina, setup_function13));
 		break;
 
 	case kActionKnock:
@@ -372,12 +370,12 @@ IMPLEMENT_FUNCTION(14, Kahina, function14)
 
 	case kActionExitCompartment:
 		getEntities()->exitCompartment(kEntityKahina, kObjectCompartmentF);
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction4:
 		getEntities()->exitCompartment(kEntityKahina, kObjectCompartmentF);
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -396,10 +394,10 @@ IMPLEMENT_FUNCTION(15, Kahina, function15)
 
 	case kActionNone:
 		if (params->param2 != kTimeInvalid) {
-			UPDATE_PARAM_PROC_TIME(params->param1, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param2, 0)
+			if (Entity::updateParameterTime((TimeValue)params->param1, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param2, 0)) {
 				setCallback(9);
 				setup_updateEntity(kCarRedSleeping, kPosition_4070);
-			UPDATE_PARAM_PROC_END
+			}
 		}
 		break;
 
@@ -542,7 +540,7 @@ IMPLEMENT_FUNCTION(15, Kahina, function15)
 		case 17:
 			getEntities()->clearSequences(kEntityKahina);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -582,18 +580,18 @@ IMPLEMENT_FUNCTION(17, Kahina, chapter2Handler)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM_PROC(params->param2, getState()->time, 9000)
+			if (Entity::updateParameter(params->param2, getState()->time, 9000)) {
 				params->param1 = 1;
 				params->param2 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (getEvent(kEventKahinaAskSpeakFirebird) && getEvent(kEventKronosConversationFirebird) && getEntities()->isInsideTrainCar(kEntityPlayer, kCarKronos)) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 900)
+			if (Entity::updateParameter(params->param3, getState()->time, 900)) {
 				setCallback(1);
 				setup_savegame(kSavegameTypeEvent, kEventKronosConversationFirebird);
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback_3:
@@ -729,7 +727,7 @@ IMPLEMENT_FUNCTION_II(19, Kahina, function19, CarIndex, EntityPosition)
 			RESET_ENTITY_STATE(kEntityKahina, Kahina, setup_function22);
 
 		if (getEntities()->updateEntity(kEntityKahina, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
@@ -745,7 +743,7 @@ IMPLEMENT_FUNCTION_II(19, Kahina, function19, CarIndex, EntityPosition)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityKahina, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -787,16 +785,17 @@ label_callback_2:
 		}
 
 		if (!params->param1) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 9000)
+			if (Entity::updateParameter(params->param3, getState()->time, 9000)) {
 				params->param1 = 1;
 				params->param3 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (getEvent(kEventKahinaAskSpeakFirebird)
 		 && !getEvent(kEventKronosConversationFirebird)
 		 && getEntities()->isInsideTrainCar(kEntityPlayer, kCarKronos)) {
-			UPDATE_PARAM(params->param4, getState()->time, 900);
+			if (!Entity::updateParameter(params->param4, getState()->time, 900))
+				break;
 
 			setCallback(3);
 			setup_savegame(kSavegameTypeEvent, kEventKronosConversationFirebird);
@@ -928,11 +927,11 @@ IMPLEMENT_FUNCTION(21, Kahina, function21)
 				params->param3 = (uint)getState()->time + 4500;
 
 			if (params->param6 != kTimeInvalid) {
-				UPDATE_PARAM_PROC_TIME(params->param3, (getEntities()->isPlayerPosition(kCarKronos, 80) || getEntities()->isPlayerPosition(kCarKronos, 88)), params->param5, 0)
+				if (Entity::updateParameterTime((TimeValue)params->param3, (getEntities()->isPlayerPosition(kCarKronos, 80) || getEntities()->isPlayerPosition(kCarKronos, 88)), params->param5, 0)) {
 					setCallback(2);
 					setup_function23();
 					break;
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
@@ -943,14 +942,14 @@ label_callback_2:
 				params->param4 = (uint)getState()->time + 4500;
 
 			if (params->param6 != kTimeInvalid) {
-				UPDATE_PARAM_PROC_TIME(params->param3, (getEntities()->isPlayerPosition(kCarKronos, 80) || getEntities()->isPlayerPosition(kCarKronos, 88)), params->param6, 0)
+				if (Entity::updateParameterTime((TimeValue)params->param3, (getEntities()->isPlayerPosition(kCarKronos, 80) || getEntities()->isPlayerPosition(kCarKronos, 88)), params->param6, 0)) {
 					getSound()->playSound(kEntityPlayer, "LIB014", getSound()->getSoundFlag(kEntityKahina));
 					getSound()->playSound(kEntityPlayer, "LIB015", getSound()->getSoundFlag(kEntityKahina));
 
 					getEntities()->drawSequenceLeft(kEntityKahina, "202a");
 
 					params->param2 = 0;
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
@@ -1125,7 +1124,7 @@ IMPLEMENT_FUNCTION(23, Kahina, function23)
 		case 7:
 			getEntities()->clearSequences(kEntityKahina);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1262,7 +1261,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25)
 		getProgress().field_78 = 1;
 		ENTITY_PARAM(0, 3) = 0;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -1303,7 +1302,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25)
 		case 13:
 			getEntities()->clearSequences(kEntityKahina);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1387,7 +1386,7 @@ IMPLEMENT_FUNCTION(26, Kahina, function26)
 		getInventory()->setLocationAndProcess(kItemBriefcase, kObjectLocation2);
 		getProgress().field_78 = 1;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -1429,7 +1428,7 @@ IMPLEMENT_FUNCTION(26, Kahina, function26)
 		case 9:
 			getEntities()->clearSequences(kEntityKahina);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
diff --git a/engines/lastexpress/entities/kahina.h b/engines/lastexpress/entities/kahina.h
index b25053e339..7479cf76f9 100644
--- a/engines/lastexpress/entities/kahina.h
+++ b/engines/lastexpress/entities/kahina.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_KAHINA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp
index 134dce9c81..26ce3ca424 100644
--- a/engines/lastexpress/entities/kronos.cpp
+++ b/engines/lastexpress/entities/kronos.cpp
@@ -39,10 +39,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -128,7 +126,7 @@ IMPLEMENT_FUNCTION(7, Kronos, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Kronos, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -149,7 +147,7 @@ IMPLEMENT_FUNCTION(8, Kronos, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime1489500, params->param2, setup_function11);
+		Entity::timeCheck(kTime1489500, params->param2, WRAP_SETUP_FUNCTION(Kronos, setup_function11));
 		break;
 
 	case kAction171849314:
@@ -191,7 +189,7 @@ IMPLEMENT_FUNCTION(10, Kronos, function10)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime1489500, params->param1, setup_function11);
+		Entity::timeCheck(kTime1489500, params->param1, WRAP_SETUP_FUNCTION(Kronos, setup_function11));
 		break;
 
 	case kActionDefault:
@@ -295,10 +293,10 @@ IMPLEMENT_FUNCTION(15, Kronos, function15)
 
 	case kActionNone:
 		if (params->param1 && !getEntities()->isInSalon(kEntityBoutarel)) {
-			UPDATE_PARAM_PROC(params->param2, getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param2, getState()->timeTicks, 75)) {
 				setup_function16();
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param3 != kTimeInvalid && getState()->time > kTime2002500) {
@@ -407,8 +405,7 @@ IMPLEMENT_FUNCTION(18, Kronos, function18)
 			params->param2 = 1;
 		}
 
-		TIME_CHECK(kTime2106000, params->param3, setup_function19)
-		else {
+		if (!Entity::timeCheck(kTime2106000, params->param3, WRAP_SETUP_FUNCTION(Kronos, setup_function19))) {
 			if (params->param1 && getEntities()->isInKronosSanctum(kEntityPlayer)) {
 				setCallback(1);
 				setup_savegame(kSavegameTypeEvent, kEventKahinaPunchSuite4);
@@ -528,9 +525,9 @@ IMPLEMENT_FUNCTION(20, Kronos, function20)
 		}
 
 		if (CURRENT_PARAM(1, 2) != kTimeInvalid && params->param7 < getState()->time) {
-			UPDATE_PARAM_PROC_TIME(params->param8, !params->param1, CURRENT_PARAM(1, 2), 450)
+			if (Entity::updateParameterTime((TimeValue)params->param8, !params->param1, CURRENT_PARAM(1, 2), 450)) {
 				getSavePoints()->push(kEntityKronos, kEntityKahina, kAction237555748);
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!params->param1)
diff --git a/engines/lastexpress/entities/kronos.h b/engines/lastexpress/entities/kronos.h
index 4c61b98620..a7693fcd46 100644
--- a/engines/lastexpress/entities/kronos.h
+++ b/engines/lastexpress/entities/kronos.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_KRONOS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/mahmud.cpp b/engines/lastexpress/entities/mahmud.cpp
index 0e67b45cd2..af86ef8cdd 100644
--- a/engines/lastexpress/entities/mahmud.cpp
+++ b/engines/lastexpress/entities/mahmud.cpp
@@ -34,10 +34,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -86,7 +84,8 @@ IMPLEMENT_FUNCTION_SIII(4, Mahmud, enterExitCompartment2, ObjectIndex, uint32, O
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param7, getState()->timeTicks, params->param5);
+		if (!Entity::updateParameter(params->param7, getState()->timeTicks, params->param5))
+			break;
 
 		if (!getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingUp))
 			getScenes()->loadSceneFromObject((ObjectIndex)params->param6, true);
@@ -95,7 +94,7 @@ IMPLEMENT_FUNCTION_SIII(4, Mahmud, enterExitCompartment2, ObjectIndex, uint32, O
 	case kActionExitCompartment:
 		getEntities()->exitCompartment(kEntityMahmud, (ObjectIndex)params->param4);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -146,7 +145,8 @@ IMPLEMENT_FUNCTION_II(10, Mahmud, function10, ObjectIndex, bool)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param6, getState()->time, 13500);
+		if (!Entity::updateParameter(params->param6, getState()->time, 13500))
+			break;
 
 		getObjects()->update(kObjectCompartment5, kEntityTrain, kObjectLocation3, kCursorHandKnock, kCursorHand);
 		getObjects()->update(kObjectCompartment6, kEntityTrain, kObjectLocation3, kCursorHandKnock, kCursorHand);
@@ -267,7 +267,7 @@ IMPLEMENT_FUNCTION_II(10, Mahmud, function10, ObjectIndex, bool)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityMahmud);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -392,7 +392,7 @@ IMPLEMENT_FUNCTION(11, Mahmud, function11)
 			getEntities()->clearSequences(kEntityMahmud);
 			getObjects()->update(kObjectCompartment4, kEntityMahmud, kObjectLocation3, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -471,7 +471,7 @@ IMPLEMENT_FUNCTION(12, Mahmud, function12)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityMahmud);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		}
@@ -537,7 +537,7 @@ IMPLEMENT_FUNCTION(13, Mahmud, function13)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityMahmud);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		}
@@ -560,7 +560,8 @@ IMPLEMENT_FUNCTION(14, Mahmud, chaptersHandler)
 
 		if (!params->param2 && getProgress().chapter == kChapter1) {
 
-			TIME_CHECK_CALLBACK(kTime1098000, params->param6, 1, setup_function13);
+			if (Entity::timeCheckCallback(kTime1098000, params->param6, 1, WRAP_SETUP_FUNCTION(Mahmud, setup_function13)))
+				break;
 
 			if (!getSoundQueue()->isBuffered("HAR1104") && getState()->time > kTime1167300 && !params->param7) {
 				params->param7 = 1;
@@ -572,7 +573,8 @@ IMPLEMENT_FUNCTION(14, Mahmud, chaptersHandler)
 		}
 
 		if (params->param5) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 75))
+				break;
 
 			params->param4 = 1;
 			params->param5 = 0;
@@ -732,7 +734,7 @@ IMPLEMENT_FUNCTION(15, Mahmud, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chaptersHandler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Mahmud, setup_chaptersHandler));
 		break;
 
 	case kActionDefault:
diff --git a/engines/lastexpress/entities/mahmud.h b/engines/lastexpress/entities/mahmud.h
index 5feb95cba5..685100f078 100644
--- a/engines/lastexpress/entities/mahmud.h
+++ b/engines/lastexpress/entities/mahmud.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_MAHMUD_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/max.cpp b/engines/lastexpress/entities/max.cpp
index eacc38bf60..abd2aae9e4 100644
--- a/engines/lastexpress/entities/max.cpp
+++ b/engines/lastexpress/entities/max.cpp
@@ -31,10 +31,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -91,7 +89,8 @@ IMPLEMENT_FUNCTION(6, Max, chapter12_handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, params->param1);
+		if (!Entity::updateParameter(params->param2, getState()->time, params->param1))
+			break;
 
 		if (!getSoundQueue()->isBuffered(kEntityMax))
 			getSound()->playSound(kEntityMax, "Max1122");
@@ -125,7 +124,8 @@ IMPLEMENT_FUNCTION(7, Max, function7)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, params->param1)
+		if (!Entity::updateParameter(params->param2, getState()->time, params->param1))
+			break;
 
 		if (!getSoundQueue()->isBuffered(kEntityMax))
 			getSound()->playSound(kEntityMax, "Max1122");
@@ -186,7 +186,7 @@ IMPLEMENT_FUNCTION(7, Max, function7)
 	case kAction101687594:
 		getEntities()->clearSequences(kEntityMax);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction122358304:
@@ -195,7 +195,7 @@ IMPLEMENT_FUNCTION(7, Max, function7)
 		getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 		getObjects()->update(kObject53, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction158007856:
@@ -214,7 +214,8 @@ IMPLEMENT_FUNCTION(8, Max, chapter4Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param3, getState()->time, params->param2);
+		if (!Entity::updateParameter(params->param3, getState()->time, params->param2))
+			break;
 
 		if (!getSoundQueue()->isBuffered(kEntityMax))
 			getSound()->playSound(kEntityMax, "Max3101");
@@ -323,7 +324,7 @@ IMPLEMENT_FUNCTION(10, Max, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter12_handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Max, setup_chapter12_handler));
 		break;
 
 	case kActionDefault:
@@ -392,7 +393,8 @@ IMPLEMENT_FUNCTION(13, Max, chapter3Handler)
 			break;
 		}
 
-		UPDATE_PARAM(params->param3, getState()->time, params->param1);
+		if (!Entity::updateParameter(params->param3, getState()->time, params->param1))
+			break;
 
 		if (!getSoundQueue()->isBuffered(kEntityMax))
 			getSound()->playSound(kEntityMax, "Max1122");
@@ -514,7 +516,8 @@ IMPLEMENT_FUNCTION(15, Max, function15)
 		}
 
 		if (!params->param1) {
-			UPDATE_PARAM(params->param3, getState()->time, 900);
+			if (!Entity::updateParameter(params->param3, getState()->time, 900))
+				break;
 
 			getSavePoints()->push(kEntityMax, kEntityCoudert, kAction157026693);
 		}
diff --git a/engines/lastexpress/entities/max.h b/engines/lastexpress/entities/max.h
index 17b58475aa..acd8235e89 100644
--- a/engines/lastexpress/entities/max.h
+++ b/engines/lastexpress/entities/max.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_MAX_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp
index d88962fce2..97dd293793 100644
--- a/engines/lastexpress/entities/mertens.cpp
+++ b/engines/lastexpress/entities/mertens.cpp
@@ -32,21 +32,11 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
-#define SAVEGAME_BLOOD_JACKET() \
-	if (getProgress().jacket == kJacketBlood \
-	 && getEntities()->isDistanceBetweenEntities(kEntityMertens, kEntityPlayer, 1000) \
-	 && !getEntities()->isInsideCompartments(kEntityPlayer) \
-	 && !getEntities()->checkFields10(kEntityPlayer)) { \
-		setCallback(1); \
-		setup_savegame(kSavegameTypeEvent, kEventMertensBloodJacket); \
-	}
 
 Mertens::Mertens(LastExpressEngine *engine) : Entity(engine, kEntityMertens) {
 	ADD_CALLBACK_FUNCTION(Mertens, reset);
@@ -117,11 +107,11 @@ IMPLEMENT_FUNCTION_S(2, Mertens, bloodJacket)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -144,7 +134,7 @@ IMPLEMENT_FUNCTION_SI(3, Mertens, enterExitCompartment, ObjectIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		return;
 
 	case kActionCallback:
@@ -165,12 +155,12 @@ IMPLEMENT_FUNCTION_SI(4, Mertens, enterExitCompartment2, ObjectIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		return;
 
 	case kAction4:
 		getEntities()->exitCompartment(kEntityMertens, (ObjectIndex)params->param4);
-		CALLBACK_ACTION();
+		callbackAction();
 		return;
 
 	case kActionCallback:
@@ -191,13 +181,13 @@ IMPLEMENT_FUNCTION_SIII(5, Mertens, enterExitCompartment3, ObjectIndex, EntityPo
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionExitCompartment:
 		getEntities()->exitCompartment(_entityIndex, (ObjectIndex)params->param4);
 		getData()->entityPosition = (EntityPosition)params->param5;
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -229,15 +219,15 @@ IMPLEMENT_FUNCTION(6, Mertens, callbackActionOnDirection)
 
 	case kActionNone:
 		if (getData()->direction != kDirectionRight) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -256,11 +246,11 @@ IMPLEMENT_FUNCTION_S(7, Mertens, playSound)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -283,11 +273,11 @@ IMPLEMENT_FUNCTION_S(8, Mertens, playSound16)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -310,14 +300,6 @@ IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
-
-#define LOADSCENE_FROM_POSITION() \
-	if (getData()->direction != kDirectionUp) { \
-		getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750)); \
-	} else { \
-		getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition - 750), true); \
-	}
-
 	switch (savepoint.action) {
 	default:
 		break;
@@ -333,7 +315,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 		  || getEntities()->checkFields10(kEntityPlayer)) {
 			if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 				getData()->inventoryItem = kItemNone;
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 			break;
 		}
@@ -364,7 +346,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 
 		if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) {
 			getData()->inventoryItem = kItemNone;
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -395,7 +377,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 			params->param3 = 1;
 
 		if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionCallback:
@@ -416,7 +398,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 			ENTITY_PARAM(0, 7) = 0;
 
 			if (params->param1 != 3 || (params->param2 != kPosition_8200 && params->param2 != kPosition_9510)) {
-				LOADSCENE_FROM_POSITION();
+				loadSceneFromPosition();
 				break;
 			}
 
@@ -428,7 +410,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 			getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000);
 			getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750));
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -444,35 +426,33 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition)
 				getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000);
 				getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750));
 
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
-			LOADSCENE_FROM_POSITION();
+			loadSceneFromPosition();
 			break;
 
 		case 4:
 			getAction()->playAnimation(kEventMertensKronosConcertInvitation);
 			ENTITY_PARAM(2, 4) = 0;
 
-			LOADSCENE_FROM_POSITION();
+			loadSceneFromPosition();
 			break;
 
 		case 5:
 			getAction()->playAnimation(getData()->entityPosition < getEntityData(kEntityPlayer)->entityPosition ? kEventMertensAskTylerCompartmentD : kEventMertensAskTylerCompartment);
-			LOADSCENE_FROM_POSITION();
+			loadSceneFromPosition();
 			break;
 
 		case 6:
 			getAction()->playAnimation(kEventMertensDontMakeBed);
-			LOADSCENE_FROM_POSITION();
+			loadSceneFromPosition();
 			ENTITY_PARAM(0, 4) = 0;
 			break;
 		}
 		break;
 	}
-
-#undef LOADSCENE_FROM_POSITION
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -482,11 +462,12 @@ IMPLEMENT_FUNCTION_I(11, Mertens, function11, uint32)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 
-		UPDATE_PARAM(params->param2, getState()->time, params->param1)
+		if (!Entity::updateParameter(params->param2, getState()->time, params->param1))
+			break;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionCallback:
@@ -506,7 +487,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex)
 		return;
 
 	if (getSoundQueue()->isBuffered(kEntityMertens)) {
-		CALLBACK_ACTION();
+		callbackAction();
 		return;
 	}
 
@@ -540,7 +521,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex)
 			getSound()->playSound(kEntityMertens, "CON1112G");
 	}
 
-	CALLBACK_ACTION();
+	callbackAction();
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -550,23 +531,23 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, bool)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 
 		if (!params->param2 && !params->param3) {
-			UPDATE_PARAM_PROC(params->param4, getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param4, getState()->timeTicks, 75)) {
 				getData()->inventoryItem = kItemNone;
 				setCallback(5);
 				setup_function18();
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		UPDATE_PARAM_PROC(params->param5, getState()->timeTicks, 225)
+		if (Entity::updateParameter(params->param5, getState()->timeTicks, 225)) {
 			getData()->inventoryItem = kItemNone;
 			setCallback(6);
 			setup_function18();
 			break;
-		UPDATE_PARAM_PROC_END
+		}
 
 		getData()->inventoryItem = (getProgress().chapter == kChapter1
 								 && !ENTITY_PARAM(2, 1)
@@ -640,7 +621,7 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, bool)
 		case 6:
 		case 9:
 		case 10:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 7:
@@ -672,7 +653,7 @@ IMPLEMENT_FUNCTION_I(14, Mertens, function14, EntityIndex)
 		break;
 
 	case kActionNone:
-		SAVEGAME_BLOOD_JACKET();
+		Entity::savegameBloodJacket();
 		break;
 
 	case kActionDefault:
@@ -719,7 +700,7 @@ IMPLEMENT_FUNCTION_I(14, Mertens, function14, EntityIndex)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -783,7 +764,7 @@ IMPLEMENT_FUNCTION_I(15, Mertens, function15, bool)
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -860,7 +841,7 @@ IMPLEMENT_FUNCTION_I(16, Mertens, function16, bool)
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -888,7 +869,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
 			getScenes()->loadSceneFromItemPosition(kItem7);
 			ENTITY_PARAM(2, 1) = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -926,7 +907,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
 			break;
 
 		case 2:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -944,7 +925,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17)
 
 			getSavePoints()->push(kEntityMertens, kEntityMertens, kActionDrawScene);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -970,7 +951,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
 			getInventory()->setLocationAndProcess(kItem7, kObjectLocation1);
 			ENTITY_PARAM(2, 1) = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -978,7 +959,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
 			getScenes()->loadSceneFromItemPosition(kItem7);
 			ENTITY_PARAM(2, 1) = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -1009,7 +990,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18)
 			ENTITY_PARAM(0, 1) = 0;
 			getData()->inventoryItem = kItemNone;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -1025,7 +1006,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19)
 		if (ENTITY_PARAM(2, 1)) {
 			getInventory()->setLocationAndProcess(kItem7, kObjectLocation1);
 			ENTITY_PARAM(2, 1) = 0;
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			setCallback(1);
 			setup_bloodJacket("601C");
@@ -1039,7 +1020,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19)
 			if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2))
 				getData()->entityPosition = kPosition_2088;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -1057,7 +1038,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20)
 		if (ENTITY_PARAM(2, 1)) {
 			ENTITY_PARAM(2, 1) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			setCallback(1);
 			setup_bloodJacket("601C");
@@ -1066,7 +1047,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20)
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -1078,11 +1059,12 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(CURRENT_PARAM(1, 4), getState()->time, 300)
+		if (Entity::updateParameter(CURRENT_PARAM(1, 4), getState()->time, 300)) {
 			getSound()->playSound(kEntityPlayer, "ZFX1004", getSound()->getSoundFlag(kEntityMertens));
-		UPDATE_PARAM_PROC_END
+		}
 
-		UPDATE_PARAM(CURRENT_PARAM(1, 5), getState()->time, 900);
+		if (!Entity::updateParameter(CURRENT_PARAM(1, 5), getState()->time, 900))
+			break;
 
 		// Update objects
 		getObjects()->updateLocation2((ObjectIndex)params->param1, kObjectLocation1);
@@ -1092,7 +1074,7 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex)
 		if (params->param2)
 			getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param8, (ObjectLocation)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2), (CursorStyle)CURRENT_PARAM(1, 3));
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionKnock:
@@ -1222,7 +1204,7 @@ IMPLEMENT_FUNCTION(22, Mertens, function22)
 			break;
 
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1291,7 +1273,7 @@ IMPLEMENT_FUNCTION(23, Mertens, function23)
 		case 6:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1306,7 +1288,8 @@ IMPLEMENT_FUNCTION(24, Mertens, function24)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment3("601Rc", kObjectCompartment3, kPosition_6470, kPosition_6130);
@@ -1351,7 +1334,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24)
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1380,7 +1363,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24)
 			break;
 
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1409,7 +1392,8 @@ IMPLEMENT_FUNCTION(25, Mertens, function25)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM(params->param2, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param2, getState()->timeTicks, 75))
+				break;
 
 			setCallback(3);
 			setup_enterExitCompartment3("601Zb", kObjectCompartment2, kPosition_7500, kPositionNone);
@@ -1458,7 +1442,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25)
 		case 5:
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -1492,7 +1476,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25)
 			break;
 
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1547,7 +1531,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool)
 		case 2:
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -1613,7 +1597,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool)
 			getData()->location = kLocationOutsideCompartment;
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1628,17 +1612,17 @@ IMPLEMENT_FUNCTION_I(27, Mertens, tylerCompartment, MertensActionType)
 
 	case kActionNone:
 		if (getProgress().field_14 == 29) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
-		UPDATE_PARAM_PROC(params->param2, getState()->timeTicks, 150)
+		if (Entity::updateParameter(params->param2, getState()->timeTicks, 150)) {
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal);
 
 			setCallback(10);
 			setup_playSound16("CON1018A");
 			break;
-		UPDATE_PARAM_PROC_END
+		}
 
 label_callback10:
 		if (!params->param3)
@@ -1646,7 +1630,8 @@ label_callback10:
 
 		if (params->param3 >= getState()->timeTicks) {
 label_callback11:
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 375);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 375))
+				break;
 
 			getSound()->playSound(kEntityPlayer, "LIB033");
 
@@ -1680,7 +1665,7 @@ label_callback11:
 						getSound()->playSound(kEntityPlayer, "LIB015");
 						getScenes()->loadScene(kScene41);
 
-						CALLBACK_ACTION();
+						callbackAction();
 						break;
 					}
 				} else {
@@ -1738,7 +1723,7 @@ label_callback11:
 						getSound()->playSound(kEntityPlayer, "LIB015");
 						getScenes()->loadScene(kScene41);
 
-						CALLBACK_ACTION();
+						callbackAction();
 						break;
 					}
 				} else {
@@ -1763,7 +1748,7 @@ label_callback11:
 			default:
 				getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 
 			case 1:
@@ -1821,7 +1806,7 @@ label_callback11:
 					getSound()->playSound(kEntityPlayer, "LIB015");
 					getScenes()->loadScene(kScene41);
 
-					CALLBACK_ACTION();
+					callbackAction();
 					break;
 				}
 			} else {
@@ -1930,7 +1915,7 @@ label_callback11:
 			getData()->location = kLocationOutsideCompartment;
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 8:
@@ -1957,7 +1942,7 @@ label_callback11:
 		case 19:
 		case 22:
 		case 28:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 15:
@@ -1969,7 +1954,7 @@ label_callback11:
 			getSound()->playSound(kEntityPlayer, "LIB015");
 			getScenes()->loadScene(kScene41);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 16:
@@ -1981,27 +1966,27 @@ label_callback11:
 			getSound()->playSound(kEntityPlayer, "LIB015");
 			getScenes()->loadScene(kScene41);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 23:
 			getProgress().eventMertensAugustWaiting = true;
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 24:
 			getProgress().eventMertensKronosInvitation = true;
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 25:
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2053,7 +2038,7 @@ IMPLEMENT_FUNCTION_S(28, Mertens, function28)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2115,7 +2100,7 @@ IMPLEMENT_FUNCTION_SS(29, Mertens, function29)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2140,14 +2125,14 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType)
 	case kActionDefault:
 		switch (params->param1) {
 		default:
-			CALLBACK_ACTION();
+			callbackAction();
 			return;
 
 		case 1:
 			params->param2 = kPosition_8200;
 
 			if (getProgress().field_14) {
-				CALLBACK_ACTION();
+				callbackAction();
 				return;
 			}
 
@@ -2273,7 +2258,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType)
 			break;
 
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2312,7 +2297,7 @@ IMPLEMENT_FUNCTION_I(31, Mertens, function31, MertensActionType)
 
 		case 2:
 		case 3:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2360,7 +2345,7 @@ IMPLEMENT_FUNCTION(32, Mertens, function32)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2382,7 +2367,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
 			setCallback(ENTITY_PARAM(0, 8) ? 1 : 3);
 			setup_updateEntity(kCarGreenSleeping, ENTITY_PARAM(0, 8) ? kPosition_1500 : kPosition_540);
 		} else {
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -2401,7 +2386,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
 		case 2:
 			ENTITY_PARAM(1, 8) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 3:
@@ -2480,7 +2465,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
 				break;
 			}
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 12:
@@ -2493,13 +2478,13 @@ IMPLEMENT_FUNCTION(33, Mertens, function33)
 				break;
 			}
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 13:
 			ENTITY_PARAM(2, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2513,7 +2498,7 @@ IMPLEMENT_FUNCTION(34, Mertens, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Mertens, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -2548,7 +2533,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
 
 	case kActionDefault:
 		if (getProgress().field_14 == 29) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		} else {
 			getProgress().field_14 = 3;
@@ -2589,7 +2574,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 5:
@@ -2611,7 +2596,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35)
 			break;
 
 		case 7:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2626,7 +2611,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36)
 
 	case kActionDefault:
 		if (getProgress().field_14 == 29) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			getProgress().field_14 = 3;
 
@@ -2712,7 +2697,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36)
 
 		case 6:
 		case 9:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2767,7 +2752,7 @@ IMPLEMENT_FUNCTION(37, Mertens, function37)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2791,12 +2776,12 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
 
 	case kActionDefault:
 		if (!ENTITY_PARAM(0, 4)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (getProgress().field_14 == 29) {
-			CALLBACK_ACTION();
+			callbackAction();
 		} else {
 			setCallback(1);
 			setup_updateEntity(kCarGreenSleeping, kPosition_8200);
@@ -2810,7 +2795,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
 
 		case 1:
 			if (!ENTITY_PARAM(0, 4)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -2820,7 +2805,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38)
 
 		case 2:
 			ENTITY_PARAM(0, 4) = 0;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2894,7 +2879,7 @@ IMPLEMENT_FUNCTION(39, Mertens, function39)
 			break;
 
 		case 10:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -2940,7 +2925,7 @@ IMPLEMENT_FUNCTION(40, Mertens, function40)
 
 		case 5:
 			ENTITY_PARAM(0, 6) = 1;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -3013,7 +2998,7 @@ IMPLEMENT_FUNCTION(42, Mertens, function42)
 			getData()->inventoryItem = kItemInvalid;
 
 		if (!params->param2) {
-			TIME_CHECK_SAVEPOINT(kTime1125000, params->param3, kEntityMertens, kEntityMahmud, kAction170483072);
+			Entity::timeCheckSavepoint(kTime1125000, params->param3, kEntityMertens, kEntityMahmud, kAction170483072);
 
 			if (params->param4 != kTimeInvalid && getState()->time > kTimeCityChalons) {
 
@@ -3040,11 +3025,11 @@ IMPLEMENT_FUNCTION(42, Mertens, function42)
 
 label_callback_8:
 		if (getState()->time > kTime1215000 && !ENTITY_PARAM(0, 1) && !ENTITY_PARAM(2, 1)) {
-			UPDATE_PARAM_PROC(params->param5, getState()->time, 2700)
+			if (Entity::updateParameter(params->param5, getState()->time, 2700)) {
 				getEntities()->drawSequenceLeft(kEntityMertens, "601E");
 				ENTITY_PARAM(0, 1) = 1;
 				params->param5 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (ENTITY_PARAM(0, 8)) {
@@ -3547,19 +3532,23 @@ label_callback_5:
 		}
 
 label_callback_6:
-		TIME_CHECK_CALLBACK_1(kTime1971000, params->param1, 7, setup_function28, "CON3012");
+		if (Entity::timeCheckCallback(kTime1971000, params->param1, 7, "CON3012", WRAP_SETUP_FUNCTION_S(Mertens, setup_function28)))
+			break;
 
 label_callback_7:
-		TIME_CHECK_CALLBACK(kTime2117700, params->param2, 8, setup_function32);
+		if (Entity::timeCheckCallback(kTime2117700, params->param2, 8, WRAP_SETUP_FUNCTION(Mertens, setup_function32)))
+			break;
 
 label_callback_8:
-		TIME_CHECK_CALLBACK_1(kTime2124000, params->param3, 9, setup_function28, "CON2010");
+		if (Entity::timeCheckCallback(kTime2124000, params->param3, 9, "CON2010", WRAP_SETUP_FUNCTION_S(Mertens, setup_function28)))
+			break;
 
 label_callback_9:
-		TIME_CHECK_CALLBACK(kTime2146500, params->param4, 10, setup_function32);
+		if (Entity::timeCheckCallback(kTime2146500, params->param4, 10, WRAP_SETUP_FUNCTION(Mertens, setup_function32)))
+			break;
 
 label_callback_10:
-		TIME_CHECK_CALLBACK(kTime2169000, params->param5, 11, setup_function32);
+		Entity::timeCheckCallback(kTime2169000, params->param5, 11, WRAP_SETUP_FUNCTION(Mertens, setup_function32));
 		break;
 
 	case kAction11:
@@ -3742,21 +3731,26 @@ label_callback_3:
 
 label_callback_4:
 		if (!params->param1) {
-			TIME_CHECK_CALLBACK(kTime2403000, params->param2, 5, setup_function49);
+			if (Entity::timeCheckCallback(kTime2403000, params->param2, 5, WRAP_SETUP_FUNCTION(Mertens, setup_function49)))
+				break;
 
 label_callback_5:
-			TIME_CHECK_CALLBACK(kTime2430000, params->param3, 6, setup_function32);
+			if (Entity::timeCheckCallback(kTime2430000, params->param3, 6, WRAP_SETUP_FUNCTION(Mertens, setup_function32)))
+				break;
 
 label_callback_6:
-			TIME_CHECK_CALLBACK(kTime2439000, params->param4, 7, setup_function32);
+			if (Entity::timeCheckCallback(kTime2439000, params->param4, 7, WRAP_SETUP_FUNCTION(Mertens, setup_function32)))
+				break;
 
 label_callback_7:
-			TIME_CHECK_CALLBACK(kTime2448000, params->param5, 8, setup_function32);
+			if (Entity::timeCheckCallback(kTime2448000, params->param5, 8, WRAP_SETUP_FUNCTION(Mertens, setup_function32)))
+				break;
 		}
 
 label_callback_8:
 		if (getState()->time > kTime2538000 && !ENTITY_PARAM(0, 1) && !ENTITY_PARAM(2, 1)) {
-			UPDATE_PARAM(params->param6, getState()->time, 2700);
+			if (!Entity::updateParameter(params->param6, getState()->time, 2700))
+				break;
 
 			getEntities()->drawSequenceLeft(kEntityMertens, "601E");
 
@@ -3913,7 +3907,7 @@ IMPLEMENT_FUNCTION(49, Mertens, function49)
 			break;
 
 		case 11:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -4010,7 +4004,8 @@ IMPLEMENT_FUNCTION(53, Mertens, function53)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 0;
@@ -4108,4 +4103,15 @@ IMPLEMENT_FUNCTION_END
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_NULL_FUNCTION(54, Mertens)
 
+//////////////////////////////////////////////////////////////////////////
+// Helper functions
+//////////////////////////////////////////////////////////////////////////
+
+void Mertens::loadSceneFromPosition() {
+	if (getData()->direction != kDirectionUp)
+		getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750));
+	else
+		getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition - 750), true);
+}
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/mertens.h b/engines/lastexpress/entities/mertens.h
index 31b7a97dcd..4cc58fd4ba 100644
--- a/engines/lastexpress/entities/mertens.h
+++ b/engines/lastexpress/entities/mertens.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_MERTENS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -210,6 +209,9 @@ public:
 	DECLARE_FUNCTION(function53)
 
 	DECLARE_NULL_FUNCTION()
+
+private:
+	void loadSceneFromPosition();
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp
index ff3d2b6744..519a613497 100644
--- a/engines/lastexpress/entities/milos.cpp
+++ b/engines/lastexpress/entities/milos.cpp
@@ -36,10 +36,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -135,7 +133,7 @@ IMPLEMENT_FUNCTION_II(10, Milos, enterCompartmentDialog, CarIndex, EntityPositio
 	case kActionNone:
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
@@ -173,16 +171,16 @@ IMPLEMENT_FUNCTION_I(11, Milos, function11, TimeValue)
 		if (!params->param5 && params->param1 < getState()->time && !params->param7) {
 			params->param7 = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param2) {
-			UPDATE_PARAM_PROC(params->param8,  getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param8,  getState()->timeTicks, 75)) {
 				params->param2 = 0;
 				params->param3 = 1;
 				getObjects()->update(kObjectCompartmentG, kEntityMilos, kObjectLocation1, kCursorNormal, kCursorNormal);
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		params->param8 = 0;
@@ -191,10 +189,10 @@ IMPLEMENT_FUNCTION_I(11, Milos, function11, TimeValue)
 			break;
 
 		if (params->param6) {
-			UPDATE_PARAM_PROC(CURRENT_PARAM(1, 1), getState()->time, 4500)
+			if (Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->time, 4500)) {
 				params->param6 = 0;
 				CURRENT_PARAM(1, 1) = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!getProgress().field_CC) {
@@ -364,7 +362,7 @@ IMPLEMENT_FUNCTION(12, Milos, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Milos, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -394,7 +392,7 @@ IMPLEMENT_FUNCTION(13, Milos, function13)
 		getEntities()->clearSequences(kEntityIvo);
 		getEntities()->clearSequences(kEntitySalko);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -422,7 +420,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14)
 				getEntities()->exitCompartment(kEntityMilos, kObjectCompartment1, true);
 				getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 			break;
 		}
@@ -436,7 +434,8 @@ IMPLEMENT_FUNCTION(14, Milos, function14)
 			if (CURRENT_PARAM(1, 1) < getState()->timeTicks) {
 
 				if (getObjects()->get(kObjectCompartment1).location == kObjectLocation1) {
-					UPDATE_PARAM(CURRENT_PARAM(1, 2), getState()->timeTicks, 75);
+					if (!Entity::updateParameter(CURRENT_PARAM(1, 2), getState()->timeTicks, 75))
+						break;
 
 					getObjects()->update(kObjectCompartment1, kEntityMilos, getObjects()->get(kObjectCompartment1).location, kCursorNormal, kCursorNormal);
 
@@ -474,7 +473,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14)
 
 						getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand);
 
-						CALLBACK_ACTION();
+						callbackAction();
 						break;
 					}
 				} else {
@@ -507,7 +506,8 @@ IMPLEMENT_FUNCTION(14, Milos, function14)
 			}
 
 label_callback_12:
-			UPDATE_PARAM(CURRENT_PARAM(1, 4), getState()->timeTicks, 75);
+			if (!Entity::updateParameter(CURRENT_PARAM(1, 4), getState()->timeTicks, 75))
+				break;
 
 			getEntities()->exitCompartment(kEntityMilos, kObjectCompartment1, true);
 
@@ -593,7 +593,7 @@ label_callback_12:
 			getData()->location = kLocationOutsideCompartment;
 			getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 2:
@@ -633,7 +633,7 @@ label_callback_12:
 			getScenes()->loadScene(kScene41);
 			getData()->location = kLocationOutsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -722,7 +722,7 @@ IMPLEMENT_FUNCTION(15, Milos, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1071000, params->param3, kEntityMilos, kEntityServers1, kAction223002560);
+		Entity::timeCheckSavepoint(kTime1071000, params->param3, kEntityMilos, kEntityServers1, kAction223002560);
 
 		if (getState()->time > kTime1089000 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 			setup_function16();
@@ -730,15 +730,16 @@ IMPLEMENT_FUNCTION(15, Milos, chapter1Handler)
 		}
 
 		if (getEntities()->isPlayerPosition(kCarRestaurant, 61) && !params->param1) {
-			UPDATE_PARAM_PROC(params->param4, getState()->timeTicks, 45)
+			if (Entity::updateParameter(params->param4, getState()->timeTicks, 45)) {
 				setCallback(1);
 				setup_draw("009C");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (getEntities()->isPlayerPosition(kCarRestaurant, 70) && !params->param2) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 45);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 45))
+				break;
 
 			setCallback(2);
 			setup_draw("009C");
@@ -953,7 +954,8 @@ IMPLEMENT_FUNCTION(21, Milos, function21)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param2, getState()->time, 4500);
+		if (!Entity::updateParameter(params->param2, getState()->time, 4500))
+			break;
 
 		params->param1 = 1;
 		break;
@@ -1118,7 +1120,8 @@ IMPLEMENT_FUNCTION(24, Milos, function24)
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
@@ -1284,14 +1287,15 @@ IMPLEMENT_FUNCTION(25, Milos, function25)
 
 	case kActionNone:
 		if (!getEvent(kEventMilosCompartmentVisitTyler) && !getProgress().field_54 && !ENTITY_PARAM(0, 4)) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 13500)
+			if (Entity::updateParameter(params->param3, getState()->time, 13500)) {
 				getSavePoints()->push(kEntityMilos, kEntityVesna, kAction155913424);
 				params->param3 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param4, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param4, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
@@ -1386,7 +1390,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue)
 
 	case kActionNone:
 		if (params->param1 < getState()->time && !params->param2) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -1415,7 +1419,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue)
 
 		case 1:
 			if (ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -1425,7 +1429,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue)
 		case 2:
 		case 3:
 			if (ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -1442,7 +1446,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue)
 
 		case 5:
 			if (ENTITY_PARAM(0, 2)) {
-				CALLBACK_ACTION();
+				callbackAction();
 				break;
 			}
 
@@ -1461,7 +1465,7 @@ IMPLEMENT_FUNCTION_II(27, Milos, function27, CarIndex, EntityPosition)
 
 	case kActionNone:
 		if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
@@ -1472,14 +1476,14 @@ IMPLEMENT_FUNCTION_II(27, Milos, function27, CarIndex, EntityPosition)
 			if (getData()->car == kCarRedSleeping || getData()->car == kCarGreenSleeping) {
 				ENTITY_PARAM(0, 2) = 1;
 
-				CALLBACK_ACTION();
+				callbackAction();
 			}
 		}
 		break;
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -1536,7 +1540,7 @@ IMPLEMENT_FUNCTION(29, Milos, chapter4Handler)
 
 		TIME_CHECK_PLAYSOUND_MILOS(kTime2370600, params->param5, "Mil4015");
 
-		TIME_CHECK_SAVEPOINT(kTime2407500, params->param6, kEntityMilos, kEntityVesna, kAction55996766);
+		Entity::timeCheckSavepoint(kTime2407500, params->param6, kEntityMilos, kEntityVesna, kAction55996766);
 		break;
 
 	case kActionCallback:
diff --git a/engines/lastexpress/entities/milos.h b/engines/lastexpress/entities/milos.h
index d58d717f8a..e8f95dc5ff 100644
--- a/engines/lastexpress/entities/milos.h
+++ b/engines/lastexpress/entities/milos.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_MILOS_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp
index 9ca10ca374..950644cb8f 100644
--- a/engines/lastexpress/entities/mmeboutarel.cpp
+++ b/engines/lastexpress/entities/mmeboutarel.cpp
@@ -31,10 +31,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -124,7 +122,7 @@ IMPLEMENT_FUNCTION_S(8, MmeBoutarel, function8)
 			if (!getEntities()->isPlayerPosition(kCarRedSleeping, 2))
 				getData()->entityPosition = kPosition_2088;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -211,7 +209,7 @@ IMPLEMENT_FUNCTION(9, MmeBoutarel, function9)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityMmeBoutarel);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 5:
@@ -220,7 +218,7 @@ IMPLEMENT_FUNCTION(9, MmeBoutarel, function9)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityMmeBoutarel);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -246,7 +244,7 @@ IMPLEMENT_FUNCTION(10, MmeBoutarel, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(MmeBoutarel, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -312,7 +310,7 @@ IMPLEMENT_FUNCTION(11, MmeBoutarel, function11)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -402,7 +400,7 @@ IMPLEMENT_FUNCTION(13, MmeBoutarel, function13)
 
 	case kActionNone:
 		if (!getSoundQueue()->isBuffered(kEntityMmeBoutarel) && params->param6 != kTimeInvalid) {
-			UPDATE_PARAM_PROC_TIME(params->param1, !getEntities()->isDistanceBetweenEntities(kEntityMmeBoutarel, kEntityPlayer, 2000), params->param6, 0)
+			if (Entity::updateParameterTime((TimeValue)params->param1, !getEntities()->isDistanceBetweenEntities(kEntityMmeBoutarel, kEntityPlayer, 2000), params->param6, 0)) {
 				getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal);
 				getObjects()->update(kObject51, kEntityPlayer, kObjectLocation1, kCursorNormal, kCursorNormal);
 
@@ -414,22 +412,24 @@ IMPLEMENT_FUNCTION(13, MmeBoutarel, function13)
 				setCallback(1);
 				setup_playSound("MME1037");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback_1:
 		if (getProgress().field_24 && params->param7 != kTimeInvalid) {
-			UPDATE_PARAM_PROC_TIME(kTime1093500, (!params->param5 || !getEntities()->isPlayerInCar(kCarRedSleeping)), params->param7, 0)
+			if (Entity::updateParameterTime(kTime1093500, (!params->param5 || !getEntities()->isPlayerInCar(kCarRedSleeping)), params->param7, 0)) {
 				setCallback(2);
 				setup_function11();
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		TIME_CHECK(kTime1094400, params->param8, setup_function14);
+		if (Entity::timeCheck(kTime1094400, params->param8, WRAP_SETUP_FUNCTION(MmeBoutarel, setup_function14)))
+			break;
 
 		if (params->param4) {
-			UPDATE_PARAM(CURRENT_PARAM(1, 1), getState()->timeTicks, 75);
+			if (!Entity::updateParameter(CURRENT_PARAM(1, 1), getState()->timeTicks, 75))
+				break;
 
 			params->param3 = 1;
 			params->param4 = 0;
@@ -589,7 +589,8 @@ IMPLEMENT_FUNCTION(15, MmeBoutarel, function15)
 
 label_callback_5:
 		if (params->param2) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 1;
 			params->param2 = 0;
@@ -1018,7 +1019,8 @@ IMPLEMENT_FUNCTION(23, MmeBoutarel, chapter4Handler)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param2, getState()->time, 900);
+			if (!Entity::updateParameter(params->param2, getState()->time, 900))
+				break;
 
 			getObjects()->update(kObjectCompartmentD, kEntityPlayer, kObjectLocation1, kCursorKeepValue, kCursorKeepValue);
 
@@ -1064,10 +1066,12 @@ IMPLEMENT_FUNCTION(24, MmeBoutarel, function24)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTime2470500, params->param4, setup_function25);
+		if (Entity::timeCheck(kTime2470500, params->param4, WRAP_SETUP_FUNCTION(MmeBoutarel, setup_function25)))
+			break;
 
 		if (params->param2) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 1;
 			params->param2 = 0;
@@ -1210,7 +1214,8 @@ IMPLEMENT_FUNCTION(28, MmeBoutarel, function28)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
diff --git a/engines/lastexpress/entities/mmeboutarel.h b/engines/lastexpress/entities/mmeboutarel.h
index 772451ba15..0f6e6349fe 100644
--- a/engines/lastexpress/entities/mmeboutarel.h
+++ b/engines/lastexpress/entities/mmeboutarel.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_MMEBOUTAREL_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/pascale.cpp b/engines/lastexpress/entities/pascale.cpp
index a191273702..6e9f992390 100644
--- a/engines/lastexpress/entities/pascale.cpp
+++ b/engines/lastexpress/entities/pascale.cpp
@@ -30,10 +30,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -171,7 +169,7 @@ IMPLEMENT_FUNCTION(8, Pascale, welcomeSophieAndRebecca)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(0, 4) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -185,8 +183,8 @@ IMPLEMENT_FUNCTION(9, Pascale, sitSophieAndRebecca)
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
- 		break;
+		callbackAction();
+		break;
 
 	case kActionDefault:
 		getEntities()->drawSequenceLeft(kEntityPascale, "012C1");
@@ -217,7 +215,7 @@ IMPLEMENT_FUNCTION(10, Pascale, welcomeCath)
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 69);
 		}
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction4:
@@ -239,7 +237,7 @@ IMPLEMENT_FUNCTION(10, Pascale, welcomeCath)
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 69);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -283,7 +281,7 @@ IMPLEMENT_FUNCTION(11, Pascale, function11)
 			getEntities()->clearSequences(kEntityPascale);
 			getData()->entityPosition = kPosition_5900;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -298,7 +296,7 @@ IMPLEMENT_FUNCTION(12, Pascale, chapter1)
 
 	case kActionNone:
 		setup_chapter1Handler();
- 		break;
+		break;
 
 	case kActionDefault:
 		getSavePoints()->addData(kEntityPascale, kAction239072064, 0);
@@ -366,7 +364,7 @@ IMPLEMENT_FUNCTION(13, Pascale, getMessageFromAugustToTyler)
 			getSavePoints()->push(kEntityPascale, kEntityVerges, kActionDeliverMessageToTyler);
 			ENTITY_PARAM(0, 1) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -382,7 +380,7 @@ IMPLEMENT_FUNCTION(14, Pascale, sitAnna)
 	case kActionExitCompartment:
 		getEntities()->updatePositionExit(kEntityPascale, kCarRestaurant, 62);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -433,7 +431,7 @@ IMPLEMENT_FUNCTION(15, Pascale, welcomeAnna)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(0, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -486,7 +484,7 @@ IMPLEMENT_FUNCTION(16, Pascale, serveTatianaVassili)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(0, 3) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -648,7 +646,7 @@ IMPLEMENT_FUNCTION(21, Pascale, chapter3)
 
 	case kActionNone:
 		setup_chapter3Handler();
- 		break;
+		break;
 
 	case kActionDefault:
 		getEntities()->clearSequences(kEntityPascale);
@@ -685,7 +683,7 @@ label_callback:
 			setCallback(2);
 			setup_welcomeSophieAndRebecca();
 		}
- 		break;
+		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
@@ -727,7 +725,7 @@ IMPLEMENT_FUNCTION(23, Pascale, function23)
 			ENTITY_PARAM(0, 7) = 0;
 			getEntities()->clearSequences(kEntityPascale);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -748,7 +746,7 @@ IMPLEMENT_FUNCTION(24, Pascale, welcomeAbbot)
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kAction10:
@@ -771,7 +769,7 @@ IMPLEMENT_FUNCTION(25, Pascale, chapter4)
 
 	case kActionNone:
 		setup_chapter4Handler();
- 		break;
+		break;
 
 	case kActionDefault:
 		getEntities()->clearSequences(kEntityPascale);
@@ -953,7 +951,7 @@ IMPLEMENT_FUNCTION(27, Pascale, function27)
 			ENTITY_PARAM(1, 1) = 0;
 			ENTITY_PARAM(1, 2) = 1;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -999,7 +997,7 @@ IMPLEMENT_FUNCTION(28, Pascale, messageFromAnna)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(1, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1037,7 +1035,7 @@ IMPLEMENT_FUNCTION(29, Pascale, function29)
 		case 2:
 			getData()->entityPosition = kPosition_850;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1075,7 +1073,7 @@ IMPLEMENT_FUNCTION(30, Pascale, function30)
 		case 2:
 			getData()->entityPosition = kPosition_5900;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1090,7 +1088,7 @@ IMPLEMENT_FUNCTION(31, Pascale, chapter5)
 
 	case kActionNone:
 		setup_chapter5Handler();
- 		break;
+		break;
 
 	case kActionDefault:
 		getEntities()->clearSequences(kEntityPascale);
@@ -1117,18 +1115,19 @@ IMPLEMENT_FUNCTION(33, Pascale, function33)
 
 	case kActionNone:
 		if (params->param4) {
-			UPDATE_PARAM_PROC(params->param5, getState()->time, 4500)
+			if (Entity::updateParameter(params->param5, getState()->time, 4500)) {
 				getObjects()->update(kObjectCompartmentG, kEntityPascale, kObjectLocation1, kCursorNormal, kCursorNormal);
 
 				setCallback(1);
 				setup_playSound("Wat5010");
 				break;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_callback1:
 		if (params->param1) {
-			UPDATE_PARAM(params->param6, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param6, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 2;
diff --git a/engines/lastexpress/entities/pascale.h b/engines/lastexpress/entities/pascale.h
index 333ebcae3e..eaf0f3ba0c 100644
--- a/engines/lastexpress/entities/pascale.h
+++ b/engines/lastexpress/entities/pascale.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_PASCALE_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp
index b1a176b47e..5bcb6aef85 100644
--- a/engines/lastexpress/entities/rebecca.cpp
+++ b/engines/lastexpress/entities/rebecca.cpp
@@ -30,10 +30,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -179,7 +177,7 @@ IMPLEMENT_FUNCTION(15, Rebecca, function15)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityRebecca);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -261,7 +259,7 @@ IMPLEMENT_FUNCTION_I(16, Rebecca, function16, bool)
 		getSavePoints()->push(kEntityRebecca, kEntityTables3, kAction136455232);
 		getData()->location = kLocationInsideCompartment;
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -334,7 +332,7 @@ IMPLEMENT_FUNCTION_I(17, Rebecca, function17, bool)
 		case 5:
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -343,7 +341,7 @@ IMPLEMENT_FUNCTION_I(17, Rebecca, function17, bool)
 
 			getData()->location = kLocationInsideCompartment;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -397,7 +395,7 @@ IMPLEMENT_FUNCTION(18, Rebecca, function18)
 
 		case 2:
 		case 3:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -473,7 +471,7 @@ IMPLEMENT_FUNCTION(19, Rebecca, function19)
 
 		case 5:
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -493,21 +491,21 @@ IMPLEMENT_FUNCTION_I(20, Rebecca, function20, TimeValue)
 			getObjects()->update(kObjectCompartmentE, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject52, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (!params->param2) {
 			params->param6 = 0;
 		} else {
-			UPDATE_PARAM_PROC(params->param6, getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param6, getState()->timeTicks, 75)) {
 				params->param2 = 0;
 				params->param3 = 1;
 				getObjects()->update(kObjectCompartmentE, kEntityRebecca, kObjectLocation1, kCursorNormal, kCursorNormal);
 				getObjects()->update(kObject52, kEntityRebecca, kObjectLocation1, kCursorNormal, kCursorNormal);
 
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (getProgress().chapter == kChapter1 && !ENTITY_PARAM(0, 3)) {
@@ -657,7 +655,7 @@ IMPLEMENT_FUNCTION(21, Rebecca, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Rebecca, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -685,7 +683,8 @@ IMPLEMENT_FUNCTION(22, Rebecca, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_1(kTime1084500, params->param3, 1, setup_playSound, "REB1015");
+		if (Entity::timeCheckCallback(kTime1084500, params->param3, 1, "REB1015", WRAP_SETUP_FUNCTION_S(Rebecca, setup_playSound)))
+			break;
 
 		if (params->param4 == kTimeInvalid)
 			goto label_callback_4;
@@ -699,7 +698,7 @@ IMPLEMENT_FUNCTION(22, Rebecca, chapter1Handler)
 		if (params->param4 >= getState()->time) {
 label_callback_4:
 			if (params->param1) {
-				UPDATE_PARAM_CHECK(params->param5, getState()->time, 900)
+				if (Entity::updateParameterCheck(params->param5, getState()->time, 900)) {
 					if (getEntities()->isInSalon(kEntityPlayer)) {
 						setCallback(5);
 						setup_playSound("REB1013");
@@ -710,7 +709,9 @@ label_callback_4:
 
 label_callback_5:
 			if (params->param2) {
-				UPDATE_PARAM(params->param6, getState()->timeTicks, 90);
+				if (!Entity::updateParameter(params->param6, getState()->timeTicks, 90))
+					break;
+
 				getScenes()->loadSceneFromPosition(kCarRestaurant, 55);
 			} else {
 				params->param6 = 0;
@@ -774,7 +775,13 @@ IMPLEMENT_FUNCTION(23, Rebecca, function23)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_2(kTime1111500, params->param2, 3, setup_enterExitCompartment, "623De", kObjectCompartmentE);
+		if (getState()->time > kTime1111500 && !params->param2) {
+			params->param2 = 1;
+			setCallback(3);
+			setup_enterExitCompartment("623De", kObjectCompartmentE);
+
+			break;
+		}
 		break;
 
 	case kActionDefault:
@@ -843,12 +850,13 @@ IMPLEMENT_FUNCTION(24, Rebecca, function24)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_SAVEPOINT(kTime1134000, params->param2, kEntityRebecca, kEntityServers0, kAction223712416);
+		Entity::timeCheckSavepoint(kTime1134000, params->param2, kEntityRebecca, kEntityServers0, kAction223712416);
 
 		if (!params->param1)
 			break;
 
-		TIME_CHECK_CALLBACK(kTime1165500, params->param3, 6, setup_function19);
+		if (Entity::timeCheckCallback(kTime1165500, params->param3, 6, WRAP_SETUP_FUNCTION(Rebecca, setup_function19)))
+			break;
 
 		if (params->param4 != kTimeInvalid) {
 			if (getState()->time <= kTime1161000) {
@@ -965,10 +973,16 @@ IMPLEMENT_FUNCTION(26, Rebecca, function26)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_3(kTime1224000, params->param2, 1, setup_updatePosition, "118H", kCarRestaurant, 52);
+		if (getState()->time > kTime1224000 && !params->param2) {
+			params->param2 = 1;
+			setCallback(1);
+			setup_updatePosition("118H", kCarRestaurant, 52);
+			break;
+		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, 90))
+				break;
 
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 51);
 		}
@@ -1223,7 +1237,7 @@ IMPLEMENT_FUNCTION(34, Rebecca, function34)
 					params->param2 = (uint)getState()->time;
 
 				if (params->param2 >= getState()->time) {
-					TIME_CHECK_CALLBACK(kTime2052000, params->param3, 1, setup_function19);
+					Entity::timeCheckCallback(kTime2052000, params->param3, 1, WRAP_SETUP_FUNCTION(Rebecca, setup_function19));
 					break;
 				}
 			}
@@ -1233,7 +1247,7 @@ IMPLEMENT_FUNCTION(34, Rebecca, function34)
 			getSavePoints()->push(kEntityRebecca, kEntityServers0, kAction223712416);
 		}
 
-		TIME_CHECK_CALLBACK(kTime2052000, params->param3, 1, setup_function19);
+		Entity::timeCheckCallback(kTime2052000, params->param3, 1, WRAP_SETUP_FUNCTION(Rebecca, setup_function19));
 		break;
 
 	case kActionEndSound:
@@ -1632,7 +1646,7 @@ label_next:
 
 label_callback_2:
 		if (params->param2)
-			TIME_CHECK_CALLBACK(kTime2443500, params->param5, 3, setup_function19);
+			Entity::timeCheckCallback(kTime2443500, params->param5, 3, WRAP_SETUP_FUNCTION(Rebecca, setup_function19));
 		break;
 
 	case kActionEndSound:
@@ -1755,7 +1769,8 @@ IMPLEMENT_FUNCTION(48, Rebecca, function48)
 
 	case kActionNone:
 		if (params->param1) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, 75))
+				break;
 
 			params->param1 = 0;
 			params->param2 = 1;
diff --git a/engines/lastexpress/entities/rebecca.h b/engines/lastexpress/entities/rebecca.h
index e91ee30d4d..885632f884 100644
--- a/engines/lastexpress/entities/rebecca.h
+++ b/engines/lastexpress/entities/rebecca.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_REBECCA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/salko.cpp b/engines/lastexpress/entities/salko.cpp
index 63d995dc42..e8b4b4247b 100644
--- a/engines/lastexpress/entities/salko.cpp
+++ b/engines/lastexpress/entities/salko.cpp
@@ -33,10 +33,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -137,7 +135,7 @@ IMPLEMENT_FUNCTION_II(7, Salko, function7, CarIndex, EntityPosition)
 		break;
 
 	case kAction123668192:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -158,7 +156,7 @@ IMPLEMENT_FUNCTION(9, Salko, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Salko, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -301,7 +299,8 @@ IMPLEMENT_FUNCTION(15, Salko, chapter3Handler)
 
 	case kActionNone:
 		if (getState()->time < kTime2200500) {
-			UPDATE_PARAM(params->param1, getState()->time, 81000);
+			if (!Entity::updateParameter(params->param1, getState()->time, 81000))
+				break;
 
 			setCallback(1);
 			setup_function16();
@@ -331,7 +330,8 @@ IMPLEMENT_FUNCTION(16, Salko, function16)
 		}
 
 label_callback3:
-		UPDATE_PARAM(params->param1, getState()->time, 4500);
+		if (!Entity::updateParameter(params->param1, getState()->time, 4500))
+			break;
 
 		getSavePoints()->push(kEntitySalko, kEntitySalko, kAction101169464);
 		break;
@@ -390,7 +390,7 @@ label_callback3:
 			getData()->entityPosition = kPosition_2740;
 			getEntities()->clearSequences(kEntitySalko);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/salko.h b/engines/lastexpress/entities/salko.h
index 6308211053..6ca73e39f6 100644
--- a/engines/lastexpress/entities/salko.h
+++ b/engines/lastexpress/entities/salko.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_SALKO_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/servers0.cpp b/engines/lastexpress/entities/servers0.cpp
index 989bddd662..73e0d34722 100644
--- a/engines/lastexpress/entities/servers0.cpp
+++ b/engines/lastexpress/entities/servers0.cpp
@@ -28,10 +28,7 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -113,11 +110,11 @@ IMPLEMENT_FUNCTION_NOSETUP(5, Servers0, callbackActionOnDirection)
 
 	case kActionNone:
 		if (getData()->direction != kDirectionRight)
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
  		break;
 
 	case kActionExcuseMeCath:
@@ -163,7 +160,7 @@ IMPLEMENT_FUNCTION(7, Servers0, function7)
 		case 2:
 			getEntities()->clearSequences(kEntityServers0);
 			getData()->entityPosition = kPosition_5900;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -220,7 +217,7 @@ IMPLEMENT_FUNCTION(9, Servers0, function9)
 			ENTITY_PARAM(2, 2) = 0;
 			ENTITY_PARAM(1, 6) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -315,17 +312,17 @@ IMPLEMENT_FUNCTION(20, Servers0, chapter1Handler)
 
 	case kActionNone:
 		if (params->param2) {
-			UPDATE_PARAM_PROC(params->param3, getState()->time, 2700);
+			if (Entity::updateParameter(params->param3, getState()->time, 2700)) {
 				ENTITY_PARAM(0, 4) = 1;
 				params->param2 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM_PROC(params->param4, getState()->time, 4500)
+			if (Entity::updateParameter(params->param4, getState()->time, 4500)) {
 				ENTITY_PARAM(0, 5) = 1;
 				params->param1 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!getEntities()->isInKitchen(kEntityServers0) && !getEntities()->isSomebodyInsideRestaurantOrSalon())
@@ -486,7 +483,7 @@ IMPLEMENT_FUNCTION(25, Servers0, function25)
 			getEntities()->clearSequences(kEntityServers0);
 			ENTITY_PARAM(1, 3) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -647,7 +644,7 @@ IMPLEMENT_FUNCTION(29, Servers0, augustAnnaDateOrder)
 			getEntities()->clearSequences(kEntityServers0);
 			ENTITY_PARAM(1, 5) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -693,7 +690,7 @@ IMPLEMENT_FUNCTION(30, Servers0, function30)
 			getEntities()->clearSequences(kEntityServers0);
 			ENTITY_PARAM(2, 4) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -736,10 +733,10 @@ IMPLEMENT_FUNCTION(32, Servers0, chapter4Handler)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM_PROC(params->param2, getState()->time, 3600)
+		if (Entity::updateParameter(params->param2, getState()->time, 3600)) {
 			ENTITY_PARAM(1, 8) = 1;
 			params->param1 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (!getEntities()->isInKitchen(kEntityServers1) || !getEntities()->isSomebodyInsideRestaurantOrSalon())
 			break;
@@ -859,7 +856,7 @@ IMPLEMENT_FUNCTION(33, Servers0, augustOrderSteak)
 			getEntities()->clearSequences(kEntityServers0);
 			ENTITY_PARAM(1, 7) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -902,7 +899,7 @@ IMPLEMENT_FUNCTION(34, Servers0, augustServeDuck)
 			getEntities()->clearSequences(kEntityServers0);
 			ENTITY_PARAM(1, 8) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -972,7 +969,7 @@ void Servers0::handleServer(const SavePoint &savepoint, const char *name, Entity
 			getSavePoints()->push(kEntityServers0, entity, action);
 			*parameter = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -1027,7 +1024,7 @@ void Servers0::serveTable(const SavePoint &savepoint, const char *seq1, EntityIn
 			getEntities()->clearSequences(kEntityServers0);
 			*parameter = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/servers0.h b/engines/lastexpress/entities/servers0.h
index 2e9165a410..4c35637d65 100644
--- a/engines/lastexpress/entities/servers0.h
+++ b/engines/lastexpress/entities/servers0.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_SERVERS0_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/servers1.cpp b/engines/lastexpress/entities/servers1.cpp
index 995fbbc01b..a8f4c0233c 100644
--- a/engines/lastexpress/entities/servers1.cpp
+++ b/engines/lastexpress/entities/servers1.cpp
@@ -28,10 +28,7 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -143,7 +140,7 @@ IMPLEMENT_FUNCTION(7, Servers1, function7)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(1, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -219,7 +216,7 @@ IMPLEMENT_FUNCTION(9, Servers1, function9)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(0, 1) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -265,7 +262,7 @@ IMPLEMENT_FUNCTION(10, Servers1, function10)
 			getData()->entityPosition = kPosition_5900;
 			ENTITY_PARAM(0, 2) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -469,7 +466,7 @@ IMPLEMENT_FUNCTION(20, Servers1, function20)
 			getEntities()->drawSequenceLeft(kEntityServers1, "BLANK");
 			ENTITY_PARAM(0, 7) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -566,10 +563,10 @@ IMPLEMENT_FUNCTION(26, Servers1, chapter4Handler)
 
 	case kActionNone:
 		if (params->param2) {
-			UPDATE_PARAM_PROC(params->param2, getState()->time, 900)
+			if (Entity::updateParameter(params->param2, getState()->time, 900)) {
 				ENTITY_PARAM(1, 5) = 1;
 				params->param1 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 		if (!getEntities()->isInKitchen(kEntityServers1) || !getEntities()->isSomebodyInsideRestaurantOrSalon())
@@ -705,7 +702,7 @@ void Servers1::serveTable(const SavePoint &savepoint, const char *seq1, EntityIn
 			if (parameter2 != NULL)
 				*parameter2 = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -775,7 +772,7 @@ void Servers1::serveSalon(const SavePoint &savepoint, const char *seq1, const ch
 			getData()->entityPosition = kPosition_5900;
 			*parameter = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/servers1.h b/engines/lastexpress/entities/servers1.h
index 13b30696f0..c8f667ec5c 100644
--- a/engines/lastexpress/entities/servers1.h
+++ b/engines/lastexpress/entities/servers1.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_SERVERS1_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/sophie.cpp b/engines/lastexpress/entities/sophie.cpp
index 57bd491949..170090005f 100644
--- a/engines/lastexpress/entities/sophie.cpp
+++ b/engines/lastexpress/entities/sophie.cpp
@@ -27,38 +27,10 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
 
-#define CHAPTER_IMPLEMENTATION() \
-	switch (savepoint.action) { \
-	default: \
-		break; \
-	case kActionNone: \
-		setup_chaptersHandler(); \
-		break; \
-	case kActionDefault: \
-		getEntities()->clearSequences(kEntitySophie); \
-		getData()->entityPosition = kPosition_4840; \
-		getData()->location = kLocationInsideCompartment; \
-		getData()->car = kCarRedSleeping; \
-		getData()->clothes = kClothesDefault; \
-		getData()->inventoryItem = kItemNone; \
-		break; \
-	}
-
-#define DEFAULT_ACTION_IMPLEMENTATION() \
-	if (savepoint.action == kActionDefault) { \
-		getData()->entityPosition = kPosition_4840; \
-		getData()->location = kLocationInsideCompartment; \
-		getData()->car = kCarRedSleeping; \
-		getEntities()->clearSequences(kEntitySophie); \
-	}
-
 Sophie::Sophie(LastExpressEngine *engine) : Entity(engine, kEntitySophie) {
 	ADD_CALLBACK_FUNCTION(Sophie, reset);
 	ADD_CALLBACK_FUNCTION(Sophie, updateEntity);
@@ -123,7 +95,7 @@ IMPLEMENT_FUNCTION_II(2, Sophie, updateEntity, CarIndex, EntityPosition)
 		break;
 
 	case kAction123668192:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -207,7 +179,7 @@ IMPLEMENT_FUNCTION(4, Sophie, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chaptersHandler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Sophie, setup_chaptersHandler));
 		break;
 
 	case kActionDefault:
@@ -220,27 +192,27 @@ IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(5, Sophie, function5)
-	DEFAULT_ACTION_IMPLEMENTATION()
+	handleAction(savepoint);
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(6, Sophie, chapter2)
-	CHAPTER_IMPLEMENTATION()
+	handleChapter(savepoint);
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(7, Sophie, chapter3)
-	CHAPTER_IMPLEMENTATION()
+	handleChapter(savepoint);
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(8, Sophie, chapter4)
-	CHAPTER_IMPLEMENTATION()
+	handleChapter(savepoint);
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_FUNCTION(9, Sophie, function9)
-	DEFAULT_ACTION_IMPLEMENTATION()
+	handleAction(savepoint);
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
@@ -274,4 +246,37 @@ IMPLEMENT_FUNCTION_END
 //////////////////////////////////////////////////////////////////////////
 IMPLEMENT_NULL_FUNCTION(12, Sophie)
 
+//////////////////////////////////////////////////////////////////////////
+// Helpers functions
+//////////////////////////////////////////////////////////////////////////
+
+void Sophie::handleAction(const SavePoint &savepoint) {
+	if (savepoint.action == kActionDefault) {
+		getData()->entityPosition = kPosition_4840;
+		getData()->location = kLocationInsideCompartment;
+		getData()->car = kCarRedSleeping;
+		getEntities()->clearSequences(kEntitySophie);
+	}
+}
+
+void Sophie::handleChapter(const SavePoint &savepoint) {
+	switch (savepoint.action) {
+	default:
+		break;
+
+	case kActionNone:
+		setup_chaptersHandler();
+		break;
+
+	case kActionDefault:
+		getEntities()->clearSequences(kEntitySophie);
+		getData()->entityPosition = kPosition_4840;
+		getData()->location = kLocationInsideCompartment;
+		getData()->car = kCarRedSleeping;
+		getData()->clothes = kClothesDefault;
+		getData()->inventoryItem = kItemNone;
+		break;
+	}
+}
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/sophie.h b/engines/lastexpress/entities/sophie.h
index c2ca348027..188788bb9b 100644
--- a/engines/lastexpress/entities/sophie.h
+++ b/engines/lastexpress/entities/sophie.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_SOPHIE_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -88,6 +87,10 @@ public:
 	DECLARE_FUNCTION(chapter5Handler)
 
 	DECLARE_NULL_FUNCTION()
+
+private:
+	void handleAction(const SavePoint &savepoint);
+	void handleChapter(const SavePoint &savepoint);
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/entities/tables.cpp b/engines/lastexpress/entities/tables.cpp
index 06ea4c597c..4f8d2b954d 100644
--- a/engines/lastexpress/entities/tables.cpp
+++ b/engines/lastexpress/entities/tables.cpp
@@ -29,10 +29,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/tables.h b/engines/lastexpress/entities/tables.h
index 7fcfc0499e..c213aac978 100644
--- a/engines/lastexpress/entities/tables.h
+++ b/engines/lastexpress/entities/tables.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_TABLES_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp
index c8901b3e30..432def6253 100644
--- a/engines/lastexpress/entities/tatiana.cpp
+++ b/engines/lastexpress/entities/tatiana.cpp
@@ -35,10 +35,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -192,7 +190,7 @@ IMPLEMENT_FUNCTION(14, Tatiana, function14)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityTatiana);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -228,7 +226,7 @@ IMPLEMENT_FUNCTION(15, Tatiana, function15)
 		getEntities()->exitCompartment(kEntityTatiana, kObjectCompartmentB, true);
 		getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -246,12 +244,13 @@ IMPLEMENT_FUNCTION_I(16, Tatiana, function16, uint32)
 			getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 			getObjects()->update(kObject49, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param2) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			params->param2 = 0;
 			params->param3 = 1;
@@ -342,7 +341,7 @@ IMPLEMENT_FUNCTION(17, Tatiana, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Tatiana, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -375,10 +374,10 @@ IMPLEMENT_FUNCTION(18, Tatiana, function18)
 			}
 
 			if (!params->param1) {
-				UPDATE_PARAM_PROC(params->param3, getState()->time, 4500)
+				if (Entity::updateParameter(params->param3, getState()->time, 4500)) {
 					getEntities()->drawSequenceRight(kEntityTatiana, "806DS");
 					params->param1 = 1;
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
@@ -386,14 +385,14 @@ IMPLEMENT_FUNCTION(18, Tatiana, function18)
 			getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction157159392);
 			getEntities()->clearSequences(kEntityTatiana);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
 	case kActionExitCompartment:
 		getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction188784532);
 
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -425,27 +424,29 @@ IMPLEMENT_FUNCTION(19, Tatiana, chapter1Handler)
 		if (getSoundQueue()->isBuffered(kEntityTatiana) || !params->param4 || params->param3 == 2 || getSoundQueue()->isBuffered("TAT1066"))
 			goto label_tatiana_chapter1_2;
 
-		UPDATE_PARAM_PROC(params->param5, getState()->timeTicks, 450)
+		if (Entity::updateParameter(params->param5, getState()->timeTicks, 450)) {
 			getSound()->playSound(kEntityTatiana, params->param3 ? "TAT1069B" : "TAT1069A");
 			getProgress().field_64 = 1;
 			params->param3++;
 			params->param5 = 0;
-		UPDATE_PARAM_PROC_END
+		}
 
 		if (getEntities()->isPlayerPosition(kCarRestaurant, 71)) {
-			UPDATE_PARAM_PROC(params->param6, getState()->timeTicks, 75)
+			if (Entity::updateParameter(params->param6, getState()->timeTicks, 75)) {
 				getSound()->playSound(kEntityTatiana, params->param3 ? "TAT1069B" : "TAT1069A");
 				getProgress().field_64 = 1;
 				params->param3++;
 				params->param6 = 0;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
 label_tatiana_chapter1_2:
-		TIME_CHECK_SAVEPOINT(kTime1084500, params->param7, kEntityTatiana, kEntityPascale, kAction257489762);
+		Entity::timeCheckSavepoint(kTime1084500, params->param7, kEntityTatiana, kEntityPascale, kAction257489762);
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 90);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 90))
+				break;
+
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 65);
 		} else {
 			params->param8 = 0;
@@ -614,7 +615,7 @@ IMPLEMENT_FUNCTION(22, Tatiana, function22)
 		if (params->param1 == kTimeInvalid || getState()->time <= kTime1179000)
 			goto label_update;
 
-		UPDATE_PARAM_PROC_TIME(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)
+		if (Entity::updateParameterTime(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)) {
 label_update:
 			if (!getEvent(kEventTatianaAskMatchSpeakRussian)
 			 && !getEvent(kEventTatianaAskMatch)
@@ -623,7 +624,7 @@ label_update:
 				getObjects()->update(kObject25, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorForward);
 				getObjects()->update(kObjectTrainTimeTable, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorForward);
 			}
-		UPDATE_PARAM_PROC_END
+		}
 
 		params->param1 = kTimeInvalid;
 
@@ -1022,7 +1023,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
 		}
 
 		if (parameters->param4 && parameters->param5) {
-			UPDATE_PARAM_CHECK(parameters->param4, getState()->time, 6300)
+			if (Entity::updateParameterCheck(parameters->param4, getState()->time, 6300)) {
 				if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 					getData()->location = kLocationOutsideCompartment;
 
@@ -1283,18 +1284,19 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37)
 				params->param3 = (uint)getState()->time + 900;
 
 			if (params->param4 != kTimeInvalid && params->param3 < getState()->time) {
-				UPDATE_PARAM_PROC_TIME(kTime2227500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param4, 450)
+				if (Entity::updateParameterTime(kTime2227500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param4, 450)) {
 					getProgress().field_5C = 1;
 					if (getEntities()->isInsideCompartment(kEntityAnna, kCarRedSleeping, kPosition_4070)) {
 						setup_function38();
 						break;
 					}
-				UPDATE_PARAM_PROC_END
+				}
 			}
 		}
 
 		if (params->param1) {
-			UPDATE_PARAM(params->param5, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param5, getState()->timeTicks, 75))
+				break;
 
 			getObjects()->update(kObjectCompartmentB, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorNormal);
 			getObjects()->update(kObject49, kEntityTatiana, kObjectLocation1, kCursorNormal, kCursorNormal);
@@ -1403,7 +1405,8 @@ IMPLEMENT_FUNCTION(38, Tatiana, function38)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 450);
+		if (!Entity::updateParameter(params->param1, getState()->time, 450))
+			break;
 
 		getEntities()->exitCompartment(kEntityTatiana, kObjectCompartmentF, true);
 
@@ -1535,7 +1538,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40)
 		if (getEntities()->isInsideTrainCar(kEntityPlayer, kCarKronos)
 		 || getData()->car != getEntityData(kEntityPlayer)->car
 		 || getEntities()->updateEntity(kEntityTatiana, kCarKronos, kPosition_9270))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExcuseMe:
@@ -1547,7 +1550,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40)
 
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityTatiana, kCarKronos, kPosition_9270))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -1595,7 +1598,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41)
 			}
 
 			getEntities()->clearSequences(kEntityTatiana);
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -1629,7 +1632,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41)
 		case 6:
 			getEntities()->clearSequences(kEntityTatiana);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 4:
@@ -1952,7 +1955,8 @@ IMPLEMENT_FUNCTION(48, Tatiana, function48)
 		if (!params->param1 || getSoundQueue()->isBuffered(kEntityTatiana))
 			goto label_end;
 
-		UPDATE_PARAM_GOTO(params->param2, getState()->timeTicks, 5 * (3 * rnd(5) + 30), label_end);
+		if (!Entity::updateParameter(params->param2, getState()->timeTicks, 5 * (3 * rnd(5) + 30)))
+			goto label_end;
 
 		getSound()->playSound(kEntityTatiana, "LIB012", kFlagDefault);
 		params->param2 = 0;
@@ -2199,7 +2203,8 @@ IMPLEMENT_FUNCTION(54, Tatiana, function54)
 		}
 
 		if (params->param1 > 3) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, 225);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, 225))
+				break;
 
 			params->param1 = 0;
 			params->param3 = 0;
diff --git a/engines/lastexpress/entities/tatiana.h b/engines/lastexpress/entities/tatiana.h
index c457d49b1e..8ec69db5e9 100644
--- a/engines/lastexpress/entities/tatiana.h
+++ b/engines/lastexpress/entities/tatiana.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_TATIANA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/train.cpp b/engines/lastexpress/entities/train.cpp
index bced1da62b..e3f530ef25 100644
--- a/engines/lastexpress/entities/train.cpp
+++ b/engines/lastexpress/entities/train.cpp
@@ -32,10 +32,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -269,18 +267,20 @@ IMPLEMENT_FUNCTION(8, Train, process)
 		if ((getEntities()->isPlayerInCar(kCarGreenSleeping) || getEntities()->isPlayerInCar(kCarRedSleeping))
 		  && params->param4 && !params->param5) {
 
-		  params->param4 -= 1;
+			params->param4 -= 1;
 
-		  if (!params->param4 && getProgress().jacket == kJacketGreen) {
+			if (!params->param4 && getProgress().jacket == kJacketGreen) {
 
-			  getAction()->playAnimation(isNight() ? kEventCathSmokeNight : kEventCathSmokeDay);
-			  params->param5 = 1;
-			  getScenes()->processScene();
-		  }
+				getAction()->playAnimation(isNight() ? kEventCathSmokeNight : kEventCathSmokeDay);
+				params->param5 = 1;
+				getScenes()->processScene();
+			}
 		}
 
 		if (params->param6) {
-			UPDATE_PARAM_GOTO(params1->param7, getState()->time, 900, label_process);
+			if (!Entity::updateParameter(params1->param7, getState()->time, 900))
+				goto label_process;
+
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 58);
 		}
 
@@ -552,7 +552,7 @@ void Train::handleCompartmentAction() {
 
 	ENTITY_PARAM(0, 8) = params->param1;
 
-	CALLBACK_ACTION();
+	callbackAction();
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/engines/lastexpress/entities/train.h b/engines/lastexpress/entities/train.h
index ea9e1d7a07..4b8bc10c1a 100644
--- a/engines/lastexpress/entities/train.h
+++ b/engines/lastexpress/entities/train.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_TRAIN_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp
index 22f41afa92..4695f8831f 100644
--- a/engines/lastexpress/entities/vassili.cpp
+++ b/engines/lastexpress/entities/vassili.cpp
@@ -35,10 +35,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -85,7 +83,7 @@ IMPLEMENT_FUNCTION(4, Vassili, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Vassili, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -146,7 +144,8 @@ IMPLEMENT_FUNCTION(6, Vassili, function6)
 
 	case kActionNone:
 		if (getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
-			UPDATE_PARAM_GOTO(params->param3, getState()->timeTicks, params->param1, label_function7);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, params->param1))
+				goto label_function7;
 
 			setCallback(1);
 			setup_draw("303B");
@@ -402,7 +401,8 @@ IMPLEMENT_FUNCTION(13, Vassili, sleeping)
 
 	case kActionNone:
 		if (getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, params->param1);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, params->param1))
+				break;
 
 			setCallback(1);
 			setup_draw("303B");
@@ -461,7 +461,8 @@ IMPLEMENT_FUNCTION(15, Vassili, stealEgg)
 
 	case kActionNone:
 		if (getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, params->param1);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, params->param1))
+				break;
 
 			setCallback(1);
 			setup_draw("303B");
@@ -545,7 +546,8 @@ IMPLEMENT_FUNCTION(17, Vassili, chapter4Handler)
 
 	case kActionNone:
 		if (getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
-			UPDATE_PARAM(params->param3, getState()->timeTicks, params->param1);
+			if (!Entity::updateParameter(params->param3, getState()->timeTicks, params->param1))
+				break;
 
 			setCallback(1);
 			setup_draw("303B");
diff --git a/engines/lastexpress/entities/vassili.h b/engines/lastexpress/entities/vassili.h
index 843a065174..d006770f7b 100644
--- a/engines/lastexpress/entities/vassili.h
+++ b/engines/lastexpress/entities/vassili.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_VASSILI_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp
index 8246f85145..d9ddb0a4d1 100644
--- a/engines/lastexpress/entities/verges.cpp
+++ b/engines/lastexpress/entities/verges.cpp
@@ -32,10 +32,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -48,40 +46,40 @@ Verges::Verges(LastExpressEngine *engine) : Entity(engine, kEntityVerges) {
 	ADD_CALLBACK_FUNCTION(Verges, callbackActionRestaurantOrSalon);
 	ADD_CALLBACK_FUNCTION(Verges, savegame);
 	ADD_CALLBACK_FUNCTION(Verges, updateEntity);
-	ADD_CALLBACK_FUNCTION(Verges, function9);
-	ADD_CALLBACK_FUNCTION(Verges, function10);
+	ADD_CALLBACK_FUNCTION(Verges, walkBetweenCars);
+	ADD_CALLBACK_FUNCTION(Verges, makeAnnouncement);
 	ADD_CALLBACK_FUNCTION(Verges, function11);
 	ADD_CALLBACK_FUNCTION(Verges, function12);
-	ADD_CALLBACK_FUNCTION(Verges, function13);
+	ADD_CALLBACK_FUNCTION(Verges, baggageCar);
 	ADD_CALLBACK_FUNCTION(Verges, updateFromTime);
-	ADD_CALLBACK_FUNCTION(Verges, function15);
-	ADD_CALLBACK_FUNCTION(Verges, function16);
-	ADD_CALLBACK_FUNCTION(Verges, function17);
+	ADD_CALLBACK_FUNCTION(Verges, dialog);
+	ADD_CALLBACK_FUNCTION(Verges, dialog2);
+	ADD_CALLBACK_FUNCTION(Verges, talkAboutPassengerList);
 	ADD_CALLBACK_FUNCTION(Verges, chapter1);
 	ADD_CALLBACK_FUNCTION(Verges, talkHarem);
 	ADD_CALLBACK_FUNCTION(Verges, talkPassengerList);
 	ADD_CALLBACK_FUNCTION(Verges, talkGendarmes);
-	ADD_CALLBACK_FUNCTION(Verges, function22);
+	ADD_CALLBACK_FUNCTION(Verges, askMertensToRelayAugustInvitation);
 	ADD_CALLBACK_FUNCTION(Verges, function23);
 	ADD_CALLBACK_FUNCTION(Verges, policeGettingOffTrain);
-	ADD_CALLBACK_FUNCTION(Verges, function25);
+	ADD_CALLBACK_FUNCTION(Verges, policeSearch);
 	ADD_CALLBACK_FUNCTION(Verges, chapter1Handler);
 	ADD_CALLBACK_FUNCTION(Verges, chapter2);
 	ADD_CALLBACK_FUNCTION(Verges, chapter2Handler);
 	ADD_CALLBACK_FUNCTION(Verges, chapter3);
 	ADD_CALLBACK_FUNCTION(Verges, function30);
-	ADD_CALLBACK_FUNCTION(Verges, function31);
+	ADD_CALLBACK_FUNCTION(Verges, talkAboutMax);
 	ADD_CALLBACK_FUNCTION(Verges, function32);
 	ADD_CALLBACK_FUNCTION(Verges, function33);
 	ADD_CALLBACK_FUNCTION(Verges, function34);
-	ADD_CALLBACK_FUNCTION(Verges, function35);
+	ADD_CALLBACK_FUNCTION(Verges, organizeConcertInvitations);
 	ADD_CALLBACK_FUNCTION(Verges, chapter4);
 	ADD_CALLBACK_FUNCTION(Verges, chapter4Handler);
-	ADD_CALLBACK_FUNCTION(Verges, function38);
+	ADD_CALLBACK_FUNCTION(Verges, resetState);
 	ADD_CALLBACK_FUNCTION(Verges, chapter5);
 	ADD_CALLBACK_FUNCTION(Verges, chapter5Handler);
-	ADD_CALLBACK_FUNCTION(Verges, function41);
-	ADD_CALLBACK_FUNCTION(Verges, function42);
+	ADD_CALLBACK_FUNCTION(Verges, askPassengersToStayInCompartments);
+	ADD_CALLBACK_FUNCTION(Verges, end);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -102,11 +100,11 @@ IMPLEMENT_FUNCTION(3, Verges, callbackActionOnDirection)
 
 	case kActionNone:
 		if (getData()->direction != kDirectionRight)
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExitCompartment:
-		CALLBACK_ACTION();
+		callbackAction();
  		break;
 
 	case kActionExcuseMeCath:
@@ -151,7 +149,7 @@ IMPLEMENT_FUNCTION_II(8, Verges, updateEntity, CarIndex, EntityPosition)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_S(9, Verges, function9)
+IMPLEMENT_FUNCTION_S(9, Verges, walkBetweenCars)
 switch (savepoint.action) {
 	default:
 		break;
@@ -203,7 +201,7 @@ switch (savepoint.action) {
 
 		case 3:
 			setCallback(4);
-			setup_function10(kCarGreenSleeping, kPosition_540, (char *)&params->seq1);
+			setup_makeAnnouncement(kCarGreenSleeping, kPosition_540, (char *)&params->seq1);
 			break;
 
 		case 4:
@@ -219,7 +217,7 @@ switch (savepoint.action) {
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -227,7 +225,7 @@ switch (savepoint.action) {
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_IIS(10, Verges, function10, CarIndex, EntityPosition)
+IMPLEMENT_FUNCTION_IIS(10, Verges, makeAnnouncement, CarIndex, EntityPosition)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -241,12 +239,13 @@ IMPLEMENT_FUNCTION_IIS(10, Verges, function10, CarIndex, EntityPosition)
 		}
 
 		if (getEntities()->updateEntity(kEntityVerges, (CarIndex)params->param1, (EntityPosition)params->param2)) {
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 
 		if (params->param6) {
-			UPDATE_PARAM(params->param8, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(params->param8, getState()->timeTicks, 75))
+				break;
 
 			getSound()->playSound(kEntityVerges, (char *)&params->seq);
 
@@ -266,7 +265,7 @@ IMPLEMENT_FUNCTION_IIS(10, Verges, function10, CarIndex, EntityPosition)
 		}
 
 		if (getEntities()->updateEntity(kEntityVerges, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -337,7 +336,7 @@ IMPLEMENT_FUNCTION(11, Verges, function11)
 			getObjects()->update(kObject104, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand);
 			getObjects()->update(kObject105, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 			}
 		}
@@ -397,7 +396,7 @@ IMPLEMENT_FUNCTION(12, Verges, function12)
 			getData()->entityPosition = kPosition_850;
 			getEntities()->clearSequences(kEntityVerges);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -405,7 +404,7 @@ IMPLEMENT_FUNCTION(12, Verges, function12)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_I(13, Verges, function13, bool)
+IMPLEMENT_FUNCTION_I(13, Verges, baggageCar, bool)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -438,7 +437,7 @@ IMPLEMENT_FUNCTION_I(13, Verges, function13, bool)
 			getEntities()->clearSequences(kEntityVerges);
 			getScenes()->loadSceneFromPosition(kCarBaggage, 91);
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 	}
@@ -450,7 +449,7 @@ IMPLEMENT_FUNCTION_I(14, Verges, updateFromTime, uint32)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_IS(15, Verges, function15, EntityIndex)
+IMPLEMENT_FUNCTION_IS(15, Verges, dialog, EntityIndex)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -462,7 +461,7 @@ IMPLEMENT_FUNCTION_IS(15, Verges, function15, EntityIndex)
 			if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2) && !getEntities()->isPlayerPosition(kCarRedSleeping, 2))
 				getData()->entityPosition = kPosition_2088;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -487,7 +486,7 @@ IMPLEMENT_FUNCTION_IS(15, Verges, function15, EntityIndex)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex)
+IMPLEMENT_FUNCTION_ISS(16, Verges, dialog2, EntityIndex)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -499,7 +498,7 @@ IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex)
 			if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2) && !getEntities()->isPlayerPosition(kCarRedSleeping, 2))
 				getData()->entityPosition = kPosition_2088;
 
-			CALLBACK_ACTION();
+			callbackAction();
 		}
 		break;
 
@@ -527,7 +526,7 @@ IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(17, Verges, function17)
+IMPLEMENT_FUNCTION(17, Verges, talkAboutPassengerList)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -549,7 +548,7 @@ IMPLEMENT_FUNCTION(17, Verges, function17)
 
 		case 2:
 			setCallback(3);
-			setup_function15(kEntityMertens, "TRA1291");
+			setup_dialog(kEntityMertens, "TRA1291");
 			break;
 
 		case 3:
@@ -559,7 +558,7 @@ IMPLEMENT_FUNCTION(17, Verges, function17)
 
 		case 4:
 			ENTITY_PARAM(0, 3) = 0;
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -573,7 +572,7 @@ IMPLEMENT_FUNCTION(18, Verges, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Verges, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -612,7 +611,7 @@ IMPLEMENT_FUNCTION(21, Verges, talkGendarmes)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Verges, function22)
+IMPLEMENT_FUNCTION(22, Verges, askMertensToRelayAugustInvitation)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -635,10 +634,10 @@ IMPLEMENT_FUNCTION(22, Verges, function22)
 		case 2:
 			if (getEvent(kEventMertensAskTylerCompartment) || getEvent(kEventMertensAskTylerCompartmentD) || getEvent(kEventMertensAugustWaiting)) {
 				setCallback(3);
-				setup_function16(kEntityMertens, "TRA1200", "TRA1201");
+				setup_dialog2(kEntityMertens, "TRA1200", "TRA1201");
 			} else {
 				setCallback(4);
-				setup_function16(kEntityMertens, "TRA1200A", "TRA1201");
+				setup_dialog2(kEntityMertens, "TRA1200A", "TRA1201");
 			}
 			break;
 
@@ -651,7 +650,7 @@ IMPLEMENT_FUNCTION(22, Verges, function22)
 			break;
 
 		case 5:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -697,7 +696,7 @@ IMPLEMENT_FUNCTION(24, Verges, policeGettingOffTrain)
 		break;
 
 	case kActionEndSound:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 
 	case kActionDefault:
@@ -715,7 +714,7 @@ IMPLEMENT_FUNCTION(24, Verges, policeGettingOffTrain)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(25, Verges, function25)
+IMPLEMENT_FUNCTION(25, Verges, policeSearch)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -775,10 +774,10 @@ IMPLEMENT_FUNCTION(25, Verges, function25)
 
 				if (getData()->car == kCarRedSleeping) {
 					setCallback(6);
-					setup_function10(kCarGreenSleeping, kPosition_540, "TRA1005");
+					setup_makeAnnouncement(kCarGreenSleeping, kPosition_540, "TRA1005");
 				} else {
 					setCallback(7);
-					setup_function10(kCarRedSleeping, kPosition_9460, "TRA1006");
+					setup_makeAnnouncement(kCarRedSleeping, kPosition_9460, "TRA1006");
 				}
 				break;
 			}
@@ -806,7 +805,7 @@ IMPLEMENT_FUNCTION(25, Verges, function25)
 			getSavePoints()->push(kEntityVerges, kEntityCoudert, kAction168254872);
 
 			setCallback(4);
-			setup_function10(kCarRedSleeping, kPosition_9460, "TRA1006");
+			setup_makeAnnouncement(kCarRedSleeping, kPosition_9460, "TRA1006");
 			break;
 
 		case 4:
@@ -818,7 +817,7 @@ IMPLEMENT_FUNCTION(25, Verges, function25)
 		case 11:
 			ENTITY_PARAM(0, 7) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 
 		case 6:
@@ -839,7 +838,7 @@ IMPLEMENT_FUNCTION(25, Verges, function25)
 			getSavePoints()->push(kEntityVerges, kEntityCoudert, kAction168254872);
 
 			setCallback(10);
-			setup_function10(kCarGreenSleeping, kPosition_540, "TRA1006");
+			setup_makeAnnouncement(kCarGreenSleeping, kPosition_540, "TRA1006");
 			break;
 
 		case 10:
@@ -893,14 +892,14 @@ IMPLEMENT_FUNCTION(26, Verges, chapter1Handler)
 label_callback1:
 		if (getEntities()->isInBaggageCarEntrance(kEntityPlayer)) {
 			setCallback(2);
-			setup_function13(false);
+			setup_baggageCar(false);
 			break;
 		}
 
 label_callback2:
 		if (ENTITY_PARAM(0, 7)) {
 			setCallback(3);
-			setup_function25();
+			setup_policeSearch();
 			break;
 		}
 
@@ -908,10 +907,12 @@ label_callback3:
 		if (params->param6)
 			goto label_callback12;
 
-		TIME_CHECK_CALLBACK_1(kTimeChapter1, params->param7, 4, setup_function9, "TRA1001");
+		if (Entity::timeCheckCallback(kTimeChapter1, params->param7, 4, "TRA1001", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback4:
-		TIME_CHECK_CALLBACK(kTime1089000, params->param8, 5, setup_function12);
+		if (Entity::timeCheckCallback(kTime1089000, params->param8, 5, WRAP_SETUP_FUNCTION(Verges, setup_function12)))
+			break;
 
 		params->param8 = 1;
 
@@ -922,16 +923,20 @@ label_callback4:
 		}
 
 label_callback8:
-		TIME_CHECK_CALLBACK_1(kTime1107000, CURRENT_PARAM(1, 1), 9, setup_function9, "TRA1001A");
+		if (Entity::timeCheckCallback(kTime1107000, CURRENT_PARAM(1, 1), 9, "TRA1001A", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback9:
-		TIME_CHECK_CALLBACK_1(kTime1134000, CURRENT_PARAM(1, 2), 10, setup_function9, "TRA1002");
+		if (Entity::timeCheckCallback(kTime1134000, CURRENT_PARAM(1, 2), 10, "TRA1002", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback10:
-		TIME_CHECK_CALLBACK_1(kTime1165500, CURRENT_PARAM(1, 3), 11, setup_function9, "TRA1003");
+		if (Entity::timeCheckCallback(kTime1165500, CURRENT_PARAM(1, 3), 11, "TRA1003", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback11:
-		TIME_CHECK_CALLBACK_1(kTime1225800, CURRENT_PARAM(1, 4), 12, setup_function9, "TRA1004");
+		if (Entity::timeCheckCallback(kTime1225800, CURRENT_PARAM(1, 4), 12, "TRA1004", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback12:
 		if (ENTITY_PARAM(0, 5) && !params->param2) {
@@ -950,7 +955,7 @@ label_callback13:
 label_callback14:
 		if (ENTITY_PARAM(0, 3) && !params->param4 && (getState()->time < kTime1134000 || getState()->time > kTime1156500)) {
 			setCallback(15);
-			setup_function17();
+			setup_talkAboutPassengerList();
 			break;
 		}
 
@@ -958,14 +963,14 @@ label_callback15:
 		if (ENTITY_PARAM(0, 1) && !params->param5) {
 			if (getState()->time < kTime1134000 || getState()->time > kTime1156500) {
 				setCallback(16);
-				setup_function22();
+				setup_askMertensToRelayAugustInvitation();
 			}
 		}
 		break;
 
 	case kActionOpenDoor:
 		setCallback(17);
-		setup_function13(savepoint.param.intValue < 106 ? true : false);
+		setup_baggageCar(savepoint.param.intValue < 106 ? true : false);
 		break;
 
 	case kActionDefault:
@@ -1001,7 +1006,7 @@ label_callback15:
 
 		case 6:
 			setCallback(7);
-			setup_function15(kEntityMertens, "TRA1202");
+			setup_dialog(kEntityMertens, "TRA1202");
 			break;
 
 		case 7:
@@ -1079,11 +1084,12 @@ IMPLEMENT_FUNCTION(28, Verges, chapter2Handler)
 	case kActionNone:
 		if (getEntities()->isInBaggageCarEntrance(kEntityPlayer)) {
 			setCallback(1);
-			setup_function13(false);
+			setup_baggageCar(false);
 		}
 
 label_callback_1:
-		TIME_CHECK_CALLBACK_1(kTime1818900, params->param1, 2, setup_function9, "Tra2177");
+		if (Entity::timeCheckCallback(kTime1818900, params->param1, 2, "Tra2177", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback_2:
 		if (params->param2 == kTimeInvalid || !getState()->time)
@@ -1111,7 +1117,7 @@ label_callback_6:
 
 			if (ENTITY_PARAM(0, 3)) {
 				setCallback(7);
-				setup_function17();
+				setup_talkAboutPassengerList();
 			}
 
 			break;
@@ -1124,7 +1130,7 @@ label_callback_6:
 
 	case kActionOpenDoor:
 		setCallback(8);
-		setup_function13(savepoint.param.intValue < 106);
+		setup_baggageCar(savepoint.param.intValue < 106);
 		break;
 
 	case kActionDefault:
@@ -1149,7 +1155,7 @@ label_callback_6:
 
 		case 4:
 			setCallback(5);
-			setup_function15(kEntityCoudert, "TRA2100");
+			setup_dialog(kEntityCoudert, "TRA2100");
 			break;
 
 		case 5:
@@ -1171,7 +1177,7 @@ IMPLEMENT_FUNCTION(29, Verges, chapter3)
 		break;
 
 	case kActionNone:
-		setup_function23();
+		setup_function33();
 		break;
 
 	case kActionDefault:
@@ -1215,7 +1221,7 @@ IMPLEMENT_FUNCTION_S(30, Verges, function30)
 
 		case 2:
 			setCallback(3);
-			setup_function15(kEntityCoudert, (char *)&params->seq1);
+			setup_dialog(kEntityCoudert, (char *)&params->seq1);
 			break;
 
 		case 3:
@@ -1224,7 +1230,7 @@ IMPLEMENT_FUNCTION_S(30, Verges, function30)
 			break;
 
 		case 4:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1232,7 +1238,7 @@ IMPLEMENT_FUNCTION_S(30, Verges, function30)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(31, Verges, function31)
+IMPLEMENT_FUNCTION(31, Verges, talkAboutMax)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1254,7 +1260,7 @@ IMPLEMENT_FUNCTION(31, Verges, function31)
 
 		case 2:
 			setCallback(3);
-			setup_function15(kEntityCoudert, "TRA3015");
+			setup_dialog(kEntityCoudert, "TRA3015");
 			break;
 
 		case 3:
@@ -1266,7 +1272,7 @@ IMPLEMENT_FUNCTION(31, Verges, function31)
 			getProgress().field_48 = 1;
 			ENTITY_PARAM(0, 4) = 0;
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1280,7 +1286,12 @@ IMPLEMENT_FUNCTION(32, Verges, function32)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK_3(kTime2263500, params->param1, 5, setup_function10, kCarRedSleeping, kPosition_9460, "TRA3006");
+		if (getState()->time > kTime2263500 && !params->param1) {
+			params->param1 = 1;
+			setCallback(5);
+			setup_makeAnnouncement(kCarRedSleeping, kPosition_9460, "TRA3006");
+			break;
+		}
 		break;
 
 	case kActionDefault:
@@ -1330,7 +1341,7 @@ IMPLEMENT_FUNCTION(32, Verges, function32)
 
 		case 3:
 			setCallback(4);
-			setup_function10(kCarGreenSleeping, kPosition_540, "TRA3004");
+			setup_makeAnnouncement(kCarGreenSleeping, kPosition_540, "TRA3004");
 			break;
 
 		case 4:
@@ -1343,7 +1354,7 @@ IMPLEMENT_FUNCTION(32, Verges, function32)
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1401,7 +1412,7 @@ IMPLEMENT_FUNCTION(33, Verges, function33)
 			getSavePoints()->push(kEntityVerges, kEntityAbbot, kAction192054567);
 
 			setCallback(6);
-			setup_function9("Tra3010");
+			setup_walkBetweenCars("Tra3010");
 			break;
 
 		case 6:
@@ -1421,49 +1432,55 @@ IMPLEMENT_FUNCTION(34, Verges, function34)
 	case kActionNone:
 		if (getEntities()->isInBaggageCarEntrance(kEntityPlayer)) {
 			setCallback(1);
-			setup_function13(false);
+			setup_baggageCar(false);
 			break;
 		}
 
 label_callback_1:
 		if (ENTITY_PARAM(0, 4)) {
 			setCallback(2);
-			setup_function31();
+			setup_talkAboutMax();
 			break;
 		}
 
 label_callback_2:
 		if (ENTITY_PARAM(0, 3)) {
 			setCallback(3);
-			setup_function17();
+			setup_talkAboutPassengerList();
 			break;
 		}
 
 label_callback_3:
-		TIME_CHECK_CALLBACK_1(kTime1971000, params->param1, 4, setup_function9, "Tra3001");
+		if (Entity::timeCheckCallback(kTime1971000, params->param1, 4, "Tra3001", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback_4:
-		TIME_CHECK_CALLBACK_1(kTime1998000, params->param2, 5, setup_function9, "Tra3010a");
+		if (Entity::timeCheckCallback(kTime1998000, params->param2, 5, "Tra3010a", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback_5:
-		TIME_CHECK_CALLBACK(kTime2016000, params->param3, 6, setup_function35);
+		if (Entity::timeCheckCallback(kTime2016000, params->param3, 6, WRAP_SETUP_FUNCTION(Verges, setup_organizeConcertInvitations)))
+			break;
 
 label_callback_6:
-		TIME_CHECK_CALLBACK_1(kTime2070000, params->param4, 7, setup_function9, "Tra3002");
+		if (Entity::timeCheckCallback(kTime2070000, params->param4, 7, "Tra3002", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback_7:
-		TIME_CHECK_CALLBACK_1(kTime2142000, params->param5, 8, setup_function9, "Tra3003");
+		if (Entity::timeCheckCallback(kTime2142000, params->param5, 8, "Tra3003", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+			break;
 
 label_callback_8:
-		TIME_CHECK_CALLBACK_1(kTime2173500, params->param6, 9, setup_function30, "Tra3012");
+		if (Entity::timeCheckCallback(kTime2173500, params->param6, 9, "Tra3012", WRAP_SETUP_FUNCTION_S(Verges, setup_function30)))
+			break;
 
 label_callback_9:
-		TIME_CHECK_CALLBACK(kTime2218500, params->param7, 10, setup_function32);
+		Entity::timeCheckCallback(kTime2218500, params->param7, 10, WRAP_SETUP_FUNCTION(Verges, setup_function32));
 		break;
 
 	case kActionOpenDoor:
 		setCallback(11);
-		setup_function13(savepoint.param.intValue < 106);
+		setup_baggageCar(savepoint.param.intValue < 106);
 		break;
 
 	case kActionCallback:
@@ -1503,7 +1520,7 @@ label_callback_9:
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(35, Verges, function35)
+IMPLEMENT_FUNCTION(35, Verges, organizeConcertInvitations)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1525,7 +1542,7 @@ IMPLEMENT_FUNCTION(35, Verges, function35)
 
 		case 2:
 			setCallback(3);
-			setup_function15(kEntityMertens, "Tra3011A");
+			setup_dialog(kEntityMertens, "Tra3011A");
 			break;
 
 		case 3:
@@ -1537,7 +1554,7 @@ IMPLEMENT_FUNCTION(35, Verges, function35)
 
 		case 4:
 			setCallback(5);
-			setup_function15(kEntityMertens, "Tra3011");
+			setup_dialog(kEntityMertens, "Tra3011");
 			break;
 
 		case 5:
@@ -1548,7 +1565,7 @@ IMPLEMENT_FUNCTION(35, Verges, function35)
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1592,7 +1609,7 @@ IMPLEMENT_FUNCTION(37, Verges, chapter4Handler)
 	case kActionNone:
 		if (getEntities()->isInBaggageCarEntrance(kEntityPlayer)) {
 			setCallback(1);
-			setup_function13(false);
+			setup_baggageCar(false);
 			break;
 		}
 
@@ -1600,37 +1617,42 @@ label_callback_1:
 		if (ENTITY_PARAM(0, 6)) {
 			if (ENTITY_PARAM(0, 3)) {
 				setCallback(2);
-				setup_function17();
+				setup_talkAboutPassengerList();
 				break;
 			}
 
 label_callback_2:
-			TIME_CHECK_CALLBACK_1(kTime2349000, params->param1, 3, setup_function9, "Tra1001");
+			if (Entity::timeCheckCallback(kTime2349000, params->param1, 3, "Tra1001", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 
 label_callback_3:
-			TIME_CHECK_CALLBACK_1(kTime2378700, params->param2, 4, setup_function9, "Tra4001");
+			if (Entity::timeCheckCallback(kTime2378700, params->param2, 4, "Tra4001", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 
 label_callback_4:
-			TIME_CHECK_CALLBACK_1(kTime2403000, params->param3, 5, setup_function9, "Tra1001A");
+			if (Entity::timeCheckCallback(kTime2403000, params->param3, 5, "Tra1001A", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 
 label_callback_5:
-			TIME_CHECK_CALLBACK_1(kTime2414700, params->param4, 6, setup_function9, "Tra4002");
+			if (Entity::timeCheckCallback(kTime2414700, params->param4, 6, "Tra4002", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 
 label_callback_6:
-			TIME_CHECK_CALLBACK_1(kTime2484000, params->param5, 7, setup_function9, "Tra4003");
+			if (Entity::timeCheckCallback(kTime2484000, params->param5, 7, "Tra4003", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 
 label_callback_7:
-			TIME_CHECK_CALLBACK_1(kTime2511000, params->param6, 8, setup_function9, "Tra4004");
+			if (Entity::timeCheckCallback(kTime2511000, params->param6, 8, "Tra4004", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars)))
+				break;
 		}
 
 label_callback_8:
-		TIME_CHECK_CALLBACK_1(kTime2538000, params->param7, 9, setup_function9, "Tra4005");
-
+		Entity::timeCheckCallback(kTime2538000, params->param7, 9, "Tra4005", WRAP_SETUP_FUNCTION_S(Verges, setup_walkBetweenCars));
 		break;
 
 	case kActionOpenDoor:
 		setCallback(10);
-		setup_function13(savepoint.param.intValue < 106);
+		setup_baggageCar(savepoint.param.intValue < 106);
 		break;
 
 	case kActionDefault:
@@ -1675,7 +1697,7 @@ label_callback_8:
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(38, Verges, function38)
+IMPLEMENT_FUNCTION(38, Verges, resetState)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1781,14 +1803,14 @@ IMPLEMENT_FUNCTION(40, Verges, chapter5Handler)
 			getAction()->playAnimation(kEventCathFreePassengers);
 			getSavePoints()->pushAll(kEntityVerges, kActionProceedChapter5);
 			getScenes()->loadSceneFromPosition(kCarRedSleeping, 40);
-			setup_function41();
+			setup_askPassengersToStayInCompartments();
 		}
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(41, Verges, function41)
+IMPLEMENT_FUNCTION(41, Verges, askPassengersToStayInCompartments)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1800,7 +1822,7 @@ IMPLEMENT_FUNCTION(41, Verges, function41)
 		getData()->location = kLocationInsideCompartment;
 
 		setCallback(1);
-		setup_function10(kCarRedSleeping, kPosition_2000, "Tra5001");
+		setup_makeAnnouncement(kCarRedSleeping, kPosition_2000, "Tra5001");
 		break;
 
 	case kActionCallback:
@@ -1830,7 +1852,7 @@ IMPLEMENT_FUNCTION(41, Verges, function41)
 			break;
 
 		case 4:
-			setup_function42();
+			setup_end();
 			break;
 		}
 		break;
@@ -1838,7 +1860,7 @@ IMPLEMENT_FUNCTION(41, Verges, function41)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(42, Verges, function42)
+IMPLEMENT_FUNCTION(42, Verges, end)
 	if (savepoint.action == kActionDefault)
 		getEntities()->clearSequences(kEntityVerges);
 IMPLEMENT_FUNCTION_END
@@ -1869,7 +1891,7 @@ void Verges::talk(const SavePoint &savepoint, const char *sound1, const char *so
 
 		case 2:
 			setCallback(3);
-			setup_function15(kEntityCoudert, sound1);
+			setup_dialog(kEntityCoudert, sound1);
 			break;
 
 		case 3:
@@ -1879,7 +1901,7 @@ void Verges::talk(const SavePoint &savepoint, const char *sound1, const char *so
 
 		case 4:
 			setCallback(5);
-			setup_function15(kEntityMertens, sound2);
+			setup_dialog(kEntityMertens, sound2);
 			break;
 
 		case 5:
@@ -1887,7 +1909,7 @@ void Verges::talk(const SavePoint &savepoint, const char *sound1, const char *so
 			break;
 
 		case 6:
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
diff --git a/engines/lastexpress/entities/verges.h b/engines/lastexpress/entities/verges.h
index 17a3c8ac40..93cc190d1e 100644
--- a/engines/lastexpress/entities/verges.h
+++ b/engines/lastexpress/entities/verges.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_VERGES_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
@@ -88,11 +87,11 @@ public:
 	 */
 	DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition)
 
-	DECLARE_FUNCTION_1(function9, const char *soundName)
-	DECLARE_FUNCTION_3(function10, CarIndex car, EntityPosition entityPosition, const char *soundName)
+	DECLARE_FUNCTION_1(walkBetweenCars, const char *soundName)
+	DECLARE_FUNCTION_3(makeAnnouncement, CarIndex car, EntityPosition entityPosition, const char *soundName)
 	DECLARE_FUNCTION(function11)
 	DECLARE_FUNCTION(function12)
-	DECLARE_FUNCTION_1(function13, bool)
+	DECLARE_FUNCTION_1(baggageCar, bool)
 
 	/**
 	 * Updates parameter 2 using time value
@@ -101,9 +100,9 @@ public:
 	 */
 	DECLARE_FUNCTION_1(updateFromTime, uint32 time)
 
-	DECLARE_FUNCTION_2(function15, EntityIndex entity, const char *soundName)
-	DECLARE_FUNCTION_3(function16, EntityIndex entityIndex, const char *soundName1, const char *soundName2)
-	DECLARE_FUNCTION(function17)
+	DECLARE_FUNCTION_2(dialog, EntityIndex entity, const char *soundName)
+	DECLARE_FUNCTION_3(dialog2, EntityIndex entityIndex, const char *soundName1, const char *soundName2)
+	DECLARE_FUNCTION(talkAboutPassengerList)
 
 	/**
 	 * Setup Chapter 1
@@ -113,10 +112,10 @@ public:
 	DECLARE_FUNCTION_NOSETUP(talkHarem)
 	DECLARE_FUNCTION(talkPassengerList)
 	DECLARE_FUNCTION(talkGendarmes)
-	DECLARE_FUNCTION(function22)
+	DECLARE_FUNCTION(askMertensToRelayAugustInvitation)
 	DECLARE_FUNCTION(function23)
 	DECLARE_FUNCTION(policeGettingOffTrain)
-	DECLARE_FUNCTION(function25)
+	DECLARE_FUNCTION(policeSearch)
 
 	/**
 	 * Handle Chapter 1 events
@@ -139,11 +138,11 @@ public:
 	DECLARE_FUNCTION(chapter3)
 
 	DECLARE_FUNCTION_1(function30, const char *soundName)
-	DECLARE_FUNCTION(function31)
+	DECLARE_FUNCTION(talkAboutMax)
 	DECLARE_FUNCTION(function32)
 	DECLARE_FUNCTION(function33)
 	DECLARE_FUNCTION(function34)
-	DECLARE_FUNCTION(function35)
+	DECLARE_FUNCTION(organizeConcertInvitations)
 
 	/**
 	 * Setup Chapter 4
@@ -155,7 +154,7 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter4Handler)
 
-	DECLARE_FUNCTION(function38)
+	DECLARE_FUNCTION(resetState)
 
 	/**
 	 * Setup Chapter 5
@@ -167,8 +166,8 @@ public:
 	 */
 	DECLARE_FUNCTION(chapter5Handler)
 
-	DECLARE_FUNCTION(function41)
-	DECLARE_FUNCTION(function42)
+	DECLARE_FUNCTION(askPassengersToStayInCompartments)
+	DECLARE_FUNCTION(end)
 
 private:
 	void talk(const SavePoint &savepoint, const char *sound1, const char *sound2);
diff --git a/engines/lastexpress/entities/vesna.cpp b/engines/lastexpress/entities/vesna.cpp
index 7a1f1d3195..f29bce8b2b 100644
--- a/engines/lastexpress/entities/vesna.cpp
+++ b/engines/lastexpress/entities/vesna.cpp
@@ -32,10 +32,7 @@
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
-
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -134,7 +131,7 @@ IMPLEMENT_FUNCTION_II(7, Vesna, updateEntity2, CarIndex, EntityPosition)
 		break;
 
 	case kAction123668192:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -165,7 +162,8 @@ IMPLEMENT_FUNCTION(11, Vesna, function11)
 
 	case kActionNone:
 		if (parameters->param3) {
-			UPDATE_PARAM(parameters->param7, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(parameters->param7, getState()->timeTicks, 75))
+				break;
 
 			parameters->param2 = 1;
 			parameters->param3 = 0;
@@ -245,7 +243,7 @@ IMPLEMENT_FUNCTION(11, Vesna, function11)
 
 	case kAction55996766:
 	case kAction101687594:
-		CALLBACK_ACTION();
+		callbackAction();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
@@ -257,7 +255,7 @@ IMPLEMENT_FUNCTION(12, Vesna, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Vesna, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -458,7 +456,7 @@ IMPLEMENT_FUNCTION(18, Vesna, function18)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityVesna);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -514,7 +512,8 @@ IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
 		}
 
 		if (parameters->param2) {
-			UPDATE_PARAM(parameters->param8, getState()->timeTicks, 75);
+			if (!Entity::updateParameter(parameters->param8, getState()->timeTicks, 75))
+				break;
 
 			parameters->param1 = 1;
 			parameters->param2 = 0;
@@ -711,7 +710,7 @@ IMPLEMENT_FUNCTION(21, Vesna, function21)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityVesna);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -1083,13 +1082,14 @@ IMPLEMENT_FUNCTION(30, Vesna, function30)
 
 	case kActionNone:
 		if (!params->param1) {
-			UPDATE_PARAM_PROC(params->param3, getState()->timeTicks, 120)
+			if (Entity::updateParameter(params->param3, getState()->timeTicks, 120)) {
 				getSound()->playSound(kEntityVesna, "Ves50001", kFlagDefault);
 				params->param1 = 1;
-			UPDATE_PARAM_PROC_END
+			}
 		}
 
-		UPDATE_PARAM(params->param4, getState()->timeTicks, 180);
+		if (!Entity::updateParameter(params->param4, getState()->timeTicks, 180))
+			break;
 
 		setCallback(1);
 		setup_savegame(kSavegameTypeEvent, kEventCathVesnaTrainTopKilled);
diff --git a/engines/lastexpress/entities/vesna.h b/engines/lastexpress/entities/vesna.h
index a09664096d..025d45882e 100644
--- a/engines/lastexpress/entities/vesna.h
+++ b/engines/lastexpress/entities/vesna.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_VESNA_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp
index 45e5e11568..1d280f51e0 100644
--- a/engines/lastexpress/entities/yasmin.cpp
+++ b/engines/lastexpress/entities/yasmin.cpp
@@ -28,10 +28,8 @@
 #include "lastexpress/game/savepoint.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 namespace LastExpress {
 
@@ -132,7 +130,7 @@ IMPLEMENT_FUNCTION(6, Yasmin, function6)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityYasmin);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -172,7 +170,7 @@ IMPLEMENT_FUNCTION(7, Yasmin, function7)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityYasmin);
 
-			CALLBACK_ACTION();
+			callbackAction();
 			break;
 		}
 		break;
@@ -186,7 +184,7 @@ IMPLEMENT_FUNCTION(8, Yasmin, chapter1)
 		break;
 
 	case kActionNone:
-		TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Yasmin, setup_chapter1Handler));
 		break;
 
 	case kActionDefault:
@@ -204,12 +202,22 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime1093500, params->param1, 1, setup_function6);
-		TIME_CHECK_CALLBACK(kTime1161000, params->param2, 3, setup_function7);
-		TIME_CHECK_PLAYSOUND_UPDATEPOSITION(kTime1162800, params->param3, 4, "Har1102", kPosition_4070);
-		TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104");
-		TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106");
-		TIME_CHECK_CALLBACK(kTime1183500, params->param6, 7, setup_function6);
+		if (Entity::timeCheckCallback(kTime1093500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)))
+			break;
+
+		if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+			break;
+
+		if (Entity::timeCheckPlaySoundUpdatePosition(kTime1162800, params->param3, 4, "Har1102", kPosition_4070))
+			break;
+
+		if (Entity::timeCheckCallback(kTime1165500, params->param4, 5, "Har1104", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
+			break;
+
+		if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
+			break;
+
+		Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 		break;
 
 	case kActionCallback:
@@ -224,23 +232,27 @@ IMPLEMENT_FUNCTION(9, Yasmin, chapter1Handler)
 			break;
 
 		case 2:
-			TIME_CHECK_CALLBACK(kTime1161000, params->param2, 3, setup_function7);
+			if (Entity::timeCheckCallback(kTime1161000, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+				break;
 			// Fallback to case 3
 
 		case 3:
-			TIME_CHECK_PLAYSOUND_UPDATEPOSITION(kTime1162800, params->param3, 4, "Har1102", kPosition_4070);
+			if (Entity::timeCheckPlaySoundUpdatePosition(kTime1162800, params->param3, 4, "Har1102", kPosition_4070))
+				break;
 			// Fallback to case 4
 
 		case 4:
-			TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104");
+			if (Entity::timeCheckCallback(kTime1165500, params->param4, 5, "Har1104", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
+				break;
 			// Fallback to case 5
 
 		case 5:
-			TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106");
+			if (Entity::timeCheckCallback(kTime1174500, params->param5, 6, "Har1106", WRAP_SETUP_FUNCTION_S(Yasmin, setup_playSound)))
+				break;
 			// Fallback to case 6
 
 		case 6:
-			TIME_CHECK_CALLBACK(kTime1183500, params->param6, 7, setup_function6);
+			Entity::timeCheckCallback(kTime1183500, params->param6, 7, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 			break;
 		}
 		break;
@@ -281,7 +293,8 @@ IMPLEMENT_FUNCTION(12, Yasmin, chapter2Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime1759500, params->param1, 1, setup_function7);
+		if (Entity::timeCheckCallback(kTime1759500, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+			break;
 
 		if (getState()->time > kTime1800000 && !params->param2) {
 			params->param2 = 1;
@@ -334,9 +347,13 @@ IMPLEMENT_FUNCTION(14, Yasmin, chapter3Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime2062800, params->param1, 1, setup_function6);
-		TIME_CHECK_CALLBACK(kTime2106000, params->param2, 2, setup_function7);
-		TIME_CHECK_CALLBACK(kTime2160000, params->param3, 3, setup_function6);
+		if (Entity::timeCheckCallback(kTime2062800, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function6)))
+			break;
+
+		if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+			break;
+
+		Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 		break;
 
 	case kActionCallback:
@@ -345,11 +362,12 @@ IMPLEMENT_FUNCTION(14, Yasmin, chapter3Handler)
 			break;
 
 		case 1:
-			TIME_CHECK_CALLBACK(kTime2106000, params->param2, 2, setup_function7);
+			if (Entity::timeCheckCallback(kTime2106000, params->param2, 2, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+				break;
 			// Fallback to case 2
 
 		case 2:
-			TIME_CHECK_CALLBACK(kTime2160000, params->param3, 3, setup_function6);
+			Entity::timeCheckCallback(kTime2160000, params->param3, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 			break;
 		}
 		break;
@@ -381,8 +399,10 @@ IMPLEMENT_FUNCTION(16, Yasmin, chapter4Handler)
 		break;
 
 	case kActionNone:
-		TIME_CHECK_CALLBACK(kTime2457000, params->param1, 1, setup_function7);
-		TIME_CHECK_CALLBACK(kTime2479500, params->param2, 3, setup_function6);
+		if (Entity::timeCheckCallback(kTime2457000, params->param1, 1, WRAP_SETUP_FUNCTION(Yasmin, setup_function7)))
+			break;
+
+		Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 		break;
 
 	case kActionCallback:
@@ -397,7 +417,7 @@ IMPLEMENT_FUNCTION(16, Yasmin, chapter4Handler)
 			break;
 
 		case 2:
-			TIME_CHECK_CALLBACK(kTime2479500, params->param2, 3, setup_function6);
+			Entity::timeCheckCallback(kTime2479500, params->param2, 3, WRAP_SETUP_FUNCTION(Yasmin, setup_function6));
 			break;
 		}
 		break;
@@ -445,7 +465,9 @@ IMPLEMENT_FUNCTION(20, Yasmin, function20)
 		break;
 
 	case kActionNone:
-		UPDATE_PARAM(params->param1, getState()->time, 2700);
+		if (!Entity::updateParameter(params->param1, getState()->time, 2700))
+			break;
+
 		setup_function21();
 		break;
 
@@ -472,7 +494,7 @@ IMPLEMENT_FUNCTION(21, Yasmin, function21)
 	case kActionNone:
 	case kActionDefault:
 		if (getEntities()->updateEntity(kEntityYasmin, (CarIndex)params->param1, (EntityPosition)params->param2))
-			CALLBACK_ACTION();
+			callbackAction();
 		break;
 
 	case kActionExcuseMeCath:
diff --git a/engines/lastexpress/entities/yasmin.h b/engines/lastexpress/entities/yasmin.h
index e943a8b158..b1413f5c2f 100644
--- a/engines/lastexpress/entities/yasmin.h
+++ b/engines/lastexpress/entities/yasmin.h
@@ -24,7 +24,6 @@
 #define LASTEXPRESS_YASMIN_H
 
 #include "lastexpress/entities/entity.h"
-#include "lastexpress/entities/entity_intern.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index b832d46a60..49a9b85657 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -31,6 +31,7 @@
 #include "lastexpress/data/cursor.h"
 #include "lastexpress/data/sequence.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
@@ -40,7 +41,6 @@
 #include "lastexpress/sound/queue.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -53,6 +53,8 @@ Fight::FightData::FightData() {
 	index = 0;
 
 	isFightRunning = false;
+
+	memset(&sequences, 0, sizeof(sequences));
 }
 
 Fight::FightData::~FightData() {
@@ -399,6 +401,9 @@ end_load:
 }
 
 void Fight::setOpponents() {
+	if (!_data)
+		error("[Fight::setOpponents] Data not initialized");
+
 	_data->player->setOpponent(_data->opponent);
 	_data->opponent->setOpponent(_data->player);
 
diff --git a/engines/lastexpress/fight/fighter.cpp b/engines/lastexpress/fight/fighter.cpp
index bae7728a2b..4b1cddabd4 100644
--- a/engines/lastexpress/fight/fighter.cpp
+++ b/engines/lastexpress/fight/fighter.cpp
@@ -53,20 +53,20 @@ Fighter::Fighter(LastExpressEngine *engine) : _engine(engine) {
 }
 
 Fighter::~Fighter() {
-	clearSequences();
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Cleanup
-//////////////////////////////////////////////////////////////////////////
-void Fighter::clearSequences() {
 	// The original game resets the function pointers to default values, just before deleting the struct
 
 	getScenes()->removeAndRedraw(&_frame, false);
 
 	// Free sequences
-	for (int i = 0; i < (int)_sequences.size(); i++)
+	for (uint i = 0; i < _sequences.size(); i++)
 		SAFE_DELETE(_sequences[i]);
+
+	// Zero-out passed pointers
+	_sequence = NULL;
+	_opponent = NULL;
+	_fight = NULL;
+
+	_engine = NULL;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -113,6 +113,9 @@ void Fighter::draw() {
 // Processing
 //////////////////////////////////////////////////////////////////////////
 void Fighter::process() {
+	if (!_fight)
+		error("[Fighter::handleAction] Fighter not initialized properly");
+
 	if (!_sequence) {
 		if (_frame) {
 			getScenes()->removeFromQueue(_frame);
@@ -188,6 +191,9 @@ void Fighter::process() {
 // Default actions
 //////////////////////////////////////////////////////////////////////////
 void Fighter::handleAction(FightAction action) {
+	if (!_opponent || !_fight)
+		error("[Fighter::handleAction] Fighter not initialized properly");
+
 	switch (action) {
 	default:
 		return;
@@ -243,7 +249,10 @@ void Opponent::update() {
 // Helpers
 //////////////////////////////////////////////////////////////////////////
 bool Fighter::checkFrame(uint32 val) {
-	return (_frame->getInfo()->field_33 & val);
+	if (!_frame)
+		error("[Fighter::checkFrame] Invalid current frame");
+
+	return (bool)(_frame->getInfo()->field_33 & val);
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/fight/fighter.h b/engines/lastexpress/fight/fighter.h
index e37fe49d86..dad95af186 100644
--- a/engines/lastexpress/fight/fighter.h
+++ b/engines/lastexpress/fight/fighter.h
@@ -99,9 +99,6 @@ protected:
 	void draw();
 	void process();
 
-	// Cleanup
-	void clearSequences();
-
 	// Helpers
 	bool checkFrame(uint32 val);
 };
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index 98d74dd1a7..796abf2ce7 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -29,7 +29,6 @@
 
 #include "lastexpress/entities/abbot.h"
 #include "lastexpress/entities/anna.h"
-#include "lastexpress/entities/entity.h"
 
 #include "lastexpress/game/beetle.h"
 #include "lastexpress/game/entities.h"
@@ -42,9 +41,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -332,6 +329,22 @@ static const struct {
 	{"8042A",   600}
 };
 
+template<class Arg, class Res, class T>
+class Functor1MemConst : public Common::Functor1<Arg, Res> {
+public:
+	typedef Res (T::*FuncType)(Arg) const;
+
+	Functor1MemConst(T *t, const FuncType &func) : _t(t), _func(func) {}
+
+	bool isValid() const { return _func != 0 && _t != 0; }
+	Res operator()(Arg v1) const {
+		return (_t->*_func)(v1);
+	}
+private:
+	mutable T *_t;
+	const FuncType _func;
+};
+
 Action::Action(LastExpressEngine *engine) : _engine(engine) {
 	ADD_ACTION(dummy);
 	ADD_ACTION(inventory);
@@ -381,7 +394,7 @@ Action::Action(LastExpressEngine *engine) : _engine(engine) {
 }
 
 Action::~Action() {
-	for (int i = 0; i < (int)_actions.size(); i++)
+	for (uint i = 0; i < _actions.size(); i++)
 		SAFE_DELETE(_actions[i]);
 
 	_actions.clear();
@@ -407,9 +420,7 @@ SceneIndex Action::processHotspot(const SceneHotspot &hotspot) {
 //////////////////////////////////////////////////////////////////////////
 // Action 0
 IMPLEMENT_ACTION(dummy)
-	warning("[Action::action_dummy] Dummy action function called (hotspot action: %d)", hotspot.action);
-
-	return kSceneInvalid;
+	error("[Action::action_dummy] Dummy action function called (hotspot action: %d)", hotspot.action);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1742,14 +1753,14 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const {
 			return kCursorBackward;
 
 	case SceneHotspot::kActionKnockOnDoor:
-		warning("================================= DOOR %03d =================================", object);
+		debugC(2, kLastExpressDebugScenes, "================================= DOOR %03d =================================", object);
 		if (object >= kObjectMax)
 			return kCursorNormal;
 		else
 			return (CursorStyle)getObjects()->get(object).cursor;
 
 	case SceneHotspot::kAction12:
-		warning("================================= OBJECT %03d =================================", object);
+		debugC(2, kLastExpressDebugScenes, "================================= OBJECT %03d =================================", object);
 		if (object >= kObjectMax)
 			return kCursorNormal;
 
@@ -1759,7 +1770,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const {
 			return kCursorNormal;
 
 	case SceneHotspot::kActionPickItem:
-		warning("================================= ITEM %03d =================================", object);
+		debugC(2, kLastExpressDebugScenes, "================================= ITEM %03d =================================", object);
 		if (object >= kObjectCompartmentA)
 			return kCursorNormal;
 
@@ -1770,7 +1781,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const {
 			return kCursorNormal;
 
 	case SceneHotspot::kActionDropItem:
-		warning("================================= ITEM %03d =================================", object);
+		debugC(2, kLastExpressDebugScenes, "================================= ITEM %03d =================================", object);
 		if (object >= kObjectCompartmentA)
 			return kCursorNormal;
 
@@ -1887,7 +1898,7 @@ LABEL_KEY:
 	// Handle compartment action
 	case SceneHotspot::kActionCompartment:
 	case SceneHotspot::kActionExitCompartment:
-		warning("================================= DOOR %03d =================================", object);
+		debugC(2, kLastExpressDebugScenes, "================================= DOOR %03d =================================", object);
 		if (object >= kObjectMax)
 			return kCursorNormal;
 
diff --git a/engines/lastexpress/game/beetle.cpp b/engines/lastexpress/game/beetle.cpp
index ab707ddae9..d7a369ba40 100644
--- a/engines/lastexpress/game/beetle.cpp
+++ b/engines/lastexpress/game/beetle.cpp
@@ -27,7 +27,6 @@
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -95,7 +94,7 @@ void Beetle::load() {
 
 	// Check that all sequences are loaded properly
 	_data->isLoaded = true;
-	for (int i = 0; i < (int)_data->sequences.size(); i++) {
+	for (uint i = 0; i < _data->sequences.size(); i++) {
 		if (!_data->sequences[i]->isLoaded()) {
 			_data->isLoaded = false;
 			break;
@@ -337,26 +336,13 @@ void Beetle::drawUpdate() {
 		}
 	}
 
-#define INVERT_Y() \
-	switch (_data->indexes[_data->offset]) { \
-	default: \
-		break; \
-	case 24: \
-	case 25: \
-	case 26: \
-	case 27: \
-	case 28: \
-		_data->coordY = -_data->coordY; \
-		break; \
-	}
-
 	// Invert direction
-	INVERT_Y();
+	invertDirection();
 
 	SequenceFrame *frame = new SequenceFrame(_data->currentSequence, (uint16)_data->currentFrame);
 	updateFrame(frame);
 
-	INVERT_Y();
+	invertDirection();
 
 	getScenes()->addToQueue(frame);
 
@@ -364,6 +350,24 @@ void Beetle::drawUpdate() {
 	_data->frame = frame;
 }
 
+void Beetle::invertDirection() {
+	if (!_data)
+		error("[Beetle::invertDirection] Sequences have not been loaded");
+
+	switch (_data->indexes[_data->offset]) {
+	default:
+		break;
+
+	case 24:
+	case 25:
+	case 26:
+	case 27:
+	case 28:
+		_data->coordY = -_data->coordY;
+		break;
+	}
+}
+
 void Beetle::move() {
 	if (!_data)
 		error("[Beetle::move] Sequences have not been loaded");
diff --git a/engines/lastexpress/game/beetle.h b/engines/lastexpress/game/beetle.h
index d3c47f39e5..034ebbd557 100644
--- a/engines/lastexpress/game/beetle.h
+++ b/engines/lastexpress/game/beetle.h
@@ -111,6 +111,7 @@ private:
 	void updateFrame(SequenceFrame *frame) const;
 	void updateData(uint32 index);
 	void drawUpdate();
+	void invertDirection();
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index f27087a609..fafbd7cb64 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -27,8 +27,6 @@
 #include "lastexpress/data/sequence.h"
 
 // Entities
-#include "lastexpress/entities/entity.h"
-
 #include "lastexpress/entities/abbot.h"
 #include "lastexpress/entities/alexei.h"
 #include "lastexpress/entities/alouan.h"
@@ -71,10 +69,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -185,7 +181,7 @@ Entities::Entities(LastExpressEngine *engine) : _engine(engine) {
 Entities::~Entities() {
 	SAFE_DELETE(_header);
 
-	for (int i = 0; i < (int)_entities.size(); i++)
+	for (uint i = 0; i < _entities.size(); i++)
 		SAFE_DELETE(_entities[i]);
 
 	_entities.clear();
@@ -673,11 +669,12 @@ void Entities::executeCallbacks() {
 //////////////////////////////////////////////////////////////////////////
 // Processing
 //////////////////////////////////////////////////////////////////////////
-#define INCREMENT_DIRECTION_COUNTER() { \
-	data->doProcessEntity = false; \
-	if (data->direction == kDirectionRight || (data->direction == kDirectionSwitch && data->directionSwitch == kDirectionRight)) \
-		++data->field_4A1; \
-	}
+void Entities::incrementDirectionCounter(EntityData::EntityCallData *data) const {
+	data->doProcessEntity = false;
+
+	if (data->direction == kDirectionRight || (data->direction == kDirectionSwitch && data->directionSwitch == kDirectionRight))
+		++data->field_4A1;
+}
 
 void Entities::processEntity(EntityIndex entityIndex) {
 	EntityData::EntityCallData *data = getData(entityIndex);
@@ -696,7 +693,7 @@ void Entities::processEntity(EntityIndex entityIndex) {
 		getScenes()->removeAndRedraw(&data->frame, false);
 		getScenes()->removeAndRedraw(&data->frame1, false);
 
-		INCREMENT_DIRECTION_COUNTER();
+		incrementDirectionCounter(data);
 		return;
 	}
 
@@ -726,7 +723,7 @@ label_nosequence:
 			processFrame(entityIndex, false, true);
 
 			if (!getFlags()->flag_entities_0 && !data->doProcessEntity) {
-				INCREMENT_DIRECTION_COUNTER();
+				incrementDirectionCounter(data);
 				return;
 			}
 		} else {
@@ -744,7 +741,7 @@ label_nosequence:
 				data->position = 0;
 			}
 
-			INCREMENT_DIRECTION_COUNTER();
+			incrementDirectionCounter(data);
 		}
 		return;
 	}
@@ -754,46 +751,44 @@ label_nosequence:
 
 	if (data->frame->getInfo()->field_30 > (data->field_49B + 1) || (data->direction == kDirectionLeft && data->sequence->count() == 1)) {
 		++data->field_49B;
-	} else {
-		if (data->frame->getInfo()->field_30 > data->field_49B && !data->frame->getInfo()->keepPreviousFrame) {
-			++data->field_49B;
-		} else {
-			if (data->frame->getInfo()->keepPreviousFrame == 1)
-				keepPreviousFrame = true;
-
-			// Increment current frame
-			++data->currentFrame;
+	} else if (data->frame->getInfo()->field_30 <= data->field_49B || data->frame->getInfo()->keepPreviousFrame) {
+		if (data->frame->getInfo()->keepPreviousFrame == 1)
+			keepPreviousFrame = true;
 
-			if (data->currentFrame > (int16)(data->sequence->count() - 1) || (data->field_4A9 && checkSequenceFromPosition(entityIndex))) {
+		// Increment current frame
+		++data->currentFrame;
 
-				if (data->direction == kDirectionLeft) {
-					data->currentFrame = 0;
-				} else {
-					keepPreviousFrame = true;
-					drawNextSequence(entityIndex);
+		if (data->currentFrame > (int16)(data->sequence->count() - 1) || (data->field_4A9 && checkSequenceFromPosition(entityIndex))) {
 
-					if (getFlags()->flag_entities_0 || data->doProcessEntity)
-						return;
+			if (data->direction == kDirectionLeft) {
+				data->currentFrame = 0;
+			} else {
+				keepPreviousFrame = true;
+				drawNextSequence(entityIndex);
 
-					if (!data->sequence2) {
-						updateEntityPosition(entityIndex);
-						data->doProcessEntity = false;
-						return;
-					}
+				if (getFlags()->flag_entities_0 || data->doProcessEntity)
+					return;
 
-					copySequenceData(entityIndex);
+				if (!data->sequence2) {
+					updateEntityPosition(entityIndex);
+					data->doProcessEntity = false;
+					return;
 				}
 
+				copySequenceData(entityIndex);
 			}
 
-			processFrame(entityIndex, keepPreviousFrame, false);
-
-			if (getFlags()->flag_entities_0 || data->doProcessEntity)
-				return;
 		}
+
+		processFrame(entityIndex, keepPreviousFrame, false);
+
+		if (getFlags()->flag_entities_0 || data->doProcessEntity)
+			return;
+	} else {
+		++data->field_49B;
 	}
 
-	INCREMENT_DIRECTION_COUNTER();
+	incrementDirectionCounter(data);
 }
 
 void Entities::computeCurrentFrame(EntityIndex entityIndex) const {
@@ -2283,7 +2278,7 @@ label_process_entity:
 
 							if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingUp)) {
 								 getSavePoints()->push(kEntityPlayer, entity, kActionExcuseMeCath);
-							} else if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingDown) || getScenes()->checkCurrentPosition(false)){
+							} else if (getScenes()->checkPosition(kSceneNone, SceneManager::kCheckPositionLookingDown) || getScenes()->checkCurrentPosition(false)) {
 								 getSavePoints()->push(kEntityPlayer, entity, kActionExcuseMe);
 
 								 if (getScenes()->checkCurrentPosition(false))
diff --git a/engines/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h
index eb5eae461f..81aed627aa 100644
--- a/engines/lastexpress/game/entities.h
+++ b/engines/lastexpress/game/entities.h
@@ -344,6 +344,7 @@ private:
 	uint _positions[_positionsCount];
 
 	void executeCallbacks();
+	void incrementDirectionCounter(EntityData::EntityCallData *data) const;
 	void processEntity(EntityIndex entity);
 
 	void drawSequence(EntityIndex entity, const char *sequence, EntityDirection direction) const;
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index e417b1ec0d..11e7369ee1 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -26,17 +26,17 @@
 #include "lastexpress/data/scene.h"
 #include "lastexpress/data/snd.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
+#include "lastexpress/game/savegame.h"
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/menu/menu.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -44,7 +44,7 @@
 namespace LastExpress {
 
 Inventory::Inventory(LastExpressEngine *engine) : _engine(engine), _selectedItem(kItemNone), _highlightedItemIndex(0), _itemsShown(0),
-	_showingHourGlass(false), _blinkingEgg(false), _blinkingTime(0), _blinkingInterval(_defaultBlinkingInterval), _blinkingBrightness(1),
+	_showingHourGlass(false), _blinkingDirection(1), _blinkingBrightness(0),
 	_useMagnifier(false), _portraitHighlighted(false), _isOpened(false), _eggHightlighted(false), _itemScene(NULL) {
 
 	//_inventoryRect = Common::Rect(0, 0, 32, 32);
@@ -162,13 +162,11 @@ void Inventory::handleMouseEvent(const Common::Event &ev) {
 
 			getMenu()->show(true, kSavegameTypeIndex, 0);
 
-		} else if (ev.type == Common::EVENT_RBUTTONDOWN) {
-			if (getGlobalTimer()) {
-				if (getSoundQueue()->isBuffered("TIMER"))
-					getSoundQueue()->removeFromQueue("TIMER");
+		} else if (ev.type == Common::EVENT_RBUTTONDOWN && getGlobalTimer()) {
+			if (getSoundQueue()->isBuffered("TIMER"))
+				getSoundQueue()->removeFromQueue("TIMER");
 
-				setGlobalTimer(900);
-			}
+			setGlobalTimer(900);
 		}
 	}
 
@@ -180,7 +178,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) {
 				if (_highlightedItemIndex)
 					drawHighlight(_highlightedItemIndex, true);
 			} else {
-				// The user released the mouse button, we need to update the inventory state (clear hightlight and items)
+				// The user released the mouse button, we need to update the inventory state (clear highlight and items)
 				drawItem((CursorStyle)getProgress().portrait, 0, 0, 1);
 				_engine->getGraphicsManager()->clear(GraphicsManager::kBackgroundInventory, Common::Rect(0, 44, 32, (int16)(40 * _itemsShown + 40)));
 				_isOpened = false;
@@ -226,12 +224,11 @@ void Inventory::handleMouseEvent(const Common::Event &ev) {
 
 				if (getFlags()->mouseLeftPressed) {
 					if (getState()->sceneUseBackup) {
-						if (getState()->sceneBackup2
-						 && getFirstExaminableItem() == _selectedItem) {
-							 SceneIndex sceneIndex = getState()->sceneBackup2;
-							 getState()->sceneBackup2 = kSceneNone;
+						if (getState()->sceneBackup2 && getFirstExaminableItem() == _selectedItem) {
+							SceneIndex sceneIndex = getState()->sceneBackup2;
+							getState()->sceneBackup2 = kSceneNone;
 
-							 getScenes()->loadScene(sceneIndex);
+							getScenes()->loadScene(sceneIndex);
 						}
 					} else {
 						getState()->sceneBackup = getState()->scene;
@@ -261,7 +258,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) {
 
 		// Change item highlight on list
 		if (getFlags()->mouseLeftPressed) {
-			uint32 index = ev.mouse.y / 40;
+			uint32 index = (uint16)ev.mouse.y / 40;
 
 			if (_highlightedItemIndex && _highlightedItemIndex != index)
 				drawHighlight(_highlightedItemIndex, true);
@@ -418,12 +415,12 @@ void Inventory::show() {
 	drawEgg();
 }
 
-void Inventory::setPortrait(InventoryItem item) {
+void Inventory::setPortrait(InventoryItem item) const {
 	getProgress().portrait = item;
 	drawItem((CursorStyle)getProgress().portrait, 0, 0);
 }
 
-void Inventory::showHourGlass(){
+void Inventory::showHourGlass() const {
 	if (!getMenu()->isShown())
 		drawItem(kCursorHourGlass, 608, 448);
 
@@ -613,7 +610,7 @@ void Inventory::examine(InventoryItem item) {
 	}
 }
 
-void Inventory::drawEgg() {
+void Inventory::drawEgg() const {
 	if (!getMenu()->isShown())
 		drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, _eggHightlighted ? 0 : 1);
 
@@ -621,40 +618,51 @@ void Inventory::drawEgg() {
 }
 
 // Blinking egg: we need to blink the egg for delta time, with the blinking getting faster until it's always lit.
-void Inventory::drawBlinkingEgg() {
+void Inventory::drawBlinkingEgg(uint ticks) {
+	uint globalTimer = (uint)getGlobalTimer();
+	uint timerValue = (getProgress().jacket == kJacketGreen) ? 450 : 225;
 
-	warning("[Inventory::drawBlinkingEgg] Blinking not implemented");
+	if (globalTimer == timerValue || globalTimer == 900) {
+		_blinkingBrightness = 0;
+		_blinkingDirection = 1;
+	}
 
-	//// TODO show egg (with or without mouseover)
+	globalTimer = globalTimer <= ticks ? 0 : globalTimer - ticks;
+	setGlobalTimer(globalTimer);
 
-	//// Play timer sound
-	//if (getGlobalTimer() < 90) {
-	//	if (getGlobalTimer() + ticks >= 90)
-	//		getSound()->playSoundWithSubtitles("TIMER.SND", 50331664, kEntityPlayer);
+	if (getFlags()->flag_0
+	|| (globalTimer % 5) == 0
+	|| (globalTimer <= 500 && (globalTimer % ((globalTimer + 100) / 100)) == 0))
+		blinkEgg();
 
-	//	if (getSoundQueue()->isBuffered("TIMER"))
-	//		setGlobalTimer(0);
-	//}
+	if (globalTimer < 90) {
+		if ((globalTimer + ticks) >= 90)
+			getSound()->playSoundWithSubtitles("TIMER", (SoundFlag)(kFlagType13|kFlagDefault), kEntityPlayer);
 
-	//// Restore egg to standard brightness
-	//if (!getGlobalTimer()) {
-	//
-	//}
+		if (!getSoundQueue()->isBuffered("TIMER"))
+			setGlobalTimer(0);
+	}
 
+	if (globalTimer == 0) {
+		drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, _menuEggRect.contains(getCoords()) ? 1 : -1);
 
-	//drawItem(608, 448, getMenu()->getGameId() + 39, _blinkingBrightness)
+		askForRedraw();
 
-	//// TODO if delta time > _blinkingInterval, update egg & ask for redraw then adjust blinking time and remaining time
-	//
+		getSaveLoad()->saveGame(kSavegameTypeAuto, kEntityChapters, 0);
+	}
+}
 
-	//// Reset values and stop blinking
-	//if (_blinkingTime == 0)
-	//	blinkEgg(false);
+void Inventory::blinkEgg() {
+	drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, (_blinkingBrightness == 0) ? -1 : (int16)_blinkingBrightness);
 
 	askForRedraw();
+
+	_blinkingBrightness += _blinkingDirection;
+	if (_blinkingBrightness == 0 || _blinkingBrightness == 3)
+		_blinkingDirection = -_blinkingDirection;
 }
 
-void Inventory::drawItem(CursorStyle id, uint16 x, uint16 y, int16 brightnessIndex) {
+void Inventory::drawItem(CursorStyle id, uint16 x, uint16 y, int16 brightnessIndex) const {
 	Icon icon(id);
 	icon.setPosition(x, y);
 
@@ -678,7 +686,7 @@ void Inventory::drawSelectedItem() {
 	}
 }
 
-void Inventory::clearSelectedItem() {
+void Inventory::clearSelectedItem() const {
 	_engine->getGraphicsManager()->clear(GraphicsManager::kBackgroundInventory, Common::Rect(44, 0, 44 + 32, 32));
 }
 
@@ -733,7 +741,7 @@ void Inventory::drawHighlight(uint32 currentIndex, bool reset) {
 	}
 }
 
-uint32 Inventory::getItemIndex(uint32 currentIndex) {
+uint32 Inventory::getItemIndex(uint32 currentIndex) const {
 	uint32 count = 0;
 
 	for (uint32 i = 1; i < ARRAYSIZE(_entries); i++) {
diff --git a/engines/lastexpress/game/inventory.h b/engines/lastexpress/game/inventory.h
index b1995adce3..b1019a43c6 100644
--- a/engines/lastexpress/game/inventory.h
+++ b/engines/lastexpress/game/inventory.h
@@ -106,11 +106,10 @@ public:
 
 	// UI Control
 	void show();
-	void blinkEgg(bool enabled);
-	void showHourGlass();
-	void setPortrait(InventoryItem item);
-	void drawEgg();
-	void drawBlinkingEgg();
+	void showHourGlass() const;
+	void setPortrait(InventoryItem item) const;
+	void drawEgg() const;
+	void drawBlinkingEgg(uint ticks = 1);
 
 	// Handle inventory UI events.
 	void handleMouseEvent(const Common::Event &ev);
@@ -133,8 +132,6 @@ public:
 	Common::String toString();
 
 private:
-	static const uint32 _defaultBlinkingInterval = 250; ///< Default blinking interval in ms
-
 	LastExpressEngine *_engine;
 
 	InventoryEntry _entries[32];
@@ -144,9 +141,7 @@ private:
 	uint32 _itemsShown;
 
 	bool _showingHourGlass;
-	bool _blinkingEgg;
-	uint32 _blinkingTime;
-	uint32 _blinkingInterval;
+	int16  _blinkingDirection;
 	uint16 _blinkingBrightness;
 
 	// Flags
@@ -157,8 +152,6 @@ private:
 
 	Scene *_itemScene;
 
-	// Important rects
-	//Common::Rect _inventoryRect;
 	Common::Rect _menuEggRect;
 	Common::Rect _selectedItemRect;
 
@@ -168,14 +161,15 @@ private:
 	void close();
 	void examine(InventoryItem item);
 	void drawHighlight(uint32 currentIndex, bool reset);
-	uint32 getItemIndex(uint32 currentIndex);
+	uint32 getItemIndex(uint32 currentIndex) const;
 
 	bool isItemSceneParameter(InventoryItem item) const;
 
-	void drawItem(CursorStyle id, uint16 x, uint16 y, int16 brighnessIndex = -1);
+	void drawItem(CursorStyle id, uint16 x, uint16 y, int16 brighnessIndex = -1) const;
+	void blinkEgg();
 
 	void drawSelectedItem();
-	void clearSelectedItem();
+	void clearSelectedItem() const;
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index aeac8cff98..09104d1bf9 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -47,10 +47,7 @@
 #include "lastexpress/menu/menu.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
-#include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -88,16 +85,6 @@ Logic::~Logic() {
 //////////////////////////////////////////////////////////////////////////
 // Event Handling
 //////////////////////////////////////////////////////////////////////////
-#define REDRAW_CURSOR() { \
-	if (getInventory()->isMagnifierInUse()) \
-		_engine->getCursor()->setStyle(kCursorMagnifier); \
-	if (getInventory()->isPortraitHighlighted() \
-	|| getInventory()->isOpened() \
-	|| getInventory()->isEggHighlighted()) \
-		_engine->getCursor()->setStyle(kCursorNormal); \
-	return; \
-}
-
 void Logic::eventMouse(const Common::Event &ev) {
 	bool hotspotHandled = false;
 
@@ -168,7 +155,9 @@ void Logic::eventMouse(const Common::Event &ev) {
 				getInventory()->unselectItem();
 		}
 
-		REDRAW_CURSOR()
+		redrawCursor();
+
+		return;
 	}
 
 	// Handle match case
@@ -194,7 +183,9 @@ void Logic::eventMouse(const Common::Event &ev) {
 			getScenes()->processScene();
 		}
 
-		REDRAW_CURSOR()
+		redrawCursor();
+
+		return;
 	}
 
 	// Handle entity item case
@@ -315,7 +306,7 @@ void Logic::eventTick(const Common::Event &) {
 	//////////////////////////////////////////////////////////////////////////
 	// Draw the blinking egg if needed
 	if (getGlobalTimer() && !getFlags()->shouldDrawEggOrHourGlass)
-		getInventory()->drawBlinkingEgg();
+		getInventory()->drawBlinkingEgg(ticks);
 
 	//////////////////////////////////////////////////////////////////////////
 	// Adjust time and save game if needed
@@ -411,9 +402,12 @@ void Logic::eventTick(const Common::Event &) {
  * Resets the game state.
  */
 void Logic::resetState() {
-	getState()->scene = kSceneDefault;
+	getScenes()->setCoordinates(Common::Rect(80, 0, 559, 479));
+
+	SAFE_DELETE(_entities);
+	_entities = new Entities(_engine);
 
-	warning("[Logic::resetState] Not implemented! You need to restart the engine until this is implemented.");
+	_state->reset();
 }
 
 /**
@@ -595,4 +589,14 @@ void Logic::updateCursor(bool) const { /* the cursor is always updated, even whe
 	_engine->getCursor()->setStyle(style);
 }
 
+void Logic::redrawCursor() const {
+	if (getInventory()->isMagnifierInUse())
+		_engine->getCursor()->setStyle(kCursorMagnifier);
+
+	if (getInventory()->isPortraitHighlighted()
+	 || getInventory()->isOpened()
+	 || getInventory()->isEggHighlighted())
+		_engine->getCursor()->setStyle(kCursorNormal);
+}
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/logic.h b/engines/lastexpress/game/logic.h
index 8b7dcef942..efb8f1e1a3 100644
--- a/engines/lastexpress/game/logic.h
+++ b/engines/lastexpress/game/logic.h
@@ -25,8 +25,6 @@
 
 #include "lastexpress/shared.h"
 
-#include "lastexpress/game/entities.h"
-
 #include "lastexpress/eventhandler.h"
 
 #include "common/events.h"
@@ -75,6 +73,7 @@ private:
 
 	void switchChapter() const;
 	void showCredits() const;
+	void redrawCursor() const;
 
 	// Flags & Members
 	bool _flagActionPerformed;
diff --git a/engines/lastexpress/game/object.cpp b/engines/lastexpress/game/object.cpp
index d9e9e4279a..48df91ea6d 100644
--- a/engines/lastexpress/game/object.cpp
+++ b/engines/lastexpress/game/object.cpp
@@ -22,11 +22,11 @@
 
 #include "lastexpress/game/object.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/scenes.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 namespace LastExpress {
diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp
index 9c464feb6e..021dc40bb9 100644
--- a/engines/lastexpress/game/savegame.cpp
+++ b/engines/lastexpress/game/savegame.cpp
@@ -22,6 +22,7 @@
 
 #include "lastexpress/game/savegame.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
@@ -34,13 +35,13 @@
 
 #include "lastexpress/debug.h"
 #include "lastexpress/lastexpress.h"
-#include "lastexpress/helpers.h"
 
 #include "common/file.h"
-#include "common/system.h"
 
 namespace LastExpress {
 
+#define DISABLE_COMPRESSION 1
+
 // Names of savegames
 static const struct {
 	const char *saveFile;
@@ -54,14 +55,305 @@ static const struct {
 };
 
 //////////////////////////////////////////////////////////////////////////
+// SavegameStream
+//////////////////////////////////////////////////////////////////////////
+
+uint32 SavegameStream::write(const void *dataPtr, uint32 dataSize) {
+#if !DISABLE_COMPRESSION
+	if (_enableCompression)
+		return writeCompressed(dataPtr, dataSize);
+#endif
+
+	return Common::MemoryWriteStreamDynamic::write(dataPtr, dataSize);
+}
+
+uint32 SavegameStream::read(void *dataPtr, uint32 dataSize) {
+#if !DISABLE_COMPRESSION
+	if (_enableCompression)
+		return readCompressed(dataPtr, dataSize);
+#endif
+
+	return readUncompressed(dataPtr, dataSize);
+}
+
+uint32 SavegameStream::readUncompressed(void *dataPtr, uint32 dataSize) {
+	if ((int32)dataSize > size() - pos()) {
+		dataSize = (uint32)(size() - pos());
+		_eos = true;
+	}
+	memcpy(dataPtr, getData() + pos(), dataSize);
+
+	seek(dataSize, SEEK_CUR);
+
+	return dataSize;
+}
+
+void SavegameStream::writeBuffer(uint8 value, bool onlyValue) {
+	if (_bufferOffset == -1)
+		_bufferOffset = 0;
+
+	if (_bufferOffset == 256) {
+		_bufferOffset = 0;
+		Common::MemoryWriteStreamDynamic::write(_buffer, 256);
+	}
+
+	if (onlyValue || value < 0xFB)
+		_buffer[_bufferOffset] = value;
+	else
+		_buffer[_bufferOffset] = 0xFE;
+
+	_offset++;
+	_bufferOffset++;
+
+	if (!onlyValue && value >= 0xFB)
+	{
+		if (_bufferOffset == 256) {
+			_bufferOffset = 0;
+			Common::MemoryWriteStreamDynamic::write(_buffer, 256);
+		}
+
+		_buffer[_bufferOffset] = value;
+
+		_bufferOffset++;
+		_offset++;
+	}
+}
+
+uint8 SavegameStream::readBuffer() {
+	if (_bufferOffset == -1 || _bufferOffset >= 256) {
+		readUncompressed(_buffer, 256);
+		_bufferOffset = 0;
+	}
+
+	byte val = _buffer[_bufferOffset];
+	_bufferOffset++;
+
+	return val;
+}
+
+uint32 SavegameStream::process() {
+	_enableCompression = !_enableCompression;
+
+#if DISABLE_COMPRESSION
+	return 0;
+#else
+	switch (_status) {
+	default:
+		break;
+
+	case kStatusReading:
+		_status = kStatusReady;
+		if (_bufferOffset != -1 && _bufferOffset != 256) {
+			seek(_bufferOffset - 256, SEEK_CUR);
+			_bufferOffset = -1;
+		}
+		break;
+
+	case kStatusWriting:
+		switch (_valueCount) {
+		default:
+			break;
+
+		case 1:
+			writeBuffer(_previousValue, false);
+			break;
+
+		case 2:
+			if (_previousValue) {
+				writeBuffer(0xFF);
+				writeBuffer(_repeatCount);
+				writeBuffer(_previousValue);
+				break;
+			}
+
+			if (_repeatCount == 3) {
+				writeBuffer(0xFB);
+				break;
+			}
+
+			if (_repeatCount == 255) {
+				writeBuffer(0xFC);
+				break;
+			}
+
+			writeBuffer(0xFD);
+			writeBuffer(_repeatCount);
+			break;
+		}
+
+		if (_bufferOffset != -1 && _bufferOffset != 0) {
+			Common::MemoryWriteStreamDynamic::write(_buffer, _bufferOffset);
+			_bufferOffset = -1;
+		}
+		break;
+	}
+
+	_status = kStatusReady;
+	_valueCount = 0;
+	uint32 offset = _offset;
+	_offset = 0;
+
+	return offset;
+#endif
+}
+
+uint32 SavegameStream::writeCompressed(const void *dataPtr, uint32 dataSize) {
+	if (_status == kStatusReading)
+		error("[SavegameStream::writeCompressed] Error: Compression buffer is in read mode.");
+
+	_status = kStatusWriting;
+	const byte *data = (const byte *)dataPtr;
+
+	while (dataSize) {
+		switch (_valueCount) {
+		default:
+			error("[SavegameStream::writeCompressed] Invalid value count (%d)", _valueCount);
+
+		case 0:
+			_previousValue = *data++;
+			_valueCount = 1;
+			break;
+
+		case 1:
+			if (*data != _previousValue) {
+				writeBuffer(_previousValue, false);
+				_previousValue = *data;
+			} else {
+				_valueCount = 2;
+				_repeatCount = 2;
+			}
+
+			++data;
+			break;
+
+		case 2:
+			if (*data != _previousValue || _repeatCount >= 255) {
+				if (_previousValue) {
+					writeBuffer(0xFF, true);
+					writeBuffer((uint8)_repeatCount, true);
+					writeBuffer(_previousValue, true);
+
+					_previousValue = *data++;
+					_valueCount = 1;
+					break;
+				}
+
+				if (_repeatCount == 3) {
+					writeBuffer(0xFB, true);
+
+					_previousValue = *data++;
+					_valueCount = 1;
+					break;
+				}
+
+				if (_repeatCount == -1) {
+					writeBuffer(0xFC, true);
+
+					_previousValue = *data++;
+					_valueCount = 1;
+					break;
+				}
+
+				writeBuffer(0xFD, true);
+				writeBuffer((uint8)_repeatCount, true);
+
+				_previousValue = *data++;
+				_valueCount = 1;
+			}
+
+			++data;
+			++_repeatCount;
+			break;
+		}
+
+		--dataSize;
+	}
+
+	return _offset;
+}
+
+uint32 SavegameStream::readCompressed(void *dataPtr, uint32 dataSize) {
+	if (_status == kStatusWriting)
+		error("[SavegameStream::writeCompressed] Error: Compression buffer is in write mode.");
+
+	_status = kStatusReady;
+	byte *data = (byte *)dataPtr;
+
+	while (dataSize) {
+		switch (_valueCount) {
+		default:
+			error("[SavegameStream::readCompressed] Invalid value count (%d)", _valueCount);
+
+		case 0:
+		case 1: {
+			// Read control code
+			byte control = readBuffer();
+
+			switch (control) {
+			default:
+				// Data value
+				*data++ = control;
+				break;
+
+			case 0xFB:
+				_repeatCount = 2;
+				_previousValue = 0;
+				*data++ = 0;
+				_valueCount = 2;
+				break;
+
+			case 0xFC:
+				_repeatCount = 254;
+				_previousValue = 0;
+				*data++ = 0;
+				_valueCount = 2;
+				break;
+
+			case 0xFD:
+				_repeatCount = readBuffer() - 1;
+				_previousValue = 0;
+				*data++ = 0;
+				_valueCount = 2;
+				break;
+
+			case 0xFE:
+				*data++ = readBuffer();
+				break;
+
+			case 0xFF:
+				_repeatCount = readBuffer() - 1;
+				_previousValue = readBuffer();
+				*data++ = _previousValue;
+				_valueCount = 2;
+				break;
+			}
+			}
+			break;
+
+		case 2:
+			*data++ = _previousValue;
+			_repeatCount--;
+			if (!_repeatCount)
+				_valueCount = 1;
+			break;
+		}
+
+		--dataSize;
+	}
+
+	return _offset;
+}
+
+//////////////////////////////////////////////////////////////////////////
 // Constructors
 //////////////////////////////////////////////////////////////////////////
 
-SaveLoad::SaveLoad(LastExpressEngine *engine) : _engine(engine), _savegame(NULL), _gameTicksLastSavegame(0) {
+SaveLoad::SaveLoad(LastExpressEngine *engine) : _engine(engine), _savegame(NULL), _gameTicksLastSavegame(0), _entity(kEntityPlayer) {
 }
 
 SaveLoad::~SaveLoad() {
 	clear(true);
+	_savegame = NULL;
 
 	// Zero passed pointers
 	_engine = NULL;
@@ -81,6 +373,7 @@ void SaveLoad::flushStream(GameId id) {
 		error("[SaveLoad::flushStream] Savegame stream is invalid");
 
 	save->write(_savegame->getData(), (uint32)_savegame->size());
+	save->finalize();
 
 	delete save;
 }
@@ -189,10 +482,10 @@ void SaveLoad::clear(bool clearStream) {
 // Save & Load
 //////////////////////////////////////////////////////////////////////////
 
-// Load game
-void SaveLoad::loadGame(GameId id) {
+// Load last saved game
+void SaveLoad::loadLastGame() {
 	if (!_savegame)
-		error("[SaveLoad::loadGame] No savegame stream present");
+		error("[SaveLoad::loadLastGame] No savegame stream present");
 
 	// Rewind current savegame
 	_savegame->seek(0);
@@ -229,7 +522,29 @@ void SaveLoad::loadGame(GameId id) {
 }
 
 // Load a specific game entry
-void SaveLoad::loadGame(GameId id, uint32 index) {
+void SaveLoad::loadGame(uint32 index) {
+	if (!_savegame)
+		error("[SaveLoad::loadLastGame] No savegame stream present");
+
+	// Rewind current savegame
+	_savegame->seek(0);
+
+	// Write main header (with selected index)
+	SavegameMainHeader header;
+	header.count = index;
+	header.brightness = getState()->brightness;
+	header.volume = getState()->volume;
+
+	Common::Serializer ser(NULL, _savegame);
+	header.saveLoadWithSerializer(ser);
+
+	// TODO
+	// Go to the entry
+	// Load the entry
+	// Get offset (main and entry)
+	// Write main header again with correct entry offset
+	// Setup game and start
+
 	error("[SaveLoad::loadGame] Not implemented! (only loading the last entry is working for now)");
 }
 
@@ -341,16 +656,52 @@ bool SaveLoad::loadMainHeader(Common::InSaveFile *stream, SavegameMainHeader *he
 //////////////////////////////////////////////////////////////////////////
 // Entries
 //////////////////////////////////////////////////////////////////////////
-void SaveLoad::writeEntry(SavegameType type, EntityIndex entity, uint32 value) {
-#define WRITE_ENTRY(name, func, val) { \
-	uint32 _prevPosition = (uint32)_savegame->pos(); \
-	func; \
-	uint32 _count = (uint32)_savegame->pos() - _prevPosition; \
-	debugC(kLastExpressDebugSavegame, "Savegame: Writing " #name ": %d bytes", _count); \
-	if (_count != val)\
-		error("[SaveLoad::writeEntry] Number of bytes written (%d) differ from expected count (%d)", _count, val); \
+uint32 SaveLoad::writeValue(Common::Serializer &ser, const char *name, Common::Functor1<Common::Serializer &, void> *function, uint size) {
+	if (!_savegame)
+		error("[SaveLoad::writeValue] Stream not initialized properly");
+
+	debugC(kLastExpressDebugSavegame, "Savegame: Writing %s: %u bytes", name, size);
+
+	uint32 prevPosition = (uint32)_savegame->pos();
+
+	// Serialize data into our buffer
+	(*function)(ser);
+
+	uint32 count = (uint32)_savegame->pos() - prevPosition;
+
+#if DISABLE_COMPRESSION
+	if (count != size)
+		error("[SaveLoad::writeValue] %s - Number of bytes written (%d) differ from expected count (%d)", name, count, size);
+#endif
+
+	return count;
 }
 
+uint32 SaveLoad::readValue(Common::Serializer &ser, const char *name, Common::Functor1<Common::Serializer &, void> *function, uint size) {
+	if (!_savegame)
+		error("[SaveLoad::readValue] Stream not initialized properly");
+
+	debugC(kLastExpressDebugSavegame, "Savegame: Reading %s: %u bytes", name, size);
+
+	uint32 prevPosition = (uint32)_savegame->pos();
+
+	(*function)(ser);
+
+	uint32 count = (uint32)_savegame->pos() - prevPosition;
+
+#if DISABLE_COMPRESSION
+	if (size != 0 && count != size)
+		error("[SaveLoad::readValue] %s - Number of bytes read (%d) differ from expected count (%d)", name, count, size);
+#endif
+
+	return count;
+}
+
+void SaveLoad::syncEntity(Common::Serializer &ser) {
+	ser.syncAsUint32LE(_entity);
+}
+
+void SaveLoad::writeEntry(SavegameType type, EntityIndex entity, uint32 value) {
 	if (!_savegame)
 		error("[SaveLoad::writeEntry] Savegame stream is invalid");
 
@@ -369,18 +720,22 @@ void SaveLoad::writeEntry(SavegameType type, EntityIndex entity, uint32 value) {
 	header.saveLoadWithSerializer(ser);
 
 	// Write game data
-	WRITE_ENTRY("entity index", ser.syncAsUint32LE(entity), 4);
-	WRITE_ENTRY("state", getState()->saveLoadWithSerializer(ser), 4 + 4 + 4 + 4 + 1 + 4 + 4);
-	WRITE_ENTRY("selected item", getInventory()->saveSelectedItem(ser), 4);
-	WRITE_ENTRY("positions", getEntities()->savePositions(ser), 4 * 1000);
-	WRITE_ENTRY("compartments", getEntities()->saveCompartments(ser), 4 * 16 * 2);
-	WRITE_ENTRY("progress", getProgress().saveLoadWithSerializer(ser), 4 * 128);
-	WRITE_ENTRY("events", getState()->syncEvents(ser), 512);
-	WRITE_ENTRY("inventory", getInventory()->saveLoadWithSerializer(ser), 7 * 32);
-	WRITE_ENTRY("objects", getObjects()->saveLoadWithSerializer(ser), 5 * 128);
-	WRITE_ENTRY("entities", getEntities()->saveLoadWithSerializer(ser), 1262 * 40);
-	WRITE_ENTRY("sound", getSoundQueue()->saveLoadWithSerializer(ser), 3 * 4 + getSoundQueue()->count() * 64);
-	WRITE_ENTRY("savepoints", getSavePoints()->saveLoadWithSerializer(ser), 128 * 16 + 4 + getSavePoints()->count() * 16);
+	_entity = entity;
+
+	_savegame->process();
+	writeValue(ser, "entity index", WRAP_SYNC_FUNCTION(this, SaveLoad, syncEntity), 4);
+	writeValue(ser, "state", WRAP_SYNC_FUNCTION(getState(), State::GameState, saveLoadWithSerializer), 4 + 4 + 4 + 4 + 1 + 4 + 4);
+	writeValue(ser, "selected item", WRAP_SYNC_FUNCTION(getInventory(), Inventory, saveSelectedItem), 4);
+	writeValue(ser, "positions", WRAP_SYNC_FUNCTION(getEntities(), Entities, savePositions), 4 * 1000);
+	writeValue(ser, "compartments", WRAP_SYNC_FUNCTION(getEntities(), Entities, saveCompartments), 4 * 16 * 2);
+	writeValue(ser, "progress", WRAP_SYNC_FUNCTION(&getProgress(), State::GameProgress, saveLoadWithSerializer), 4 * 128);
+	writeValue(ser, "events", WRAP_SYNC_FUNCTION(getState(), State::GameState, syncEvents), 512);
+	writeValue(ser, "inventory", WRAP_SYNC_FUNCTION(getInventory(), Inventory, saveLoadWithSerializer), 7 * 32);
+	writeValue(ser, "objects", WRAP_SYNC_FUNCTION(getObjects(), Objects, saveLoadWithSerializer), 5 * 128);
+	writeValue(ser, "entities", WRAP_SYNC_FUNCTION(getEntities(), Entities, saveLoadWithSerializer), 1262 * 40);
+	writeValue(ser, "sound", WRAP_SYNC_FUNCTION(getSoundQueue(), SoundQueue, saveLoadWithSerializer), 3 * 4 + getSoundQueue()->count() * 64);
+	writeValue(ser, "savepoints", WRAP_SYNC_FUNCTION(getSavePoints(), SavePoints, saveLoadWithSerializer), 128 * 16 + 4 + getSavePoints()->count() * 16);
+	_savegame->process();
 
 	header.offset = (uint32)_savegame->pos() - (originalPosition + 32);
 
@@ -406,22 +761,6 @@ void SaveLoad::writeEntry(SavegameType type, EntityIndex entity, uint32 value) {
 }
 
 void SaveLoad::readEntry(SavegameType *type, EntityIndex *entity, uint32 *val, bool keepIndex) {
-#define LOAD_ENTRY(name, func, val) { \
-	uint32 _prevPosition = (uint32)_savegame->pos(); \
-	func; \
-	uint32 _count = (uint32)_savegame->pos() - _prevPosition; \
-	debugC(kLastExpressDebugSavegame, "Savegame: Reading " #name ": %d bytes", _count); \
-	if (_count != val) \
-		error("[SaveLoad::readEntry] Number of bytes read (%d) differ from expected count (%d)", _count, val); \
-}
-
-#define LOAD_ENTRY_ONLY(name, func) { \
-	uint32 _prevPosition = (uint32)_savegame->pos(); \
-	func; \
-	uint32 _count = (uint32)_savegame->pos() - _prevPosition; \
-	debugC(kLastExpressDebugSavegame, "Savegame: Reading " #name ": %d bytes", _count); \
-}
-
 	if (!type || !entity || !val)
 		error("[SaveLoad::readEntry] Invalid parameters passed");
 
@@ -444,20 +783,23 @@ void SaveLoad::readEntry(SavegameType *type, EntityIndex *entity, uint32 *val, b
 	uint32 originalPosition = (uint32)_savegame->pos();
 
 	// Load game data
-	LOAD_ENTRY("entity index", ser.syncAsUint32LE(*entity), 4);
-	LOAD_ENTRY("state", getState()->saveLoadWithSerializer(ser), 4 + 4 + 4 + 4 + 1 + 4 + 4);
-	LOAD_ENTRY("selected item", getInventory()->saveSelectedItem(ser), 4);
-	LOAD_ENTRY("positions", getEntities()->savePositions(ser), 4 * 1000);
-	LOAD_ENTRY("compartments", getEntities()->saveCompartments(ser), 4 * 16 * 2);
-	LOAD_ENTRY("progress", getProgress().saveLoadWithSerializer(ser), 4 * 128);
-	LOAD_ENTRY("events", getState()->syncEvents(ser), 512);
-	LOAD_ENTRY("inventory", getInventory()->saveLoadWithSerializer(ser), 7 * 32);
-	LOAD_ENTRY("objects", getObjects()->saveLoadWithSerializer(ser), 5 * 128);
-	LOAD_ENTRY("entities", getEntities()->saveLoadWithSerializer(ser), 1262 * 40);
-	LOAD_ENTRY_ONLY("sound", getSoundQueue()->saveLoadWithSerializer(ser));
-	LOAD_ENTRY_ONLY("savepoints", getSavePoints()->saveLoadWithSerializer(ser));
+	_savegame->process();
+	readValue(ser, "entity index", WRAP_SYNC_FUNCTION(this, SaveLoad, syncEntity), 4);
+	readValue(ser, "state", WRAP_SYNC_FUNCTION(getState(), State::GameState, saveLoadWithSerializer), 4 + 4 + 4 + 4 + 1 + 4 + 4);
+	readValue(ser, "selected item", WRAP_SYNC_FUNCTION(getInventory(), Inventory, saveSelectedItem), 4);
+	readValue(ser, "positions", WRAP_SYNC_FUNCTION(getEntities(), Entities, savePositions), 4 * 1000);
+	readValue(ser, "compartments", WRAP_SYNC_FUNCTION(getEntities(), Entities, saveCompartments), 4 * 16 * 2);
+	readValue(ser, "progress", WRAP_SYNC_FUNCTION(&getProgress(), State::GameProgress, saveLoadWithSerializer), 4 * 128);
+	readValue(ser, "events", WRAP_SYNC_FUNCTION(getState(), State::GameState, syncEvents), 512);
+	readValue(ser, "inventory", WRAP_SYNC_FUNCTION(getInventory(), Inventory, saveLoadWithSerializer), 7 * 32);
+	readValue(ser, "objects", WRAP_SYNC_FUNCTION(getObjects(), Objects, saveLoadWithSerializer), 5 * 128);
+	readValue(ser, "entities", WRAP_SYNC_FUNCTION(getEntities(), Entities, saveLoadWithSerializer), 1262 * 40);
+	readValue(ser, "sound", WRAP_SYNC_FUNCTION(getSoundQueue(), SoundQueue, saveLoadWithSerializer));
+	readValue(ser, "savepoints", WRAP_SYNC_FUNCTION(getSavePoints(), SavePoints, saveLoadWithSerializer));
+	_savegame->process();
 
 	// Update chapter
+	*entity = _entity;
 	getProgress().chapter = entry.chapter;
 
 	// Skip padding
@@ -567,7 +909,7 @@ Common::InSaveFile *SaveLoad::openForLoading(GameId id) {
 }
 
 Common::OutSaveFile *SaveLoad::openForSaving(GameId id) {
-	Common::OutSaveFile *save = g_system->getSavefileManager()->openForSaving(getFilename(id));
+	Common::OutSaveFile *save = g_system->getSavefileManager()->openForSaving(getFilename(id), false); // TODO Enable compression again
 
 	if (!save)
 		debugC(2, kLastExpressDebugSavegame, "Cannot open savegame for writing: %s", getFilename(id).c_str());
diff --git a/engines/lastexpress/game/savegame.h b/engines/lastexpress/game/savegame.h
index 6f0408487f..361957227e 100644
--- a/engines/lastexpress/game/savegame.h
+++ b/engines/lastexpress/game/savegame.h
@@ -80,11 +80,68 @@
 namespace LastExpress {
 
 // Savegame signatures
-#define SAVEGAME_SIGNATURE       0x12001200
-#define SAVEGAME_ENTRY_SIGNATURE 0xE660E660
+#define SAVEGAME_SIGNATURE       0x12001200    // 301994496
+#define SAVEGAME_ENTRY_SIGNATURE 0xE660E660    // 3865110112
+
+#define WRAP_SYNC_FUNCTION(instance, className, method) \
+	new Common::Functor1Mem<Common::Serializer &, void, className>(instance, &className::method)
 
 class LastExpressEngine;
 
+class SavegameStream : public Common::MemoryWriteStreamDynamic, public Common::SeekableReadStream {
+public:
+	SavegameStream() : MemoryWriteStreamDynamic(DisposeAfterUse::YES), _eos(false) {
+		_enableCompression = false;
+		_bufferOffset = -1;
+		_valueCount = 0;
+		_previousValue = 0;
+		_repeatCount = 0;
+		_offset = 0;
+		_status = kStatusReady;
+
+		memset(_buffer, 0, 256);
+	}
+
+	int32 pos() const { return MemoryWriteStreamDynamic::pos(); }
+	int32 size() const { return MemoryWriteStreamDynamic::size(); }
+	bool seek(int32 offset, int whence = SEEK_SET) { return MemoryWriteStreamDynamic::seek(offset, whence); }
+	bool eos() const { return _eos; }
+	uint32 read(void *dataPtr, uint32 dataSize);
+	uint32 write(const void *dataPtr, uint32 dataSize);
+
+	uint32 process();
+
+private:
+	enum CompressedStreamStatus {
+		kStatusReady,
+		kStatusReading,
+		kStatusWriting
+	};
+
+	uint32 readUncompressed(void *dataPtr, uint32 dataSize);
+
+	// Compressed data
+	uint32 writeCompressed(const void *dataPtr, uint32 dataSize);
+	uint32 readCompressed(void *dataPtr, uint32 dataSize);
+
+	void writeBuffer(uint8 value, bool onlyValue = true);
+	uint8 readBuffer();
+
+private:
+	bool _eos;
+
+	// Compression handling
+	bool                   _enableCompression;
+	int16                  _bufferOffset;
+	byte                   _valueCount;
+	byte                   _previousValue;
+	int16                  _repeatCount;
+	uint32                 _offset;
+	CompressedStreamStatus _status;
+
+	byte _buffer[256];
+};
+
 class SaveLoad {
 public:
 	SaveLoad(LastExpressEngine *engine);
@@ -96,8 +153,8 @@ public:
 	uint32 init(GameId id, bool resetHeaders);
 
 	// Save & Load
-	void loadGame(GameId id);
-	void loadGame(GameId id, uint32 index);
+	void loadLastGame();
+	void loadGame(uint32 index);
 	void saveGame(SavegameType type, EntityIndex entity, uint32 value);
 
 	void loadVolumeBrightness();
@@ -116,30 +173,6 @@ public:
 	uint32       getLastSavegameTicks() const { return _gameTicksLastSavegame; }
 
 private:
-	class SavegameStream : public Common::MemoryWriteStreamDynamic, public Common::SeekableReadStream {
-	public:
-		SavegameStream() : MemoryWriteStreamDynamic(DisposeAfterUse::YES),
-		 _eos(false) {}
-
-		int32 pos() const { return MemoryWriteStreamDynamic::pos(); }
-		int32 size() const { return MemoryWriteStreamDynamic::size(); }
-		bool seek(int32 offset, int whence = SEEK_SET) { return MemoryWriteStreamDynamic::seek(offset, whence); }
-		bool eos() const { return _eos; }
-		uint32 read(void *dataPtr, uint32 dataSize) {
-			if ((int32)dataSize > size() - pos()) {
-				dataSize = size() - pos();
-				_eos = true;
-			}
-			memcpy(dataPtr, getData() + pos(), dataSize);
-
-			seek(dataSize, SEEK_CUR);
-
-			return dataSize;
-		}
-	private:
-		bool _eos;
-	};
-
 	LastExpressEngine *_engine;
 
 	struct SavegameMainHeader : Common::Serializable {
@@ -268,6 +301,9 @@ private:
 	void writeEntry(SavegameType type, EntityIndex entity, uint32 val);
 	void readEntry(SavegameType *type, EntityIndex *entity, uint32 *val, bool keepIndex);
 
+	uint32 writeValue(Common::Serializer &ser, const char *name, Common::Functor1<Common::Serializer &, void> *function, uint size);
+	uint32 readValue(Common::Serializer &ser, const char *name, Common::Functor1<Common::Serializer &, void> *function, uint size = 0);
+
 	SavegameEntryHeader *getEntry(uint32 index);
 
 	// Opening save files
@@ -279,6 +315,10 @@ private:
 	void initStream();
 	void loadStream(GameId id);
 	void flushStream(GameId id);
+
+	// Misc
+	EntityIndex _entity;
+	void syncEntity(Common::Serializer &ser);
 };
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp
index 64ae26c2be..8d14ec386b 100644
--- a/engines/lastexpress/game/savepoint.cpp
+++ b/engines/lastexpress/game/savepoint.cpp
@@ -26,7 +26,6 @@
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/state.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 
 
@@ -95,7 +94,7 @@ void SavePoints::process() {
 		if (!updateEntityFromData(savepoint)) {
 
 			// Call requested callback
-			Entity::Callback *callback = getCallback(savepoint.entity1);
+			Callback *callback = getCallback(savepoint.entity1);
 			if (callback && callback->isValid()) {
 				debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s", ENTITY_NAME(savepoint.entity1), ACTION_NAME(savepoint.action), ENTITY_NAME(savepoint.entity2));
 				(*callback)(savepoint);
@@ -126,7 +125,7 @@ void SavePoints::addData(EntityIndex entity, ActionIndex action, uint32 param) {
 //////////////////////////////////////////////////////////////////////////
 // Callbacks
 //////////////////////////////////////////////////////////////////////////
-void SavePoints::setCallback(EntityIndex index, Entity::Callback *callback) {
+void SavePoints::setCallback(EntityIndex index, Callback *callback) {
 	if (index >= 40)
 		error("[SavePoints::setCallback] Attempting to use an invalid entity index. Valid values 0-39, was %d", index);
 
@@ -136,7 +135,7 @@ void SavePoints::setCallback(EntityIndex index, Entity::Callback *callback) {
 	_callbacks[index] = callback;
 }
 
-Entity::Callback *SavePoints::getCallback(EntityIndex index) const {
+Callback *SavePoints::getCallback(EntityIndex index) const {
 	if (index >= 40)
 		error("[SavePoints::getCallback] Attempting to use an invalid entity index. Valid values 0-39, was %d", index);
 
@@ -150,7 +149,7 @@ void SavePoints::call(EntityIndex entity2, EntityIndex entity1, ActionIndex acti
 	point.entity2 = entity2;
 	point.param.intValue = param;
 
-	Entity::Callback *callback = getCallback(entity1);
+	Callback *callback = getCallback(entity1);
 	if (callback != NULL && callback->isValid()) {
 		debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s, param=%d", ENTITY_NAME(entity1), ACTION_NAME(action), ENTITY_NAME(entity2), param);
 		(*callback)(point);
@@ -164,7 +163,7 @@ void SavePoints::call(EntityIndex entity2, EntityIndex entity1, ActionIndex acti
 	point.entity2 = entity2;
 	strcpy((char *)&point.param.charValue, param);
 
-	Entity::Callback *callback = getCallback(entity1);
+	Callback *callback = getCallback(entity1);
 	if (callback != NULL && callback->isValid()) {
 		debugC(8, kLastExpressDebugLogic, "Savepoint: entity1=%s, action=%s, entity2=%s, param=%s", ENTITY_NAME(entity1), ACTION_NAME(action), ENTITY_NAME(entity2), param);
 		(*callback)(point);
@@ -181,7 +180,7 @@ void SavePoints::callAndProcess() {
 	bool isRunning = getFlags()->isGameRunning;
 	while (isRunning) {
 
-		Entity::Callback *callback = getCallback(index);
+		Callback *callback = getCallback(index);
 		if (callback != NULL && callback->isValid()) {
 			(*callback)(savepoint);
 			isRunning = getFlags()->isGameRunning;
@@ -203,7 +202,7 @@ void SavePoints::callAndProcess() {
 // Misc
 //////////////////////////////////////////////////////////////////////////
 bool SavePoints::updateEntityFromData(const SavePoint &savepoint) {
-	for (int i = 0; i < (int)_data.size(); i++) {
+	for (uint i = 0; i < _data.size(); i++) {
 
 		// Not a data savepoint!
 		if (!_data[i].entity1)
@@ -211,7 +210,7 @@ bool SavePoints::updateEntityFromData(const SavePoint &savepoint) {
 
 		// Found our data!
 		if (_data[i].entity1 == savepoint.entity1 && _data[i].action == savepoint.action) {
-			debugC(8, kLastExpressDebugLogic, "Update entity from data: entity1=%s, action=%s, param=%d", ENTITY_NAME(_data[i].entity1), ACTION_NAME(_data[i].action), _data[i].param);
+			debugC(8, kLastExpressDebugLogic, "Update entity from data: entity1=%s, action=%s, param=%u", ENTITY_NAME(_data[i].entity1), ACTION_NAME(_data[i].action), _data[i].param);
 
 			// the SavePoint param value is the index of the entity call parameter to update
 			getEntities()->get(_data[i].entity1)->getParamData()->updateParameters(_data[i].param);
@@ -243,7 +242,15 @@ void SavePoints::saveLoadWithSerializer(Common::Serializer &s) {
 	}
 
 	// Skip uninitialized data if any
-	s.skip((_savePointsMaxSize - dataSize) * 16);
+	// (we are using a compressed stream, so we cannot seek on load)
+	uint32 unusedDataSize = (_savePointsMaxSize - dataSize) * 16;
+	if (s.isLoading()) {
+		byte *empty = (byte *)malloc(unusedDataSize);
+		s.syncBytes(empty, unusedDataSize);
+		free(empty);
+	} else {
+		s.skip(unusedDataSize);
+	}
 
 	// Number of savepoints
 	uint32 numSavepoints = _savepoints.size();
diff --git a/engines/lastexpress/game/savepoint.h b/engines/lastexpress/game/savepoint.h
index a3303b4b8a..005133891a 100644
--- a/engines/lastexpress/game/savepoint.h
+++ b/engines/lastexpress/game/savepoint.h
@@ -23,9 +23,8 @@
 #ifndef LASTEXPRESS_SAVEPOINT_H
 #define LASTEXPRESS_SAVEPOINT_H
 
-#include "lastexpress/entities/entity.h"
-
 #include "lastexpress/helpers.h"
+#include "lastexpress/shared.h"
 
 #include "common/array.h"
 #include "common/list.h"
@@ -74,10 +73,9 @@ struct SavePoint {
 	}
 };
 
-class SavePoints : Common::Serializable {
-private:
-	typedef Common::Functor1<const SavePoint&, void> Callback;
+typedef Common::Functor1<const SavePoint&, void> Callback;
 
+class SavePoints : Common::Serializable {
 public:
 
 	struct SavePointData {
@@ -112,7 +110,7 @@ public:
 	void addData(EntityIndex entity, ActionIndex action, uint32 param);
 
 	// Callbacks
-	void setCallback(EntityIndex index, Entity::Callback *callback);
+	void setCallback(EntityIndex index, Callback *callback);
 	Callback *getCallback(EntityIndex entity) const;
 	void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, uint32 param = 0) const;
 	void call(EntityIndex entity2, EntityIndex entity1, ActionIndex action, const char *param) const;
diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp
index b886951e0b..a2c7226b93 100644
--- a/engines/lastexpress/game/scenes.cpp
+++ b/engines/lastexpress/game/scenes.cpp
@@ -22,8 +22,6 @@
 
 #include "lastexpress/game/scenes.h"
 
-#include "lastexpress/data/scene.h"
-
 #include "lastexpress/game/action.h"
 #include "lastexpress/game/beetle.h"
 #include "lastexpress/game/entities.h"
@@ -34,10 +32,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -493,7 +489,7 @@ bool SceneManager::checkCurrentPosition(bool doCheckOtherCars) const {
 	if (position == 99)
 		return true;
 
-	switch (car){
+	switch (car) {
 	default:
 		break;
 
@@ -743,24 +739,31 @@ void SceneManager::resetQueue() {
 	_queue.clear();
 }
 
-void SceneManager::setCoordinates(SequenceFrame *frame) {
+void SceneManager::setCoordinates(const Common::Rect &rect) {
+	_flagCoordinates = true;
 
-	if (!frame || frame->getInfo()->subType == 3)
-		return;
+	if (_coords.right > rect.right)
+		_coords.right = rect.right;
 
-	_flagCoordinates = true;
+	if (_coords.bottom > rect.bottom)
+		_coords.bottom = rect.bottom;
+
+	if (_coords.left < rect.left)
+		_coords.left = rect.left;
 
-	if (_coords.right > (int)frame->getInfo()->xPos1)
-		_coords.right = (int16)frame->getInfo()->xPos1;
+	if (_coords.top < rect.top)
+		_coords.top = rect.top;
+}
 
-	if (_coords.bottom > (int)frame->getInfo()->yPos1)
-		_coords.bottom = (int16)frame->getInfo()->yPos1;
+void SceneManager::setCoordinates(SequenceFrame *frame) {
 
-	if (_coords.left < (int)frame->getInfo()->xPos2)
-		_coords.left = (int16)frame->getInfo()->xPos2;
+	if (!frame || frame->getInfo()->subType == 3)
+		return;
 
-	if (_coords.top < (int)frame->getInfo()->yPos2)
-		_coords.top = (int16)frame->getInfo()->yPos2;
+	setCoordinates(Common::Rect((int16)frame->getInfo()->xPos1,
+								(int16)frame->getInfo()->yPos1,
+								(int16)frame->getInfo()->xPos2,
+								(int16)frame->getInfo()->yPos2));
 }
 
 void SceneManager::resetCoordinates() {
diff --git a/engines/lastexpress/game/scenes.h b/engines/lastexpress/game/scenes.h
index 172dde2683..1c7ae85f98 100644
--- a/engines/lastexpress/game/scenes.h
+++ b/engines/lastexpress/game/scenes.h
@@ -79,6 +79,7 @@ public:
 	void removeAndRedraw(SequenceFrame **frame, bool doRedraw);
 	void resetQueue();
 	void setCoordinates(SequenceFrame *frame);
+	void setCoordinates(const Common::Rect &rect);
 
 	// Helpers
 	SceneIndex getSceneIndexFromPosition(CarIndex car, Position position, int param3 = -1);
diff --git a/engines/lastexpress/game/state.cpp b/engines/lastexpress/game/state.cpp
index f3fd9720b1..02ede25595 100644
--- a/engines/lastexpress/game/state.cpp
+++ b/engines/lastexpress/game/state.cpp
@@ -49,6 +49,18 @@ State::~State() {
 	_engine = NULL;
 }
 
+void State::reset() {
+	SAFE_DELETE(_inventory);
+	SAFE_DELETE(_objects);
+	SAFE_DELETE(_savepoints);
+	SAFE_DELETE(_state);
+
+	_inventory = new Inventory(_engine);
+	_objects = new Objects(_engine);
+	_savepoints = new SavePoints(_engine);
+	_state = new GameState();
+}
+
 bool State::isNightTime() const {
 	return (_state->progress.chapter == kChapter1
 		 || _state->progress.chapter == kChapter4
diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h
index c937fdce9f..2c484f6976 100644
--- a/engines/lastexpress/game/state.h
+++ b/engines/lastexpress/game/state.h
@@ -621,6 +621,8 @@ public:
 	State(LastExpressEngine *engine);
 	~State();
 
+	void reset();
+
 	// Accessors
 	Inventory  *getGameInventory() { return _inventory; }
 	Objects    *getGameObjects() { return _objects; }
diff --git a/engines/lastexpress/graphics.cpp b/engines/lastexpress/graphics.cpp
index e129457256..753c3a39e4 100644
--- a/engines/lastexpress/graphics.cpp
+++ b/engines/lastexpress/graphics.cpp
@@ -160,7 +160,7 @@ void GraphicsManager::mergePlanes() {
 
 void GraphicsManager::updateScreen() {
 	g_system->fillScreen(0);
-	g_system->copyRectToScreen((byte *)_screen.getBasePtr(0, 0), 640 * 2, 0, 0, 640, 480);
+	g_system->copyRectToScreen(_screen.getBasePtr(0, 0), 640 * 2, 0, 0, 640, 480);
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/helpers.h b/engines/lastexpress/helpers.h
index 7f3f1e246c..02454be13d 100644
--- a/engines/lastexpress/helpers.h
+++ b/engines/lastexpress/helpers.h
@@ -27,6 +27,8 @@
 // Misc helpers
 //////////////////////////////////////////////////////////////////////////
 
+#define LOW_BYTE(w)           ((unsigned char)(((unsigned long)(w)) & 0xff))
+
 // Misc
 #define getArchive(name) _engine->getResourceManager()->getFileStream(name)
 #define rnd(value) _engine->getRandom().getRandomNumber(value - 1)
diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp
index 250fa0f2d0..01d2634dec 100644
--- a/engines/lastexpress/lastexpress.cpp
+++ b/engines/lastexpress/lastexpress.cpp
@@ -54,18 +54,17 @@ const char *g_entityNames[] = { "Player", "Anna", "August", "Mertens", "Coudert"
 namespace LastExpress {
 
 LastExpressEngine::LastExpressEngine(OSystem *syst, const ADGameDescription *gd) :
-    Engine(syst), _gameDescription(gd),
-    _debugger(NULL), _cursor(NULL),
-    _font(NULL), _logic(NULL), _menu(NULL),
-    _frameCounter(0), _lastFrameCount(0),
+	Engine(syst), _gameDescription(gd),
+	_debugger(NULL), _random("lastexpress"), _cursor(NULL),
+	_font(NULL), _logic(NULL), _menu(NULL),
+	_frameCounter(0), _lastFrameCount(0),
 	_graphicsMan(NULL), _resMan(NULL),
 	_sceneMan(NULL), _soundMan(NULL),
 	_eventMouse(NULL), _eventTick(NULL),
-	_eventMouseBackup(NULL), _eventTickBackup(NULL),
-	_random("lastexpress")
+	_eventMouseBackup(NULL), _eventTickBackup(NULL)
 	{
 	// Setup mixer
-	syncSoundSettings();
+	Engine::syncSoundSettings();
 
 	// Adding the default directories
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp
index f1a8bebe94..c48e55bb55 100644
--- a/engines/lastexpress/menu/menu.cpp
+++ b/engines/lastexpress/menu/menu.cpp
@@ -30,6 +30,7 @@
 
 #include "lastexpress/fight/fight.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/savegame.h"
@@ -41,10 +42,8 @@
 #include "lastexpress/menu/trainline.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
@@ -865,7 +864,7 @@ void Menu::init(bool doSavegame, SavegameType type, uint32 value) {
 
 		doSavegame = false;
 	} else {
-		// TODO rename saves?
+		warning("[Menu::initGame] Renaming saves not implemented");
 	}
 
 	// Create a new savegame if needed
@@ -876,7 +875,7 @@ void Menu::init(bool doSavegame, SavegameType type, uint32 value) {
 		getSaveLoad()->saveGame(kSavegameTypeEvent2, kEntityPlayer, kEventNone);
 
 	if (!getGlobalTimer()) {
-		// TODO: remove existing savegame temp file
+		warning("[Menu::initGame] Removing temporary saves not implemented");
 	}
 
 	// Init savegame & menu values
@@ -917,13 +916,13 @@ void Menu::startGame() {
 	if (_lastIndex == _index) {
 		setGlobalTimer(0);
 		if (_index) {
-			getSaveLoad()->loadGame(_gameId);
+			getSaveLoad()->loadLastGame();
 		} else {
 			getLogic()->resetState();
 			getEntities()->setup(true, kEntityPlayer);
 		}
 	} else {
-		getSaveLoad()->loadGame(_gameId, _index);
+		getSaveLoad()->loadGame(_index);
 	}
 }
 
diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp
index ee4885e34e..1d010355ac 100644
--- a/engines/lastexpress/resource.cpp
+++ b/engines/lastexpress/resource.cpp
@@ -31,7 +31,6 @@
 
 #include "common/debug.h"
 #include "common/file.h"
-#include "common/textconsole.h"
 
 namespace LastExpress {
 
@@ -129,13 +128,10 @@ bool ResourceManager::loadArchive(const Common::String &name) {
 
 // Get a stream to file in the archive
 //  - same as createReadStreamForMember except it checks if the file exists and will assert / output a debug message if not
-Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String &name) {
+Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String &name) const {
 
 	// Check if the file exits in the archive
 	if (!hasFile(name)) {
-//#ifdef _DEBUG
-//		error("[ResourceManager::getFileStream] Cannot open file: %s", name.c_str());
-//#endif
 		debugC(2, kLastExpressDebugResource, "Error opening file: %s", name.c_str());
 		return NULL;
 	}
diff --git a/engines/lastexpress/resource.h b/engines/lastexpress/resource.h
index f2f5d63bce..90ac9b87ad 100644
--- a/engines/lastexpress/resource.h
+++ b/engines/lastexpress/resource.h
@@ -42,7 +42,7 @@ public:
 	// Loading
 	bool loadArchive(ArchiveIndex type);
 	static bool isArchivePresent(ArchiveIndex type);
-	Common::SeekableReadStream *getFileStream(const Common::String &name);
+	Common::SeekableReadStream *getFileStream(const Common::String &name) const;
 
 	// Archive functions
 	bool hasFile(const Common::String &name) const;
diff --git a/engines/lastexpress/shared.h b/engines/lastexpress/shared.h
index d60a498447..56cf730e24 100644
--- a/engines/lastexpress/shared.h
+++ b/engines/lastexpress/shared.h
@@ -80,7 +80,8 @@ enum SoundFlag {
 	kFlagMusic       = 0x5000010,
 	kFlagType3       = 0x6000000,
 	kFlagLoop        = 0x6001008,
-	kFlagType9       = 0x7000000
+	kFlagType9       = 0x7000000,
+	kFlagNIS         = 0x7002010
 };
 
 enum SoundState {
@@ -1732,62 +1733,6 @@ enum ActionIndex {
 	kActionEnd
 };
 
-//////////////////////////////////////////////////////////////////////////
-// Functors classes used by the engine
-//////////////////////////////////////////////////////////////////////////
-
-// FIXME is this achievable with the existing Functor1Mem function
-template<class Arg, class Res, class T>
-class Functor1MemConst : public Common::Functor1<Arg, Res> {
-public:
-	typedef Res (T::*FuncType)(Arg) const;
-
-	Functor1MemConst(T *t, const FuncType &func) : _t(t), _func(func) {}
-
-	bool isValid() const { return _func != 0 && _t != 0; }
-	Res operator()(Arg v1) const {
-		return (_t->*_func)(v1);
-	}
-private:
-	mutable T *_t;
-	const FuncType _func;
-};
-
-// FIXME move this to existing func.h file
-template<class Arg1, class Arg2, class Arg3, class Arg4, class Result>
-struct QuaternaryFunction {
-	typedef Arg1 FirstArgumentType;
-	typedef Arg2 SecondArgumentType;
-	typedef Arg3 ThirdArgumentType;
-	typedef Arg4 FourthArgumentType;
-	typedef Result ResultType;
-};
-
-template<class Arg1, class Arg2, class Arg3, class Arg4, class Res>
-struct Functor4 : public QuaternaryFunction<Arg1, Arg2, Arg3, Arg4, Res> {
-	virtual ~Functor4() {}
-
-	virtual bool isValid() const = 0;
-	virtual Res operator()(Arg1, Arg2, Arg3, Arg4) const = 0;
-};
-
-template<class Arg1, class Arg2, class Arg3, class Arg4, class Res, class T>
-class Functor4Mem : public Functor4<Arg1, Arg2, Arg3, Arg4, Res> {
-public:
-	typedef Res (T::*FuncType)(Arg1, Arg2, Arg3, Arg4);
-
-	Functor4Mem(T *t, const FuncType &func) : _t(t), _func(func) {}
-
-	bool isValid() const { return _func != 0 && _t != 0; }
-	Res operator()(Arg1 v1, Arg2 v2, Arg3 v3, Arg4 v4) const {
-		return (_t->*_func)(v1, v2, v3, v4);
-	}
-private:
-	mutable T *_t;
-	const FuncType _func;
-};
-
-
 } // End of namespace LastExpress
 
 #endif // LASTEXPRESS_SHARED_H
diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp
index 44cc68a57b..3d22657124 100644
--- a/engines/lastexpress/sound/entry.cpp
+++ b/engines/lastexpress/sound/entry.cpp
@@ -30,11 +30,9 @@
 #include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-#include "common/stream.h"
 
 namespace LastExpress {
 
@@ -47,6 +45,8 @@ namespace LastExpress {
 SoundEntry::SoundEntry(LastExpressEngine *engine) : _engine(engine) {
 	_type = kSoundTypeNone;
 
+	_currentDataPtr = NULL;
+
 	_blockCount = 0;
 	_time = 0;
 
@@ -71,7 +71,13 @@ SoundEntry::~SoundEntry() {
 	// Entries that have been queued will have their streamed disposed automatically
 	if (!_soundStream)
 		SAFE_DELETE(_stream);
-	delete _soundStream;
+
+	SAFE_DELETE(_soundStream);
+
+	free(_currentDataPtr);
+
+	_subtitle = NULL;
+	_stream = NULL;
 
 	// Zero passed pointers
 	_engine = NULL;
@@ -110,10 +116,8 @@ void SoundEntry::close() {
 }
 
 void SoundEntry::play() {
-	if (!_stream) {
-		warning("[SoundEntry::play] stream has been disposed");
-		return;
-	}
+	if (!_stream)
+		error("[SoundEntry::play] stream has been disposed");
 
 	// Prepare sound stream
 	if (!_soundStream)
@@ -277,7 +281,7 @@ bool SoundEntry::updateSound() {
 
 				int l = strlen(sub) + 1;
 				if (l - 1 > 4)
-					sub[l - 1 - 4] = 0;
+					sub[l - (1 + 4)] = 0;
 				showSubtitle(sub);
 			}
 		} else {
@@ -393,6 +397,10 @@ SubtitleEntry::SubtitleEntry(LastExpressEngine *engine) : _engine(engine) {
 
 SubtitleEntry::~SubtitleEntry() {
 	SAFE_DELETE(_data);
+
+	// Zero-out passed pointers
+	_sound = NULL;
+	_engine = NULL;
 }
 
 void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) {
@@ -423,6 +431,9 @@ void SubtitleEntry::loadData() {
 }
 
 void SubtitleEntry::setupAndDraw() {
+	if (!_sound)
+		error("[SubtitleEntry::setupAndDraw] Sound entry not initialized");
+
 	if (!_data) {
 		_data = new SubtitleManager(_engine->getFont());
 		_data->load(getArchive(_filename));
diff --git a/engines/lastexpress/sound/queue.cpp b/engines/lastexpress/sound/queue.cpp
index 33b4c06793..8904b48930 100644
--- a/engines/lastexpress/sound/queue.cpp
+++ b/engines/lastexpress/sound/queue.cpp
@@ -26,6 +26,7 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/entry.h"
+#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
@@ -39,6 +40,7 @@ SoundQueue::SoundQueue(LastExpressEngine *engine) : _engine(engine) {
 
 	_subtitlesFlag = 0;
 	_currentSubtitle = NULL;
+	//_soundCacheData = NULL;
 }
 
 SoundQueue::~SoundQueue() {
@@ -51,6 +53,7 @@ SoundQueue::~SoundQueue() {
 	_subtitles.clear();
 
 	_currentSubtitle = NULL;
+	//SAFE_DELETE(_soundCacheData);
 
 	// Zero passed pointers
 	_engine = NULL;
@@ -64,6 +67,8 @@ void SoundQueue::handleTimer() {
 
 	for (Common::List<SoundEntry *>::iterator i = _soundList.begin(); i != _soundList.end(); ++i) {
 		SoundEntry *entry = (*i);
+		if (entry == NULL)
+			error("[SoundQueue::handleTimer] Invalid entry found in sound queue");
 
 		// When the entry has stopped playing, we remove his buffer
 		if (entry->isFinished()) {
@@ -120,6 +125,8 @@ void SoundQueue::updateQueue() {
 
 	for (Common::List<SoundEntry *>::iterator it = _soundList.begin(); it != _soundList.end(); ++it) {
 		SoundEntry *entry = *it;
+		if (entry == NULL)
+			error("[SoundQueue::updateQueue] Invalid entry found in sound queue");
 
 		// Original removes the entry data from the cache and sets the archive as not loaded
 		// and if the sound data buffer is not full, loads a new entry to be played based on
@@ -134,7 +141,7 @@ void SoundQueue::updateQueue() {
 
 	// Original update the current entry, loading another set of samples to be decoded
 
-	getFlags()->flag_3 = 0;
+	getFlags()->flag_3 = false;
 
 	--_flag;
 }
@@ -176,6 +183,8 @@ void SoundQueue::clearQueue() {
 
 	for (Common::List<SoundEntry *>::iterator i = _soundList.begin(); i != _soundList.end(); ++i) {
 		SoundEntry *entry = (*i);
+		if (entry == NULL)
+			error("[SoundQueue::clearQueue] Invalid entry found in sound queue");
 
 		// Delete entry
 		entry->close();
@@ -340,13 +349,14 @@ void SoundQueue::updateSubtitles() {
 		return;
 	}
 
+	if (!subtitle)
+		return;
+
 	if (_subtitlesFlag & 1)
 		subtitle->drawOnScreen();
 
-	if (subtitle) {
-		subtitle->loadData();
-		subtitle->setupAndDraw();
-	}
+	subtitle->loadData();
+	subtitle->setupAndDraw();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -368,7 +378,15 @@ void SoundQueue::saveLoadWithSerializer(Common::Serializer &s) {
 			(*i)->saveLoadWithSerializer(s);
 	} else {
 		warning("[Sound::saveLoadWithSerializer] Loading not implemented");
-		s.skip(numEntries * 64);
+
+		uint32 unusedDataSize = numEntries * 64;
+		if (s.isLoading()) {
+			byte *empty = (byte *)malloc(unusedDataSize);
+			s.syncBytes(empty, unusedDataSize);
+			free(empty);
+		} else {
+			s.skip(unusedDataSize);
+		}
 	}
 }
 
diff --git a/engines/lastexpress/sound/queue.h b/engines/lastexpress/sound/queue.h
index 75fe06883a..e1f9be1cf7 100644
--- a/engines/lastexpress/sound/queue.h
+++ b/engines/lastexpress/sound/queue.h
@@ -106,7 +106,7 @@ private:
 
 	// Entries
 	Common::List<SoundEntry *> _soundList;    ///< List of all sound entries
-	void *_soundCacheData;
+	//void *_soundCacheData;
 
 	// Subtitles
 	int _subtitlesFlag;
diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp
index 2f7bb4a601..319f7cd4f4 100644
--- a/engines/lastexpress/sound/sound.cpp
+++ b/engines/lastexpress/sound/sound.cpp
@@ -33,7 +33,6 @@
 #include "lastexpress/sound/entry.h"
 #include "lastexpress/sound/queue.h"
 
-#include "lastexpress/helpers.h"
 #include "lastexpress/graphics.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
@@ -675,7 +674,7 @@ const char *SoundManager::getDialogName(EntityIndex entity) const {
 //////////////////////////////////////////////////////////////////////////
 // Letters & Messages
 //////////////////////////////////////////////////////////////////////////
-void SoundManager::readText(int id){
+void SoundManager::readText(int id) {
 	if (!_queue->isBuffered(kEntityTables4))
 		return;
 
@@ -1330,23 +1329,23 @@ void SoundManager::playLoopingSound(int param) {
 					}
 				} else {
 					switch (getEntityData(kEntityPlayer)->car) {
-					case 1:
-					case 6:
+					case kCarBaggageRear:
+					case kCarBaggage:
 						partNumber = 4;
 						break;
-					case 2:
-					case 3:
-					case 4:
-					case 5:
+					case kCarKronos:
+					case kCarGreenSleeping:
+					case kCarRedSleeping:
+					case kCarRestaurant:
 						partNumber = 1;
 						break;
-					case 7:
+					case kCarCoalTender:
 						partNumber = 5;
 						break;
-					case 8:
+					case kCarLocomotive:
 						partNumber = 99;
 						break;
-					case 9:
+					case kCar9:
 						partNumber = 3;
 						break;
 					default:
@@ -1357,13 +1356,13 @@ void SoundManager::playLoopingSound(int param) {
 			}
 
 			if (partNumber != 99)
-				sprintf(tmp, "LOOP%d%c.SND", partNumber, _engine->getRandom().getRandomNumber(numLoops[partNumber] - 1) + 'A');
+				sprintf(tmp, "LOOP%d%c.SND", partNumber, (char)(_engine->getRandom().getRandomNumber(numLoops[partNumber] - 1) + 'A'));
 		}
 
 		if (getFlags()->flag_3)
 			fnameLen = 5;
 
-		if (!entry || scumm_strnicmp(entry->getName2().c_str(), tmp, fnameLen)) {
+		if (!entry || scumm_strnicmp(entry->getName2().c_str(), tmp, (uint)fnameLen)) {
 			_loopingSoundDuration = _engine->getRandom().getRandomNumber(319) + 260;
 
 			if (partNumber != 99) {