diff --git a/Proov1.class b/Proov1.class
new file mode 100644
index 0000000..2e1ede0
Binary files /dev/null and b/Proov1.class differ
diff --git a/Proov1.java b/Proov1.java
index 2a89609..f30a3b6 100644
--- a/Proov1.java
+++ b/Proov1.java
@@ -1,12 +1,16 @@
 public class Proov1{
 	public static void main(String[] args){
-		Ristkylik laud1=new Ristkylik(2, 1);
-		Ristkylik laud2=new Ristkylik(1.5, 1);
-		Ristkylik laud3=new Ristkylik(2, 1.5);
-		System.out.println(laud1.pindala()+" "+laud1.ymberm66t());
-		System.out.println(laud2.pindala());
-		System.out.println(laud3.pindala());
-		System.out.println(laud1);
-		System.out.println(laud2.toString());
+		Ring Ratas1=new Ring(5);
+		Ring Ratas2=new Ring(10);
+		System.out.println(Ratas1.pindala()+" "+Ratas1.ümbermõõt());
+		System.out.println(Ratas2.pindala()+" "+Ratas2.ümbermõõt());
+		System.out.println(Ratas1.Vastus());
+		System.out.println(Ratas2.Vastus());
 	}
-}
\ No newline at end of file
+}
+
+//[georvalg@greeny t02klass]$ java Proov1
+//78.5 31.400000000000002
+//314.0 62.800000000000004
+//Ringi raadiusega 5.0 ümbermõõt on 31.400000000000002 ja pindala on 78.5.
+//Ringi raadiusega 10.0 ümbermõõt on 62.800000000000004 ja pindala on 314.0.
\ No newline at end of file
diff --git a/Ring.class b/Ring.class
new file mode 100644
index 0000000..7be72fa
Binary files /dev/null and b/Ring.class differ
diff --git a/Ring.java b/Ring.java
new file mode 100644
index 0000000..0902685
--- /dev/null
+++ b/Ring.java
@@ -0,0 +1,18 @@
+public class Ring{
+	double r;
+	public Ring(double raadius){
+		if(raadius<=0){throw new RuntimeException("Sobimatu pikkus");}
+		r=raadius;
+	}
+	public double pindala(){
+		return (3.14*r*r);
+	}
+
+	public double ümbermõõt(){
+		return 2*3.14*r;
+	}
+	public String Vastus(){
+		return "Ringi raadiusega "+r+" ümbermõõt on "+
+		       ümbermõõt()+" ja pindala on "+pindala()+".";
+	}
+}
\ No newline at end of file
diff --git a/Ristkylik.java b/Ristkylik.java
deleted file mode 100644
index 9da2e76..0000000
--- a/Ristkylik.java
+++ /dev/null
@@ -1,20 +0,0 @@
-public class Ristkylik{
-	double a, b;
-	public Ristkylik(double pikkus, double laius){
-		if(pikkus<=0){throw new RuntimeException("Sobimatu pikkus");}
-		if(laius <=0){throw new RuntimeException("Sobimatu laius");}
-		a=pikkus;
-		b=laius;
-	}
-	public double pindala(){
-		return a*b;
-	}
-	//lisage funktsioon ristkyliku ymberm66du arvutamiseks
-	public double ymberm66t(){
-		return a+b+a+b;
-	}
-	public String toString(){
-		return "Ristkylik "+a+"x"+b+"m, ymberm66t "+
-		       ymberm66t()+"m, pindala "+pindala()+" ruutmeetrit.";
-	}
-}
\ No newline at end of file