diff --git a/src/Course.java b/src/Course.java
new file mode 100644
index 0000000..67d8243
--- /dev/null
+++ b/src/Course.java
@@ -0,0 +1,21 @@
+package ru.gorshckov;
+
+public class Course {
+
+    private Obstacle [] obstacles;
+    protected Animal [] members;
+
+
+    public Course(Obstacle[] obstacles, Animal[] members) {
+        this.obstacles = obstacles;
+        this.members = members;
+    }
+
+    public void doIt(Team team) {
+        for (Obstacle o:obstacles) {
+            for (Animal a:members) {
+                o.doIt(a);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Main.java b/src/Main.java
index 3740df5..cbb7a1a 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,24 +1,40 @@
-public class Main {
-    public static void main(String[] args) {
-        Animal[] animals = {
-                new Cat(5, 3),
-                new Dog(5, 10, 2),
-                new Duck(3, 10)
-        };
-
-        Obstacle[] obstacles = {new Road(8), new Water(3), new Wall(3)};
-
-        for (Obstacle ob : obstacles) {
-            for (Animal al2 : animals) {
-                ob.doIt(al2);
-            }
-        }
-
-
-        for (Animal al2 : animals) {
-            System.out.println(al2.getName() + " on distance " + al2.isOnDistance());
-        }
-
-    }
-
-}
+package ru.gorshckov;
+public class Main {
+
+    
+    public static void main(String[] args) {
+
+        Obstacle[] obstacles = {new Road(2), new Water(3), new Wall(3)};
+
+        Animal[] animals1 = {new Cat(4, 3),
+                             new Dog(5, 11, 2),
+                             new Duck(6, 10)};
+
+        Animal[] animals2 = {new Cat(40, 3),
+                             new Cat(5, 100),
+                              new Duck(60, 10)};
+
+
+        Course course = new Course(obstacles,animals1);
+
+        Team team1 = new Team("snow",animals1);
+
+        Team team2 = new Team ("rain",animals2);
+
+        team1.showAllMembers();
+        course.doIt(team1);
+        team1.showResult();
+
+        System.out.println("========");
+
+        team2.showAllMembers();
+        course.doIt(team2);
+        team2.showResult();
+
+
+
+    }
+
+
+
+}
diff --git a/src/Team.java b/src/Team.java
new file mode 100644
index 0000000..a3bab57
--- /dev/null
+++ b/src/Team.java
@@ -0,0 +1,28 @@
+package ru.gorshckov;
+
+public class Team {
+
+    private String nameTeam;
+    private Animal [] members;
+
+
+    public Team(String nameTeam, Animal[] animals) {
+        this.nameTeam = nameTeam;
+        this.members = animals;
+    }
+
+    public void showResult (){
+
+        for (Animal al2 : members) {
+            System.out.println(al2.getName() + " on distance " + al2.isOnDistance());
+        }
+    }
+
+    public void showAllMembers(){
+        System.out.println("Team name - "+ nameTeam);
+        for (Animal a :members) {
+            System.out.println(a.name);
+        }
+    }
+
+}
diff --git a/src/Water.java b/src/Water.java
index 5d20dd4..e99800c 100644
--- a/src/Water.java
+++ b/src/Water.java
@@ -7,8 +7,6 @@ protected Water(int size) {
     public void doIt(Animal a) {
         if (a instanceof Swimable) {
             ((Swimable) a).swim(size);
-        } else {
-            a.setOnDistance(false);
-        }
+        } 
     }
 }