diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index c0e35ee..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-TimeDurationPicker
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..9a8b7e5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -11,7 +12,6 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d93bcbe..2931d97 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,13 +12,7 @@
             <option value="$PROJECT_DIR$/library" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/example" />
-            <option value="$PROJECT_DIR$/library" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7e40dfc..95f0f03 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,26 +37,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.7</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/example/src/main/java/com/criptext/example/MainActivity.java b/example/src/main/java/com/criptext/example/MainActivity.java
index 0031d43..5488ba4 100644
--- a/example/src/main/java/com/criptext/example/MainActivity.java
+++ b/example/src/main/java/com/criptext/example/MainActivity.java
@@ -47,7 +47,6 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setCyclic(false)
                 .setMinMillseconds(System.currentTimeMillis())
                 .setMaxMillseconds(System.currentTimeMillis() + tenYears)
-                .setCurrentMillseconds(System.currentTimeMillis())
                 .setThemeColor(ContextCompat.getColor(this, R.color.timepicker_dialog_bg))
                 .setType(Type.ALL)
                 .setWheelItemTextNormalColor(getResources().getColor(R.color.timetimepicker_default_text_color))
@@ -92,6 +91,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 .setCallBack(this)
                 .setMaxDay(24)
                 .setWheelItemSelectorTextSize(16)
+                .setCurrentMillseconds(259140000)
                 .build();
     }
 
diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java
index 159cb8c..b25cec2 100644
--- a/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java
+++ b/library/src/main/java/com/criptext/timedurationpicker/TimeDurationPicker.java
@@ -39,7 +39,12 @@ void initExpirationViews(View view) {
         RadioButton op2 = (RadioButton) view.findViewById(R.id.expiration_option_right);
         op2.setText(mPickerConfig.mExpirationOp2Label);
 
-        op1.toggle();
+        if(choseRight){
+            op2.toggle();
+        }
+        else {
+            op1.toggle();
+        }
         op1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) { choseRight = false; }
@@ -99,6 +104,10 @@ public void setCallBack(OnDateSetListener listener) {
         mPickerConfig.mCallBack = listener;
     }
 
+    public void setExpirationOnSent() {
+        this.choseRight = true;
+    }
+
     public static class Builder {
         PickerConfig mPickerConfig;
 
@@ -178,7 +187,25 @@ public Builder setMaxMillseconds(long millseconds) {
             return this;
         }
 
+        public Builder setCurrentDay(int day) {
+            mPickerConfig.mCurrentDay = day;
+            return this;
+        }
+
+        public Builder setCurrentHour(int hour) {
+            mPickerConfig.mCurrentHour = hour;
+            return this;
+        }
+
+        public Builder setCurrentMinute(int minute) {
+            mPickerConfig.mCurrentMinute = minute;
+            return this;
+        }
+
         public Builder setCurrentMillseconds(long millseconds) {
+            mPickerConfig.mCurrentDay = (int)(millseconds / TimeDuration.daysInMS);
+            mPickerConfig.mCurrentHour = (int)(millseconds / TimeDuration.hoursInMS) % 24;
+            mPickerConfig.mCurrentMinute = (int)(millseconds / TimeDuration.minutesInMS) % 60;
             mPickerConfig.mCurrentCalendar = new WheelCalendar(millseconds);
             return this;
         }
diff --git a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java
index caaea96..9b909b4 100644
--- a/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java
+++ b/library/src/main/java/com/criptext/timedurationpicker/TimeWheel.java
@@ -130,16 +130,19 @@ void initMonth() {
 
     void initDay() {
         updateDays();
+        day.setCurrentItem(mPickerConfig.mCurrentDay);
         day.setCyclic(mPickerConfig.cyclic);
     }
 
     void initHour() {
         updateHours();
+        hour.setCurrentItem(mPickerConfig.mCurrentHour);
         hour.setCyclic(mPickerConfig.cyclic);
     }
 
     void initMinute() {
         updateMinutes();
+        minute.setCurrentItem(mPickerConfig.mCurrentMinute);
         minute.setCyclic(mPickerConfig.cyclic);
     }
 
diff --git a/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java b/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java
index 230b4a0..bd74747 100644
--- a/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java
+++ b/library/src/main/java/com/criptext/timedurationpicker/config/PickerConfig.java
@@ -38,6 +38,9 @@ public class PickerConfig {
     public String mExpirationOp1Label = DefaultConfig.EXPIRATION_OPTION_1;
     public String mExpirationOp2Label = DefaultConfig.EXPIRATION_OPTION_2;
 
+    public int mCurrentDay = 0;
+    public int mCurrentHour = 0;
+    public int mCurrentMinute = 0;
 
     public int minDay = DefaultConfig.MIN_DAY;
     public int maxDay = DefaultConfig.MAX_DAY;