diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 4d50590..b60167c 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -62,7 +62,6 @@ public class BucketSelect extends AppCompatActivity {
                     Img = new ArrayList<String>();
                     // Print bucket names
                     //System.out.println("Buckets:");
-                    int i=0;
                     for (Bucket bucket : buckets) {
                         //i++;
                         //System.out.println(bucket.getName());
@@ -70,7 +69,7 @@ public class BucketSelect extends AppCompatActivity {
                         //Img.add(R.drawable.ic_launcher_foreground);
                         Img.add(R.drawable.bucket);
                     }
-                    System.out.println(Name);
+                    //System.out.println(Name);
 
                     runOnUiThread(new Runnable() {
 
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index 73669f3..11ad896 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -17,6 +17,10 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.ListObjectsV2Result;
+import com.amazonaws.services.s3.model.ObjectListing;
+import com.amazonaws.services.s3.model.S3Object;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,20 +60,29 @@ public class ObjectSelect extends AppCompatActivity {
                 try  {
                     //Your code goes here
                     List<Bucket> buckets = s3client.listBuckets();
+                    //List<S3Object> objects = (List<S3Object>) s3client.listObjects(bucket, "/");
+                    ListObjectsV2Result result = s3client.listObjectsV2(bucket, "/");
+                    //System.out.println(objects);
                     //This convert bucket list to an array list
                     Name = new ArrayList<String>();
                     Img = new ArrayList<String>();
                     // Print bucket names
                     //System.out.println("Buckets:");
                     int i=0;
-                    for (Bucket bucket : buckets) {
+                    List<S3ObjectSummary> objects = result.getObjectSummaries();
+                    for (S3ObjectSummary os : objects) {
+                        Name.add(os.getKey());
+                        Img.add(R.drawable.videofile);
+                    }
+
+                    /*for (Bucket bucket : buckets) {
                         //i++;
                         //System.out.println(bucket.getName());
                         Name.add(bucket.getName());
                         //Img.add(R.drawable.ic_launcher_foreground);
-                        Img.add(R.drawable.bucket);
-                    }
-                    System.out.println(Name);
+                        Img.add(R.drawable.videofile);
+                    }*/
+                    //System.out.println(Name);
 
                     runOnUiThread(new Runnable() {
 
diff --git a/app/src/main/res/drawable/bucket.png b/app/src/main/res/drawable/bucket.png
index e6fe4a0..bc5b4ca 100644
Binary files a/app/src/main/res/drawable/bucket.png and b/app/src/main/res/drawable/bucket.png differ
diff --git a/app/src/main/res/drawable/videofile.png b/app/src/main/res/drawable/videofile.png
new file mode 100644
index 0000000..9a17fc8
Binary files /dev/null and b/app/src/main/res/drawable/videofile.png differ