diff --git a/Exercise_03/Exercise_03_15/Exercise_03_15.java b/Exercise_03/Exercise_03_15/Exercise_03_15.java
index ebc4415e..c691fb31 100755
--- a/Exercise_03/Exercise_03_15/Exercise_03_15.java
+++ b/Exercise_03/Exercise_03_15/Exercise_03_15.java
@@ -30,18 +30,31 @@ public static void main(String[] args) {
 
 		// Extract digits from guess
 		int guessDigit1 = guess / 100;
-		int remainingDigits = guess % 100;
+		remainingDigits = guess%100;
 		int guessDigit2 = remainingDigits / 10;
 		int guessDigit3 = remainingDigits % 10;
 
+		
 		System.out.println("The lottery number is " + lottery);
-
+		
 		// 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)||
+				(guessDigit1==lotteryDigit2 && guessDigit2==lotteryDigit1 && guessDigit3==lotteryDigit3)||
+				(guessDigit1==lotteryDigit3 && guessDigit2==lotteryDigit1 && guessDigit3==lotteryDigit2)||
+				(guessDigit1==lotteryDigit3 && guessDigit2==lotteryDigit2 && guessDigit3==lotteryDigit1)||
+				(guessDigit1==lotteryDigit1 && guessDigit2==lotteryDigit3 && guessDigit3==lotteryDigit2))
+				{
+					System.out.println("Match all digits: you win $3,000");
+				}
+		else if(guessDigit1==lotteryDigit1||guessDigit1==lotteryDigit2||guessDigit1==lotteryDigit3||
+				guessDigit2==lotteryDigit2||guessDigit2==lotteryDigit1||guessDigit2==lotteryDigit3||
+				guessDigit3==lotteryDigit3||guessDigit3==lotteryDigit1||guessDigit3==lotteryDigit2)
+				{
+					System.out.println("Match one digit: you win $1,000");
+				}
+		else
+			System.out.println("Sorry,no match");
 	}
 }
\ No newline at end of file