diff --git a/.run/petclinic.run.xml b/.run/petclinic.run.xml
index ca0a63bba..1af228ba3 100644
--- a/.run/petclinic.run.xml
+++ b/.run/petclinic.run.xml
@@ -9,6 +9,11 @@
     <module name="spring-petclinic.main" />
     <option name="PROGRAM_PARAMETERS" value="--warning-mode all" />
     <option name="VM_PARAMETERS" value="-Dotel.instrumentation.jdbc-datasource.enabled=true" />
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
     <method v="2">
       <option name="Gradle.BeforeRunTask" enabled="true" tasks="bootJar" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
     </method>
diff --git a/361664835_1398576977757937_4616571722293861431_n.png b/AfflictingQuery.png
similarity index 100%
rename from 361664835_1398576977757937_4616571722293861431_n.png
rename to AfflictingQuery.png
diff --git a/AfterOverview.png b/AfterOverview.png
new file mode 100644
index 000000000..d47c270cd
Binary files /dev/null and b/AfterOverview.png differ
diff --git a/AfterTrace.png b/AfterTrace.png
index 81985d9a9..2e278a56c 100644
Binary files a/AfterTrace.png and b/AfterTrace.png differ
diff --git a/361985072_493929246268532_4616348122043202950_n.png b/LocatedCode.png
similarity index 100%
rename from 361985072_493929246268532_4616348122043202950_n.png
rename to LocatedCode.png
diff --git a/362124994_234143976190940_7909993441765317496_n.png b/SidePaneView.png
similarity index 100%
rename from 362124994_234143976190940_7909993441765317496_n.png
rename to SidePaneView.png
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
index 2824d2a54..2b639c429 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
@@ -20,6 +20,7 @@ import java.util.Map;
 
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Controller;
@@ -104,9 +105,8 @@ class OwnerController {
 		// empty owner search for all records without n+1 queries
 		if (StringUtils.isEmpty(owner.getLastName())){
 			List<Owner> ownerList = owners.findAllWithPetsAndVisits();
-			//model.addAttribute("owners", ownerList);
-			//need to figure out displaying owners without n+1.
-			return "owners/ownersList";
+			Page<Owner> ownerPageNP1 = new PageImpl<>(ownerList);
+			return addPaginationModel(0, model, ownerPageNP1);
 		}
 
 		// find owners by last name
@@ -139,7 +139,7 @@ class OwnerController {
 	}
 
 	private Page<Owner> findPaginatedForOwnersLastName(int page, String lastname) {
-		int pageSize = 12;
+		int pageSize = 5;
 		Pageable pageable = PageRequest.of(page - 1, pageSize);
 		return owners.findByLastName(lastname, pageable);
 	}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
index 5521b29d2..a97c93da1 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
@@ -61,8 +61,6 @@ public interface OwnerRepository extends Repository<Owner, Integer> {
 	 * Retrieve {@link Owner}s all owners including their pets and visitations
 	 * @return a Collection of {@link Owner}s
 	 */
-	/*@Query("SELECT DISTINCT owner FROM Owner owner LEFT JOIN FETCH owner.pets pet LEFT JOIN FETCH visits WHERE pet.id = visits.petId")
-	List<Owner> findAllWithPetsAndVisits();*/
 	@Query("SELECT DISTINCT owner FROM Owner owner LEFT JOIN FETCH owner.pets LEFT JOIN FETCH pets.visits")
 	List<Owner> findAllWithPetsAndVisits();