diff --git a/constants.asm b/constants.asm
index 8a6322f..ee47917 100644
--- a/constants.asm
+++ b/constants.asm
@@ -7,6 +7,8 @@
 ;===================================================================================
 TankColoursTable        .BYTE $86,$46,$c6,$28,$c6,$ee
 TankStatusColoursTable  .BYTE $80,$40,$c4,$20,$c0,$e4
+TankShapesTable			.BYTE char_tank1___________,char_tank2___________,char_tank3___________
+						.BYTE char_tank1___________,char_tank2___________,char_tank3___________
 dliColorsBack
     :10 .by $02,$00
 dliColorsFore
diff --git a/grafproc.asm b/grafproc.asm
index 0058d68..065c9c7 100644
--- a/grafproc.asm
+++ b/grafproc.asm
@@ -631,12 +631,7 @@ No6thTankHide
 SkipHidingPM
 
 
-	ldy #char_tank2___________	; left tank
-	txa
-	and #$01
-	beq FirstTankShape
-	ldy #char_tank3___________	; left tank (second shape)
-FirstTankShape	
+	ldy TankShapesTable,x
     lda AngleTable,x
 	cmp #91		; left or right tank shape
 	bcs LeftTank
@@ -1999,7 +1994,7 @@ YangleUnder90
     ; 2. add vx and vy to 3 byte variables xdraw.fx, ydraw.fy
     ; 3 check length, if shorter, go to 1.
     
-    mva #5 yc  ; barrel length
+    mva #6 yc  ; barrel length
 barrelLoop
     
     lda goleft
diff --git a/scorch.xex b/scorch.xex
index 654586c..aa117c6 100644
Binary files a/scorch.xex and b/scorch.xex differ