diff --git a/makefile.gfx b/makefile.gfx
index 6d6efe492..5dc248de3 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -44,15 +44,26 @@ LEVELS_OUT_DIR :=			$(DATA_OUT)/levels
 
 LEVELS_CHAPTERS :=			CHAPTER01 CHAPTER02 CHAPTER03 CHAPTER04 CHAPTER05
 LEVELS_CHAPTER01 :=			
-LEVELS_CHAPTER02 :=			 
-LEVELS_CHAPTER03 :=			LEVEL02
+LEVELS_CHAPTER01_LEVEL01 :=
+
+LEVELS_CHAPTER02 :=			LEVEL04
+LEVELS_CHAPTER02_LEVEL04 :=	01
+
+LEVELS_CHAPTER03 :=			
+
 LEVELS_CHAPTER04 :=			
+
 LEVELS_CHAPTER05 :=			
 
-LEVELS_OUT_DIRS :=			$(foreach CHAPTER,$(LEVELS_CHAPTERS),$(foreach LEVEL,$(LEVELS_$(CHAPTER)), $(LEVELS_OUT_DIR)/$(CHAPTER)/$(LEVEL) ))
-LEVELS_IN :=				$(foreach CHAPTER,$(LEVELS_CHAPTERS),$(foreach LEVEL,$(LEVELS_$(CHAPTER)), $(CHAPTER)/$(LEVEL)/$(LEVEL) ))
 
-LEVELS_OUT :=				$(foreach LEVEL,$(LEVELS_IN),$(LEVELS_OUT_DIR)/$(LEVEL).lvl)
+LEVELS_OUT_DIRS :=			$(foreach CHAPTER,$(LEVELS_CHAPTERS),$(foreach LEVEL,$(LEVELS_$(CHAPTER)), $(LEVELS_OUT_DIR)/$(CHAPTER)/$(LEVEL) ))
+ALL_LEVELS :=				$(foreach CHAPTER, $(LEVELS_CHAPTERS), \
+								$(foreach LEVEL, $(LEVELS_$(CHAPTER)), \
+									$(foreach SUBLEVEL, $(LEVELS_$(CHAPTER)_$(LEVEL)), \
+										$(CHAPTER)/$(LEVEL)/$(LEVEL)$(SUBLEVEL) )))
+
+ALL_LEVELS_IN :=				$(foreach LEVEL,$(ALL_LEVELS),$(LEVELS_IN_DIR)/$(LEVEL).pme)
+ALL_LEVELS_OUT :=				$(foreach LEVEL,$(ALL_LEVELS),$(LEVELS_OUT_DIR)/$(LEVEL).lvl)
 
 levels : $(LEVELS_OUT)
 
@@ -60,11 +71,16 @@ cleanlevels :
 	@$(RM) -f $(LEVELS_OUT)
 	@$(ECHO) Cleaned levels
 
+# $(ALL_LEVELS_OUT) : $(ALL_LEVELS__IN)
+#	$(MKLEVEL) $(ALL_LEVELS__IN) -o:$(LEVELS_OUT_DIR)/LEVEL04 -t:24,1,1
+
 $(LEVELS_OUT_DIR)/%.lvl : $(LEVELS_IN_DIR)/%.pme
 	@$(ECHO) Building $< $@
-	@$(MKLEVEL) $< -o:$(dir $(basename $@)) $(LEVELS_OPTS)
+	$(MKLEVEL) $< -o:$@ $(LEVELS_OPTS)
+#	$(MKLEVEL) $< -o:$(dir $(basename $@))/level04.tex $(LEVELS_OPTS)
+
+GFX_DATA_OUT +=	$(ALL_LEVELS_OUT)
 
-GFX_DATA_OUT +=	$(LEVELS_OUT)
 
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp
index dbe0d69a1..3cd2f235c 100644
--- a/source/level/layertile.cpp
+++ b/source/level/layertile.cpp
@@ -29,7 +29,6 @@ CLayerTile::CLayerTile(sLayerHdr *Hdr,sTile *_TileList,sTri *_TriList,sQuad *_Qu
 		Map=(sTileMapElem*)MakePtr(Hdr,sizeof(sLayerHdr));
 		MapWidth=LayerHdr->Width;
 		MapHeight=LayerHdr->Height;
-
 }
 
 /*****************************************************************************/
diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp
index af843de2f..49d9752d7 100644
--- a/source/level/layertile3d.cpp
+++ b/source/level/layertile3d.cpp
@@ -57,6 +57,7 @@ int		Size=Width*Height;
 			}
 		}
 		UpdateWholeMap();		
+		CreateRenderFlagTable();
 
 }
 
@@ -66,8 +67,44 @@ void	CLayerTile3d::shutdown()
 }
 
 /*****************************************************************************/
