diff --git a/CMT.cpp b/CMT.cpp
index dbe76ce54..ef4c8e6ae 100644
--- a/CMT.cpp
+++ b/CMT.cpp
@@ -268,6 +268,15 @@ int _tmain(int argc, _TCHAR* argv[])
 
 		cgi->townh = new CTownHandler;
 		cgi->townh->loadNames();
+
+		CAbilityHandler * abilh = new CAbilityHandler;
+		abilh->loadAbilities();
+		cgi->abilh = abilh;
+		CHeroHandler * heroh = new CHeroHandler;
+		heroh->loadHeroes();
+		heroh->loadPortraits();
+		cgi->heroh = heroh;
+
 		THC std::cout<<"Loading .lods: "<<tmh.getDif()<<std::endl;
 		CPreGame * cpg = new CPreGame(); //main menu and submenus
 		THC std::cout<<"Initialization CPreGame (together): "<<tmh.getDif()<<std::endl;
@@ -311,13 +320,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		CCreatureHandler * creh = new CCreatureHandler;
 		creh->loadCreatures();
 		cgi->creh = creh;
-		CAbilityHandler * abilh = new CAbilityHandler;
-		abilh->loadAbilities();
-		cgi->abilh = abilh;
-		CHeroHandler * heroh = new CHeroHandler;
-		heroh->loadHeroes();
-		heroh->loadPortraits();
-		cgi->heroh = heroh;
+
 		CSpellHandler * spellh = new CSpellHandler;
 		spellh->loadSpells();
 		cgi->spellh = spellh;
diff --git a/CPreGame.cpp b/CPreGame.cpp
index 0b539eb65..612cb35cf 100644
Binary files a/CPreGame.cpp and b/CPreGame.cpp differ
diff --git a/CPreGame.h b/CPreGame.h
index 9ff35a56c..1440948f3 100644
--- a/CPreGame.h
+++ b/CPreGame.h
@@ -60,7 +60,7 @@ class Options : public PreGameTab
 		PlayerOptions(int serial, int player);
 		Ecolor color;
 		//SDL_Surface * bg;
-		OptionSwitch left, right;
+		OptionSwitch left, right, Hleft, Hright;
 		int nr;
 	};
 public:
diff --git a/global.h b/global.h
index 066c99de2..e3336a6ee 100644
--- a/global.h
+++ b/global.h
@@ -19,6 +19,7 @@ enum ElossCon {lossCastle, lossHero, timeExpires, lossStandard=255};
 
 const int F_NUMBER = 9; //factions quantity
 const int PLAYER_LIMIT = 8; //player limit per map
+const int HEROES_PER_TYPE=8; //amount of heroes of each type
 
 #define DEFBYPASS
 #endif //GLOBAL_H
\ No newline at end of file