diff --git a/src/HW8/BattleMap.java b/src/HW8/BattleMap.java
index 7af8317..752336b 100644
--- a/src/HW8/BattleMap.java
+++ b/src/HW8/BattleMap.java
@@ -4,6 +4,8 @@
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Line2D;
 
 public class BattleMap extends JPanel {
     private GameWindow gameWindow;
@@ -20,7 +22,7 @@ public class BattleMap extends JPanel {
 
     public BattleMap(GameWindow gameWindow) {
         this.gameWindow = gameWindow;
-        setBackground(Color.ORANGE);
+        setBackground(Color.lightGray);
 
         addMouseListener(new MouseAdapter() {
             @Override
@@ -35,14 +37,10 @@ public void mouseReleased(MouseEvent e) {
     private void mouseReleasedUpdate(MouseEvent e) {
         int cellX = e.getX() / cellWidth;
         int cellY = e.getY() / cellHeight;
-
         if(!Logic.gameFinished){
             Logic.setHumanCoords(cellX, cellY);
         }
-
-
         System.out.printf("cellX: %d  cellY: %d \n", cellX, cellY);
-
         repaint();
     }
 
@@ -54,6 +52,7 @@ protected void paintComponent(Graphics g) {
 
     private void render(Graphics g) {
         if (!isInit) {
+            drawTitle(g);
             return;
         }
 
@@ -78,20 +77,61 @@ private void render(Graphics g) {
             for (int j = 0; j < Logic.SIZE; j++) {
                 if(Logic.map[i][j]==Logic.DOT_X){
                     drawX(g, j, i);
+                } else if (Logic.map[i][j]==Logic.DOT_O) {
+                    drawO(g, j, i);
                 }
             }
         }
+        if (Logic.checkWinLines(Logic.DOT_X)) {
+            drawWin(g, "YOU WIN!!!");
+        } else if (Logic.checkWinLines(Logic.DOT_O)) {
+            drawWin(g, "YOU LOSE");
+        } else if (Logic.isFull()) {
+            drawWin(g, "!!!!DRAW!!!!");
+        }
+    }
 
+    private void drawWin(Graphics g, String message) {
+        Graphics2D g2 = (Graphics2D)g;
+        g2.setColor(Color.white);
+        g2.setComposite(AlphaComposite.SrcOver.derive(0.7f));
+        g2.fillRect(0, 0, this.getWidth(), this.getHeight());
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setColor(Color.red);
+        g2.setComposite(AlphaComposite.SrcOver.derive(1f));
+        g2.setFont(new Font("Arial", Font.BOLD, 90));
+        g2.drawString(message,this.getWidth() * 0.02f, this.getHeight() / 2f + 50);
+    }
 
-
+    private void drawTitle(Graphics g) {
+        Graphics2D g2 = (Graphics2D)g;
+        g2.setColor(Color.black);
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setFont(new Font("Arial", Font.BOLD, 72));
+        g2.drawString("TIC TAC TOE",this.getWidth()*0.05f, this.getHeight() / 2f);
     }
 
     private void drawX(Graphics g, int cellX, int cellY) {
-//        g = (Graphics2D)g;
+        float sizeFactor = 30f;
+        Graphics2D g2 = (Graphics2D)g;
+        g2.setColor(Color.red);
+        g2.setStroke(new BasicStroke(10));
+        g2.draw(new Line2D.Float(cellX * cellWidth + sizeFactor, cellY * cellHeight + sizeFactor,
+                (cellX + 1) * cellWidth - sizeFactor, (cellY + 1) * cellHeight - sizeFactor));
+        g2.draw(new Line2D.Float((cellX + 1) * cellWidth - sizeFactor, cellY * cellHeight + sizeFactor,
+                cellX * cellWidth + sizeFactor, (cellY + 1) * cellHeight - sizeFactor));
+    }
 
-        g.setColor(Color.red);
-        g.drawLine(cellX * cellWidth, cellY * cellHeight,
-                (cellX + 1) * cellWidth, (cellY + 1) * cellHeight);
+    private void drawO(Graphics g, int cellX, int cellY) {
+        float coordFactor = 0.18f;
+        float sizeFactor = 0.65f;
+        Graphics2D g2 = (Graphics2D)g;
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setColor(Color.blue);
+        g2.setStroke(new BasicStroke(10));
+        Ellipse2D.Double circle = new Ellipse2D.Double(cellX * cellWidth + cellWidth * coordFactor,
+                cellY * cellHeight + cellHeight * coordFactor, cellWidth * sizeFactor, cellHeight * sizeFactor);
+        g2.draw(circle);
     }