diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index ea7332b2..607d70b2 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -29,7 +29,8 @@ class BookingController extends Controller
             // set timeout 
             $date1 = new DateTime($booking->created_at);
             $date2 = new DateTime();
-            $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U'));
+            $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
+            $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
             $booking->timeout = $difference_in_seconds;  
 
             // TODO : you can make it better
@@ -79,7 +80,8 @@ class BookingController extends Controller
 				// set timeout 
 				$date1 = new DateTime($booking->created_at);
 				$date2 = new DateTime();
-				$difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U'));
+				$time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
+				$difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
 				$booking->timeout = $difference_in_seconds;  
 
 				// TODO : you can make it better
diff --git a/app/SettingCredit.php b/app/SettingCredit.php
index 872fec8e..5d567ab3 100644
--- a/app/SettingCredit.php
+++ b/app/SettingCredit.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class SettingCredit extends Model
 {
-    protected $fillable = ['rmb_credit_limit','usd_credit_limit'];
+    protected $fillable = ['rmb_credit_limit','usd_credit_limit','time_limit'];
 }
diff --git a/database/factories/SettingCreditFactory.php b/database/factories/SettingCreditFactory.php
index 2eb3fafc..f1d4eeba 100644
--- a/database/factories/SettingCreditFactory.php
+++ b/database/factories/SettingCreditFactory.php
@@ -5,6 +5,7 @@ use Faker\Generator as Faker;
 $factory->define(App\SettingCredit::class, function (Faker $faker) {
     return [
         'rmb_credit_limit' => $faker->randomDigit,
-        'usd_credit_limit' => $faker->randomDigit
+        'usd_credit_limit' => $faker->randomDigit,
+        'time_limit' => $faker->randomDigit
     ];
 });
diff --git a/database/migrations/2018_06_25_101043_add_time_limit_setting_credit_table.php b/database/migrations/2018_06_25_101043_add_time_limit_setting_credit_table.php
new file mode 100644
index 00000000..4e0aefef
--- /dev/null
+++ b/database/migrations/2018_06_25_101043_add_time_limit_setting_credit_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTimeLimitSettingCreditTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_credits', function (Blueprint $table) {
+            $table->integer('time_limit');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('setting_credits', function (Blueprint $table) {
+            // $table->dropColumn('time_limit');
+        });   
+    }
+}
\ No newline at end of file