diff --git a/Exercise_03/Exercise_03_15/Exercise_03_15.java b/Exercise_03/Exercise_03_15/Exercise_03_15.java
index ebc4415e..558af125 100755
--- a/Exercise_03/Exercise_03_15/Exercise_03_15.java
+++ b/Exercise_03/Exercise_03_15/Exercise_03_15.java
@@ -39,9 +39,36 @@ public static void main(String[] args) {
 		// Check the guess
 		if (guess == lottery)
 			System.out.println("Exact match: you win $10,000");
-		if (guessDigit1 == lotteryDigit2)
+		else if( guessDigit1 == lotteryDigit2 && guessDigit2 == lotteryDigit3 && guessDigit3 == lotteryDigit1 )
 		{
-
+			System.out.println("digits match, but different order: you win $1,000");
+			}
+	
+	else if( guessDigit1 == lotteryDigit3 && guessDigit2 == lotteryDigit1 && guessDigit3 == lotteryDigit2 )
+		{
+			System.out.println("digits match, but different order: you win $3,000");
+			}
+	else if( guessDigit1 == lotteryDigit3 && guessDigit2 == lotteryDigit2 && guessDigit3 == lotteryDigit1 )
+		{
+			System.out.println("digits match, but different order: you win $3,000");
+			}
+	else if( guessDigit1 == lotteryDigit1 && guessDigit2 == lotteryDigit3 && guessDigit3 == lotteryDigit2 )
+		{
+			System.out.println("digits match, but different order: you win $3,000");
+			}
+	else if( guessDigit1 == lotteryDigit2 && guessDigit2 == lotteryDigit1 && guessDigit3 == lotteryDigit3 )
+		{
+			System.out.println("digits match, but different order: you win $3,000");
+			}
+	else if (guessDigit1 == lotteryDigit2 || guessDigit1 == lotteryDigit1 || guessDigit1 == lotteryDigit3 || 
+			guessDigit2 == lotteryDigit2 || guessDigit2 == lotteryDigit1 
+			|| guessDigit2 == lotteryDigit3 || guessDigit3 == lotteryDigit2 || guessDigit3 == lotteryDigit1 
+			|| guessDigit3 == lotteryDigit3)
+	   {
+		System.out.println("One digit match: you win $1,000");
 		}
+	
+		else
+		  System.out.println("No match : Sorry you don't win anything."); 
 	}
-}
\ No newline at end of file
+}