diff --git a/Circle.class b/Circle.class
new file mode 100644
index 0000000..733ca5b
Binary files /dev/null and b/Circle.class differ
diff --git a/Circle.java b/Circle.java
new file mode 100644
index 0000000..157efb4
--- /dev/null
+++ b/Circle.java
@@ -0,0 +1,23 @@
+import java.lang.Math;
+
+public class Circle {
+	double a;
+	public Circle(double radius) {
+		if (radius <= 0) {throw new RuntimeException("Radius cannot be smaller than 0");}
+		a = radius;
+	}
+
+	public double area() {
+		return Math.round(3.14 * a * a);
+	}
+
+	public double circumference() {
+		return Math.round(2 * 3.14 * a);
+	}
+
+	public String toString() {
+		return "Circle with radius of " + a + " has the area of "
+		+ area() + " and the circumference of " + circumference() + " units.";
+	}
+
+}
diff --git a/Proov1.class b/Proov1.class
new file mode 100644
index 0000000..15216d6
Binary files /dev/null and b/Proov1.class differ
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
diff --git a/circleTest.class b/circleTest.class
new file mode 100644
index 0000000..fa67f16
Binary files /dev/null and b/circleTest.class differ
diff --git a/circleTest.java b/circleTest.java
new file mode 100644
index 0000000..f9a134a
--- /dev/null
+++ b/circleTest.java
@@ -0,0 +1,12 @@
+public class circleTest {
+	public static void main(String[] args) {
+		Circle table1 = new Circle(145);
+		Circle wheel = new Circle(40);
+		Circle glass = new Circle(2.4);
+		System.out.println(table1.area() + " " + table1.circumference());
+		System.out.println(wheel.area());
+		System.out.println(glass.area());
+		System.out.println(table1);
+		System.out.println(wheel.toString());
+	}
+}