+void	CLayerTile3d::CreateRenderFlagTable()
+{
+s16		*Ptr;
+
+		RenderFlagTable=(s16*) MemAlloc(SCREEN_TILE_WIDTH*SCREEN_TILE_HEIGHT*sizeof(s32),"RenderFlagTable");
+		Ptr=RenderFlagTable;
+
+		for (int Y=0; Y<SCREEN_TILE_HEIGHT; Y++)
+		{
+			for (int X=0; X<SCREEN_TILE_WIDTH; X++)
+			{
+				s16	Flag=1<<TILE3D_FLAGS_F;
+				if (X<(SCREEN_TILE_WIDTH/2)+1) 
+				{
+					Flag|=1<<TILE3D_FLAGS_R;
+				}
+				if (X>(SCREEN_TILE_WIDTH/2)-1) 
+				{
+					Flag|=1<<TILE3D_FLAGS_L;
+				}
+				if (Y<(SCREEN_TILE_HEIGHT/2)+1) 
+				{
+					Flag|=1<<TILE3D_FLAGS_D;
+				}
+				if (Y>(SCREEN_TILE_HEIGHT/2)-1) 
+				{
+					Flag|=1<<TILE3D_FLAGS_U;
+				}
+				*Ptr++=Flag;
+			}
+
+		}
+}
+
 /*****************************************************************************/
 /*****************************************************************************/
+/*****************************************************************************/
+
 // Get (wrapped) PrimGrid pos
 sPrimGridElem3d	*CLayerTile3d::GetGridPos3d(int X,int Y)
 {
@@ -145,6 +182,7 @@ sTileMapElem3d	*MapPtr=GetMapPos3d(X,Y);
 /*****************************************************************************/
 /*****************************************************************************/
 #define	BLOCK_MULT	16
+
 void	CLayerTile3d::render()
 {
 sPrimGridElem3d	*Grid=GetGridPos3d(MapX,MapY);
@@ -152,11 +190,14 @@ s16				TileX,TileY;
 VECTOR			BlkPos;
 s32				BlkXStore;
 sOT				*ThisOT=OtPtr+LayerOT;
+s16				*RenderFlags=RenderFlagTable;
+
 
 // Setup shift bits of pos
 		TileY=-ShiftY;
 		BlkPos.vx=((-15*TILE_WIDTH)-ShiftX)*BLOCK_MULT;
-		BlkPos.vy=((-8*TILE_HEIGHT)-ShiftY)*BLOCK_MULT;
+//		BlkPos.vy=((-8*TILE_HEIGHT)-ShiftY)*BLOCK_MULT;
+		BlkPos.vy=((-7*TILE_HEIGHT)-ShiftY)*BLOCK_MULT;
 		BlkXStore=BlkPos.vx;
 
 // Render it!!
@@ -177,11 +218,12 @@ sOT				*ThisOT=OtPtr+LayerOT;
 				if (Grid->Flags)
 				{ // Has 3d Data
 /**/				CMX_SetTransMtxXY(&BlkPos);
-/**/				RenderBlock(Grid);
+/**/				RenderBlock(Grid,*RenderFlags);
 				}
 				Grid=(sPrimGridElem3d *)Grid->Right;
 				TileX+=TILE_WIDTH;
 				BlkPos.vx+=TILE_WIDTH*BLOCK_MULT;
+				RenderFlags++;
 			}
 			Grid=(sPrimGridElem3d *)GridDown;
 			TileY+=TILE_HEIGHT;
@@ -196,10 +238,10 @@ sOT				*ThisOT=OtPtr+LayerOT;
 // NOTE: Tiles are split into facing strips, to reduce overdraw :o)
 // NOTE: Matrix already setup for block
 
-void	CLayerTile3d::RenderBlock(sPrimGridElem3d *Elem)
+void	CLayerTile3d::RenderBlock(sPrimGridElem3d *Elem,s16 RenderFlags)
 {
 sTile		*Tile=&TileList[Elem->Tile];
-u32			Flags=Elem->Flags;
+u32			Flags=Elem->Flags & RenderFlags;
 sVtx		*P0,*P1,*P2;
 POLY_FT3	*TPrimPtr=(POLY_FT3*)GetPrimPtr();
 u16			*TileTable=Tile->TileTable;
@@ -207,8 +249,11 @@ u32			T0,T1,T2;
 sTri		*TList=TriList+Tile->TriStart;
 sOT			*ThisOT=OtPtr+LayerOT;
 
-//--- Tris ---------------------------------------------------------------------------
+			Flags=0xff & RenderFlags;
+//			Flags=0xff;// & RenderFlags;
 
+//--- Tris ---------------------------------------------------------------------------
+			
 			for (int i=0; i<TILE3D_FLAGS_MAX; i++)
 			{
 				int		TriCount=*TileTable++;		// Get Tri Count
diff --git a/source/level/layertile3d.h b/source/level/layertile3d.h
index c443ad41f..7c6e74432 100644
--- a/source/level/layertile3d.h
+++ b/source/level/layertile3d.h
@@ -18,13 +18,16 @@ public:
 		void			render();
 
 protected:
+		void			CreateRenderFlagTable();
 		void			UpdateRow(int MapX,int MapY);
 		void			UpdateColumn(int MapX,int MapY);
 
 		sPrimGridElem3d	*GetGridPos3d(int X,int Y);
 		sTileMapElem3d	*GetMapPos3d(int X,int Y);
 
-		void	RenderBlock(sPrimGridElem3d *Elem);
+		void			RenderBlock(sPrimGridElem3d *Elem,s16 RenderFlags);
+
+		s16				*RenderFlagTable;
 
 };
 
diff --git a/tools/Data/bin/MkLevel.exe b/tools/Data/bin/MkLevel.exe
index 7f59ad370..4244709b9 100644
Binary files a/tools/Data/bin/MkLevel.exe and b/tools/Data/bin/MkLevel.exe differ