+ Philipp Pelz
+
+ Principal Investigator
+
+
+
+ Categories
Categories
Advanced Science (2026)
+
Categories
+
+ arXiv (Cornell University) + (2026)
+ + + + + + + + + Details + + + + DOI + + + + + + +
+
+ Microscopy and Microanalysis 31 + (2025)
+ + +
npj 2D Materials and Applications 9 @@ -401,7 +521,7 @@
Categories
Categories
Journal of the American Chemical Society 147, 37622-37633 @@ -495,7 +615,7 @@
Categories
Categories
Journal of Physics: Materials 8, 015005 @@ -586,7 +706,7 @@
Categories
Categories
Physica Scripta 100, 015404 @@ -699,7 +819,7 @@
Categories
Categories
Microscopy and Microanalysis 31 @@ -769,7 +889,7 @@
Categories
Categories
Microscopy and Microanalysis 30 @@ -827,7 +947,7 @@
Categories
Categories
BIO Web of Conferences 129, 04027 @@ -887,7 +1007,7 @@
Categories
Categories
Microscopy and Microanalysis 30, 903-912 @@ -994,7 +1114,7 @@
Categories
Categories
BIO Web of Conferences 129, 07006 @@ -1054,7 +1174,7 @@
Categories
Categories
Microscopy and Microanalysis 30 @@ -1112,7 +1232,7 @@
Categories
Categories
ACS Nano 17, 22326-22333 @@ -1208,7 +1328,7 @@
Categories
Categories
Journal of the American Chemical Society 145, 17902-17911 @@ -1249,7 +1369,7 @@
Categories
Categories
Categories
Categories
Categories
arXiv (Cornell University) @@ -1399,7 +1523,7 @@
Categories
Categories
Nature Communications 14 @@ -1444,7 +1568,7 @@
Categories
Categories
Categories
Categories
Categories
+
+ Applied Physics Letters 123 + (2023)
+ + +
+
+ arXiv (Cornell University) + (2023)
+ + +
Microscopy and Microanalysis 29, 707-708 @@ -1568,7 +1859,7 @@
Categories
Categories
Microscopy and Microanalysis 29, 1409-1421 @@ -1653,7 +1944,7 @@
Categories
Categories
Categories
Nature Communications 14 @@ -1758,7 +2049,7 @@
Categories
Categories
Categories
Acta Crystallographica Section A Foundations and Advances 79, C251-C251 @@ -1838,7 +2129,7 @@
Categories
Categories
Journal of Physics: Materials 6, 045008 @@ -1930,7 +2221,7 @@
Categories
Categories
Acta Crystallographica Section A Foundations and Advances 79, C1092-C1092 @@ -1992,7 +2283,7 @@
Categories
Categories
Microscopy and Microanalysis 28, 1632-1640 @@ -2090,7 +2381,7 @@
Categories
Categories
Nature Communications 13 @@ -2167,7 +2458,7 @@
Categories
Categories
Categories
Microscopy and Microanalysis 28, 2504-2505 @@ -2251,7 +2542,7 @@
Categories
Categories
IEEE Signal Processing Magazine 39, 25-31 @@ -2352,7 +2643,7 @@
Categories
Categories
ACS Nano 16, 588-596 @@ -2448,7 +2739,7 @@
Categories
Categories
Categories
Microscopy and Microanalysis 28, 388-390 @@ -2549,7 +2840,7 @@
Categories
Categories
Microscopy and Microanalysis 27, 835-848 @@ -2660,7 +2951,7 @@
Categories
Microscopy and Microanalysis 27, 1272-1275 @@ -2706,7 +2997,7 @@
Categories
Categories
+
+ Proceedings of the European Microscopy Congress 2020 + (2021)
+ + +
Microscopy and Microanalysis 27, 14-15 @@ -2758,7 +3103,7 @@
Categories
Categories
Physical Review Research 3 @@ -2857,7 +3202,7 @@
Categories
Categories
Micron 151, 103141 @@ -2934,7 +3279,7 @@
Categories
Categories
Categories
Microscopy and Microanalysis 27, 712-743 @@ -2991,7 +3336,7 @@
Categories
Categories
Categories
Categories
Categories
Microscopy and Microanalysis 27, 188-189 @@ -3147,7 +3492,7 @@
Categories
Categories
@@ -3230,7 +3575,7 @@
Categories
Microscopy and Microanalysis 27, 744-757 @@ -3326,7 +3671,7 @@
Categories
Microscopy and Microanalysis 27, 1524-1526 @@ -3372,7 +3717,7 @@
Categories
Categories
arXiv (Cornell University) @@ -3454,7 +3799,7 @@
Categories
Microscopy and Microanalysis 26, 1860-1862 @@ -3512,7 +3857,7 @@
Categories
Microscopy and Microanalysis 26, 456-458 @@ -3606,7 +3951,7 @@
Categories
Microscopy and Microanalysis 26, 462-464 @@ -3696,7 +4041,7 @@
Categories
arXiv (Cornell University) @@ -3790,7 +4135,7 @@
Categories
Microscopy and Microanalysis 26, 1896-1897 @@ -3851,7 +4196,7 @@
Categories
Categories
Microscopy and Microanalysis 25, 394-395 @@ -3949,7 +4294,7 @@
Categories
Microscopy and Microanalysis 25, 10-11 @@ -4041,7 +4386,7 @@
Categories
Microscopy and Microanalysis 25, 72-73 @@ -4123,7 +4468,7 @@
Categories
Microscopy and Microanalysis 25, 1804-1805 @@ -4215,7 +4560,7 @@
Categories
Microscopy and Microanalysis 25, 58-59 @@ -4297,7 +4642,7 @@
Categories
Scientific Reports 7 @@ -4322,7 +4667,7 @@
Categories
Categories
Categories
Categories
Applied Physics Letters 105 @@ -4423,7 +4768,7 @@
Categories
Categories
Categories
Physical Review A 89 @@ -4570,7 +4915,7 @@
@@ -380,7 +380,7 @@
@@ -412,7 +412,7 @@
@@ -444,7 +444,7 @@
@@ -476,7 +476,7 @@
@@ -506,7 +506,7 @@
@@ -538,7 +538,7 @@
@@ -570,7 +570,7 @@
@@ -666,7 +666,7 @@
diff --git a/docs/people-cards.css b/docs/people-cards.css
new file mode 100644
index 0000000..bfaeed0
--- /dev/null
+++ b/docs/people-cards.css
@@ -0,0 +1,202 @@
+.people-grid {
+ display: grid;
+ grid-template-columns: repeat(4, minmax(0, 1fr));
+ gap: 1.75rem 1.5rem;
+ align-items: start;
+ margin: 1rem 0 0.75rem;
+ overflow: visible;
+}
+
+.level2 > h2 {
+ margin-top: 1.25rem;
+}
+
+.people-card {
+ position: relative;
+ min-width: 0;
+ text-align: center;
+}
+
+.people-card__trigger {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ min-width: 0;
+ color: inherit;
+ text-decoration: none;
+ border-radius: 0.5rem;
+ outline: 0 solid transparent;
+}
+
+.people-card__trigger:hover,
+.people-card__trigger:focus,
+.people-card__trigger:focus-visible {
+ color: inherit;
+ text-decoration: none;
+}
+
+.people-card__trigger:focus-visible {
+ outline: 3px solid #60a5fa;
+ outline-offset: 0.35rem;
+}
+
+.people-card__portrait {
+ display: block;
+ width: 100%;
+ aspect-ratio: 1;
+ object-fit: cover;
+ border: 1px solid rgba(255, 255, 255, 0.08);
+ border-radius: 0.25rem;
+ box-shadow: 0 0.4rem 1.3rem rgba(0, 0, 0, 0.24);
+ transition: box-shadow 180ms ease, transform 180ms ease;
+}
+
+.people-card:hover .people-card__portrait,
+.people-card:focus-within .people-card__portrait,
+.people-card.is-open .people-card__portrait {
+ transform: translateY(-0.2rem);
+ box-shadow: 0 0.8rem 2rem rgba(0, 0, 0, 0.38);
+}
+
+.people-card__name {
+ display: block;
+ max-width: 100%;
+ margin-top: 0.7rem;
+ overflow-wrap: anywhere;
+ color: #f8fafc;
+ font-family: "Outfit", sans-serif;
+ font-size: 1.02rem;
+ font-weight: 600;
+ line-height: 1.25;
+}
+
+.people-card__role {
+ display: block;
+ max-width: 100%;
+ margin-top: 0.15rem;
+ overflow-wrap: anywhere;
+ color: #94a3b8;
+ font-family: "Inter", sans-serif;
+ font-size: 0.82rem;
+ line-height: 1.35;
+}
+
+.people-card__panel {
+ --people-panel-shift: 0px;
+ position: absolute;
+ z-index: 30;
+ top: calc(100% + 0.65rem);
+ left: 50%;
+ width: min(25rem, calc(100vw - 2rem));
+ max-height: min(32rem, calc(100vh - 2rem));
+ padding: 1rem;
+ overflow-y: auto;
+ visibility: hidden;
+ opacity: 0;
+ pointer-events: none;
+ transform: translateX(calc(-50% + var(--people-panel-shift))) translateY(-0.25rem);
+ color: #cbd5e1;
+ font-family: "Inter", sans-serif;
+ font-size: 0.86rem;
+ line-height: 1.55;
+ text-align: left;
+ background: #172033;
+ border: 1px solid rgba(148, 163, 184, 0.35);
+ border-radius: 0.625rem;
+ box-shadow: 0 1rem 2.5rem rgba(0, 0, 0, 0.45);
+ transition: opacity 180ms ease, transform 180ms ease,
+ visibility 0s linear 180ms;
+}
+
+.people-card:hover .people-card__panel,
+html:not(.people-cards-enhanced) .people-card:focus-within .people-card__panel,
+.people-card.is-open .people-card__panel {
+ visibility: visible;
+ opacity: 1;
+ pointer-events: auto;
+ transform: translateX(calc(-50% + var(--people-panel-shift))) translateY(0);
+ transition-delay: 0s;
+}
+
+.people-card__meta {
+ display: flex;
+ flex-direction: column;
+ gap: 0.1rem;
+ color: #94a3b8;
+}
+
+.people-card__meta strong {
+ color: #f8fafc;
+ font-family: "Outfit", sans-serif;
+ font-size: 0.95rem;
+ font-weight: 600;
+}
+
+.people-card__summary,
+.people-card__links,
+.people-card__profile-link {
+ margin-top: 0.75rem;
+ padding-top: 0.75rem;
+ border-top: 1px solid rgba(148, 163, 184, 0.22);
+}
+
+.people-card__summary {
+ color: #cbd5e1;
+}
+
+.people-card__links {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.35rem 0.8rem;
+}
+
+.people-card__links a,
+.people-card__profile-link {
+ color: #93c5fd;
+ font-weight: 500;
+ text-decoration: none;
+}
+
+.people-card__links a:hover,
+.people-card__links a:focus-visible,
+.people-card__profile-link:hover,
+.people-card__profile-link:focus-visible {
+ color: #c4b5fd;
+ text-decoration: underline;
+ text-underline-offset: 0.18em;
+}
+
+.people-card__profile-link {
+ display: block;
+}
+
+#listing-alumni {
+ max-width: 100%;
+ overflow-x: auto;
+}
+
+@media (max-width: 1199px) {
+ .people-grid {
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ }
+}
+
+@media (max-width: 767px) {
+ .people-grid {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+}
+
+@media (max-width: 479px) {
+ .people-grid {
+ grid-template-columns: minmax(0, 1fr);
+ gap: 1.5rem;
+ }
+}
+
+@media (prefers-reduced-motion: reduce) {
+ .people-card__portrait,
+ .people-card__panel {
+ transition: none;
+ }
+}
diff --git a/docs/people-cards.js b/docs/people-cards.js
new file mode 100644
index 0000000..07d2a55
--- /dev/null
+++ b/docs/people-cards.js
@@ -0,0 +1,112 @@
+(() => {
+ document.documentElement.classList.add("people-cards-enhanced");
+
+ const cards = [...document.querySelectorAll(".people-card")];
+ if (!cards.length) return;
+
+ const finePointer = window.matchMedia("(hover: hover) and (pointer: fine)");
+ let openCard = null;
+ let restoringFocus = false;
+
+ function keepPanelInViewport(card) {
+ const panel = card.querySelector(".people-card__panel");
+ panel.style.setProperty("--people-panel-shift", "0px");
+
+ const rect = panel.getBoundingClientRect();
+ const gutter = 16;
+ let shift = 0;
+ if (rect.left < gutter) shift += gutter - rect.left;
+ if (rect.right > window.innerWidth - gutter) {
+ shift -= rect.right - (window.innerWidth - gutter);
+ }
+ panel.style.setProperty("--people-panel-shift", `${shift}px`);
+ }
+
+ function setState(card, expanded) {
+ const trigger = card.querySelector(".people-card__trigger");
+ const panel = card.querySelector(".people-card__panel");
+
+ card.classList.toggle("is-open", expanded);
+ trigger.setAttribute("aria-expanded", String(expanded));
+ panel.setAttribute("aria-hidden", String(!expanded));
+
+ if (expanded) {
+ openCard = card;
+ window.requestAnimationFrame(() => keepPanelInViewport(card));
+ } else {
+ panel.style.removeProperty("--people-panel-shift");
+ if (openCard === card) openCard = null;
+ }
+ }
+
+ function closeCurrent(except = null) {
+ if (openCard && openCard !== except) setState(openCard, false);
+ }
+
+ cards.forEach((card) => {
+ const trigger = card.querySelector(".people-card__trigger");
+ let coarseActivation = false;
+
+ card.addEventListener("mouseenter", () => {
+ closeCurrent(card);
+ window.requestAnimationFrame(() => keepPanelInViewport(card));
+ });
+
+ trigger.addEventListener("pointerdown", (event) => {
+ coarseActivation =
+ event.pointerType === "touch" || event.pointerType === "pen";
+ });
+
+ trigger.addEventListener("focus", () => {
+ if (coarseActivation || restoringFocus) return;
+ closeCurrent(card);
+ setState(card, true);
+ });
+
+ trigger.addEventListener("click", (event) => {
+ const isCoarseClick = coarseActivation || !finePointer.matches;
+ coarseActivation = false;
+ if (!isCoarseClick || card.classList.contains("is-open")) return;
+
+ event.preventDefault();
+ closeCurrent(card);
+ setState(card, true);
+ });
+
+ trigger.addEventListener("keydown", (event) => {
+ if (event.key !== "Enter" && event.key !== " ") return;
+
+ event.preventDefault();
+ const expanded = trigger.getAttribute("aria-expanded") === "true";
+ closeCurrent(card);
+ setState(card, !expanded);
+ });
+
+ card.addEventListener("focusout", () => {
+ window.requestAnimationFrame(() => {
+ if (!card.contains(document.activeElement)) setState(card, false);
+ });
+ });
+ });
+
+ document.addEventListener("click", (event) => {
+ if (openCard && !openCard.contains(event.target)) setState(openCard, false);
+ });
+
+ document.addEventListener("keydown", (event) => {
+ if (event.key !== "Escape" || !openCard) return;
+
+ const card = openCard;
+ const trigger = card.querySelector(".people-card__trigger");
+ setState(card, false);
+ restoringFocus = true;
+ trigger.focus();
+ restoringFocus = false;
+ });
+
+ window.addEventListener("resize", () => {
+ if (openCard) {
+ window.requestAnimationFrame(() => keepPanelInViewport(openCard));
+ }
+ });
+})();
diff --git a/docs/people.html b/docs/people.html
index 5e059bd..482a9da 100644
--- a/docs/people.html
+++ b/docs/people.html
@@ -87,9 +87,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-interests','listing-toc','listing-resources','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-interests","listing-toc","listing-resources","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -115,9 +115,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-interests','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-interests","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -143,9 +143,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-interests','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-interests","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -171,9 +171,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle','listing-started',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -199,9 +199,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle','listing-started',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count','listing-interests',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count","listing-interests"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -227,9 +227,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle','listing-started',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -255,9 +255,9 @@
}
const options = {
- valueNames: ['listing-image','listing-title','listing-subtitle','listing-started',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-date-sort'] },{ data: ['listing-file-modified-sort'] }],
+ valueNames: ['listing-project','listing-execute','listing-website','listing-format','listing-engines','listing-language','listing-title','listing-sortby','listing-subtitle','listing-image','listing-started','listing-interests','listing-card-bio','listing-toc','listing-about','listing-path','listing-outputHref','listing-author','listing-description','listing-filename','listing-file-modified','listing-reading-time','listing-word-count',{ data: ['index'] },{ data: ['categories'] },{ data: ['listing-file-modified-sort'] },{ data: ['listing-reading-time-sort'] },{ data: ['listing-word-count-sort'] }],
- searchColumns: ["listing-title","listing-author","listing-image","listing-description"],
+ searchColumns: ["listing-project","listing-execute","listing-website","listing-format","listing-engines","listing-language","listing-title","listing-sortby","listing-subtitle","listing-image","listing-started","listing-interests","listing-card-bio","listing-toc","listing-about","listing-path","listing-outputHref","listing-author","listing-description","listing-filename","listing-file-modified","listing-reading-time","listing-word-count"],
};
window['quarto-listings'] = window['quarto-listings'] || {};
@@ -348,10 +348,12 @@
+
+
@@ -456,284 +458,347 @@
-
-
-
-
-
-
-
-
-