diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 636a4be..a91da73 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -13,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index e69de29..94a25f7 100644
--- a/.idea/vcs.xml
+++ 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/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt
index e9bcf6a..1debc6f 100644
--- a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt
+++ b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.kt
@@ -38,6 +38,10 @@ class CalendarAdapter(context: Context, cal: Calendar) {
         refresh()
     }
 
+    fun getEvents(): ArrayList<Event> {
+        return mEventList;
+    }
+
     fun getItem(position: Int): Day {
         return mItemList[position]
     }
diff --git a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt
index 7f1cad4..232c117 100644
--- a/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt
+++ b/collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.kt
@@ -43,6 +43,10 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
         setAdapter(calenderAdapter)
     }
 
+    fun getEvents(): ArrayList<Event> {
+        return mAdapter!!.getEvents()
+    }
+
     override fun onClick(view: View?) {
         view?.let {
             mListener.let { mListener ->
@@ -59,6 +63,7 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
     private var mListener: CalendarListener? = null
 
     var expanded = false
+    var lockView = false
 
     private var mInitHeight = 0
 
@@ -194,10 +199,12 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
 
 
         expandIconView.setOnClickListener {
-            if (expanded) {
-                collapse(400)
-            } else {
-                expand(400)
+            if (!lockView) {
+                if (expanded) {
+                    collapse(400)
+                } else {
+                    expand(400)
+                }
             }
         }
 
@@ -566,6 +573,10 @@ class CollapsibleCalendar : UICalendar, View.OnClickListener {
         }
     }
 
+    fun shouldLockView(locked: Boolean) {
+        lockView = locked
+    }
+
     fun expand(duration: Int) {
         if (state == STATE_COLLAPSED) {
             state = STATE_PROCESSING
diff --git a/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml b/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml
new file mode 100644
index 0000000..d2098e0
--- /dev/null
+++ b/collapsiblecalendarview2/src/main/res/drawable/ic_calendar_event.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="7dp"
+    android:height="7dp"
+    android:viewportWidth="7"
+    android:viewportHeight="7">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M3.5,6C4.88071,6 6,4.88071 6,3.5C6,2.11929 4.88071,1 3.5,1C2.11929,1 1,2.11929 1,3.5C1,4.88071 2.11929,6 3.5,6Z"
+      android:fillColor="#5F75B9"
+      android:fillType="evenOdd"
+      android:strokeColor="#ffffff"/>
+</vector>
diff --git a/collapsiblecalendarview2/src/main/res/layout/day_layout.xml b/collapsiblecalendarview2/src/main/res/layout/day_layout.xml
index 7caba7e..199a9b4 100644
--- a/collapsiblecalendarview2/src/main/res/layout/day_layout.xml
+++ b/collapsiblecalendarview2/src/main/res/layout/day_layout.xml
@@ -28,7 +28,7 @@
             android:id="@+id/img_event_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/dot_icon"
+            app:srcCompat="@drawable/ic_calendar_event"
             android:visibility="gone" />
 
     </LinearLayout>