diff --git a/app/src/main/java/com/example/myapp/Question.kt b/app/src/main/java/com/example/myapp/Question.kt
index 209aebb..a29ec75 100644
--- a/app/src/main/java/com/example/myapp/Question.kt
+++ b/app/src/main/java/com/example/myapp/Question.kt
@@ -1,5 +1,7 @@
 package com.example.myapp
 
+import java.util.*
+
 /**
  * Created by rohitramaswamy on 11/07/17.
  */
@@ -7,12 +9,13 @@ class Question
 {
 	var number=1
 	var answer = false
-	var mod = 1
+	private var mod = 1
+	private val bound = 1234
 	
 	constructor()
 	{
 		this.mod = 103
-		this.number = ((12345*152+1) % mod).toInt()
+		this.number = getRandomNumber()
 	}
 	
 	fun setAnswer(): Boolean
@@ -24,14 +27,19 @@ class Question
 			{
 				return false
 			}
-			sq--;
+			sq--
 		}
 		return true
 	}
 	
 	fun getNextQuestion()
 	{
-		this.number = ( this.number + 12345*152+1)%mod
+		this.number = getRandomNumber()
 		this.answer = setAnswer()
 	}
+
+	private fun getRandomNumber(): Int
+	{
+		return  Random().nextInt(bound)
+	}
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a8738db..b1cde25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.3-2'
+    ext.kotlin_version = '1.1.50'
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8697f4f..6101433 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 10 23:12:14 IST 2017
+#Thu Oct 26 21:10:32 BRST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip