diff --git a/Java/Fibonacci_no.java b/Java/Fibonacci_no.java
index ce1ccfc..e701ff7 100644
--- a/Java/Fibonacci_no.java
+++ b/Java/Fibonacci_no.java
@@ -2,22 +2,25 @@
 //  Take as input "n", the count of fibonacci numbers to print.
 //  Print first n fibonacci numbers
 
-import java.util.*;
+import java.util.Scanner;
 
 public class Fibonacci_no {
 
   public static void main(String[] args) {
     Scanner scn = new Scanner(System.in);
+	System.out.print("Enter a number: ");
     int n = scn.nextInt();
     scn.close();
-    int a = 0;
-    int b = 1;
-    for (int i = 0; i < n; i++) {
-      System.out.println(a);
-      int c = a + b;
-      a = b;
-      b = c;
 
-    }
+	// the factorial of 0 and 1 is 0 by default
+	if(n==0||n==1){
+		System.out.println("Factorial of "+n+" is: "+0);
+		return; // the main function will return and program will exit
+	}
+    int fact = 1;
+	for(int i = 1; i < n;i++){
+		fact = fact + (fact*i);
+	}
+	System.out.println("Factorial of "+n+" is: "+fact);
   }
-}
\ No newline at end of file
+}