From 3d02d533fb7257ba9bb576f3b72c10326c253a92 Mon Sep 17 00:00:00 2001
From: madhusudhand <madhusudhan.dollu@gmail.com>
Date: Wed, 11 May 2022 13:19:14 +0530
Subject: [PATCH 1/7] add archive template and posts-grid pattern

---
 .../patterns/hidden-post-terms-and-date.php   | 18 ++++++
 curator/patterns/posts-grid.php               | 29 ++++++++++
 curator/templates/archive.html                | 34 +++---------
 curator/theme.json                            | 55 ++++++++++++++++++-
 4 files changed, 109 insertions(+), 27 deletions(-)
 create mode 100644 curator/patterns/hidden-post-terms-and-date.php
 create mode 100644 curator/patterns/posts-grid.php

diff --git a/curator/patterns/hidden-post-terms-and-date.php b/curator/patterns/hidden-post-terms-and-date.php
new file mode 100644
index 0000000000..6a8133a127
--- /dev/null
+++ b/curator/patterns/hidden-post-terms-and-date.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Title: Tags and date
+ * Slug: curator/post-terms-and-date
+ * Inserter: no
+ */
+
+?>
+
+<!-- wp:group {"style":{"spacing":{"blockGap":"5px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group">
+<!-- wp:post-terms {"term":"post_tag"} /-->
+<!-- wp:paragraph -->
+<p>·</p>
+<!-- /wp:paragraph -->
+<!-- wp:post-date {"isLink":true} /-->
+</div>
+<!-- /wp:group -->
\ No newline at end of file
diff --git a/curator/patterns/posts-grid.php b/curator/patterns/posts-grid.php
new file mode 100644
index 0000000000..170c379561
--- /dev/null
+++ b/curator/patterns/posts-grid.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Title: Posts grid
+ * Slug: curator/posts-grid
+ * Categories: featured, query
+ */
+?>
+
+<!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide"} -->
+<div class="wp-block-query alignwide"><!-- wp:post-template -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"20px","bottom":"20px","left":"20px"}}},"layout":{"inherit":false}} -->
+<div class="wp-block-group" style="padding-top:20px;padding-right:20px;padding-bottom:20px;padding-left:20px"><!-- wp:post-featured-image {"isLink":true} /-->
+
+<!-- wp:pattern {"slug":"curator/post-terms-and-date"} /-->
+
+<!-- wp:post-title {"isLink":true,"textColor":"foreground"} /-->
+
+<!-- wp:post-excerpt /--></div>
+<!-- /wp:group -->
+<!-- /wp:post-template -->
+
+<!-- wp:query-pagination -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:query --></div>
+<!-- /wp:group -->
diff --git a/curator/templates/archive.html b/curator/templates/archive.html
index 4eca842676..d9641b86f0 100644
--- a/curator/templates/archive.html
+++ b/curator/templates/archive.html
@@ -1,33 +1,15 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:query {"tagName":"main","layout":{"inherit":true}} -->
-<main class="wp-block-query">
-<!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"bottom":"100px"}}}} /-->
-<!-- wp:post-template -->
-<!-- wp:group -->
-<div class="wp-block-group">
-	<!-- wp:post-title {"isLink":true} /-->
-	<!-- wp:post-featured-image {"isLink":true} /-->
-	<!-- wp:post-excerpt /-->
-	<!-- wp:template-part {"slug":"post-meta","layout":{"inherit":true}} /-->
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-<!-- /wp:post-template -->
-<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-	<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
+<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
+<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
 
-		<!-- wp:query-pagination-next /-->
-	<!-- /wp:query-pagination -->
-	</div>
+	<!-- wp:group {"layout":{"inherit":true}} -->
+	<div class="wp-block-group"><!-- wp:query-title {"type":"archive","textAlign":"center","align":"wide","style":{"spacing":{"margin":{"bottom":"100px"}}}} /--></div>
 	<!-- /wp:group -->
+	
+	<!-- wp:pattern {"slug":"curator/posts-grid"} /-->
+
 </main>
-<!-- /wp:query -->
+<!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
diff --git a/curator/theme.json b/curator/theme.json
index b7b951c79a..66eedd123a 100644
--- a/curator/theme.json
+++ b/curator/theme.json
@@ -231,12 +231,36 @@
 					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 			},
+			"core/post-terms": {
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--foreground)"
+						},
+						"typography": {
+							"textDecoration": "none",
+							"textTransform": "capitalize",
+							"fontWeight":"700"
+						}
+					}
+				}
+			},
 			"core/post-date": {
 				"color": {
 					"text": "var(--wp--preset--color--foreground)"
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--foreground)"
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
 				}
 			},
 			"core/post-title": {
@@ -245,9 +269,38 @@
 						"bottom": "0"
 					}
 				},
+				"color": {
+					"text": "var(--wp--preset--color--foreground)"
+				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--heading-font)",
-					"lineHeight": "1.125"
+					"lineHeight": "1.125",
+					"textDecoration": "none"
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--foreground)"
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				}
+			},
+			"core/query-pagination": {
+				"spacing": {
+					"padding": {
+						"left": "20px",
+						"right": "20px"
+					}
+				},
+				"elements": {
+					"link": {
+						"color": {
+							"text": "var(--wp--preset--color--foreground)"
+						}
+					}
 				}
 			},
 			"core/pullquote": {

From 29c1918a1eceee588636638ce9f847824de27531 Mon Sep 17 00:00:00 2001
From: madhusudhand <madhusudhan.dollu@gmail.com>
Date: Wed, 11 May 2022 18:04:26 +0530
Subject: [PATCH 2/7] update search template

---
 curator/patterns/posts-grid.php |  2 +-
 curator/templates/search.html   | 48 ++++++---------------------------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/curator/patterns/posts-grid.php b/curator/patterns/posts-grid.php
index 170c379561..dc56602ef3 100644
--- a/curator/patterns/posts-grid.php
+++ b/curator/patterns/posts-grid.php
@@ -7,7 +7,7 @@
 ?>
 
 <!-- wp:group {"align":"full","layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide"} -->
+<div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide"} -->
 <div class="wp-block-query alignwide"><!-- wp:post-template -->
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"20px","bottom":"20px","left":"20px"}}},"layout":{"inherit":false}} -->
 <div class="wp-block-group" style="padding-top:20px;padding-right:20px;padding-bottom:20px;padding-left:20px"><!-- wp:post-featured-image {"isLink":true} /-->
diff --git a/curator/templates/search.html b/curator/templates/search.html
index 970f4d0ce9..d9641b86f0 100644
--- a/curator/templates/search.html
+++ b/curator/templates/search.html
@@ -1,47 +1,15 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:search /-->
-
-	<!-- wp:spacer {"height":40} -->
-	<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
-
-<!-- wp:query {"layout":{"inherit":true}} -->
-<main class="wp-block-query">
-	<!-- wp:post-template -->
-	<!-- wp:group -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"isLink":true} /-->
-
-		<!-- wp:post-featured-image {"isLink":true} /-->
-
-		<!-- wp:post-excerpt /-->
-
-		<!-- wp:template-part {"slug":"post-meta","layout":{"inherit":true}} /-->
-
-		<!-- wp:spacer {"height":40} -->
-		<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
-	<!-- /wp:post-template -->
+<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
+<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
 
 	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:query-pagination -->
-		<!-- wp:query-pagination-previous /-->
-
-		<!-- wp:query-pagination-numbers /-->
-
-		<!-- wp:query-pagination-next /-->
-		<!-- /wp:query-pagination -->
-	</div>
+	<div class="wp-block-group"><!-- wp:query-title {"type":"archive","textAlign":"center","align":"wide","style":{"spacing":{"margin":{"bottom":"100px"}}}} /--></div>
 	<!-- /wp:group -->
+	
+	<!-- wp:pattern {"slug":"curator/posts-grid"} /-->
+
 </main>
-<!-- /wp:query -->
+<!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

From 7971e525cf8db25b284756bb4a5655c5daa6773f Mon Sep 17 00:00:00 2001
From: madhusudhand <madhusudhan.dollu@gmail.com>
Date: Fri, 13 May 2022 11:43:33 +0530
Subject: [PATCH 3/7] update search page with search box

---
 curator/patterns/404.php                        |  2 +-
 curator/patterns/hidden-post-terms-and-date.php |  7 ++-----
 curator/patterns/hidden-search-form.php         | 10 ++++++++++
 curator/patterns/posts-grid.php                 |  9 ++++-----
 curator/templates/archive.html                  |  4 ++--
 curator/templates/search.html                   | 11 ++++++++---
 curator/theme.json                              |  7 +++++++
 7 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 curator/patterns/hidden-search-form.php

diff --git a/curator/patterns/404.php b/curator/patterns/404.php
index 099f4a384c..51c7d1dccd 100644
--- a/curator/patterns/404.php
+++ b/curator/patterns/404.php
@@ -15,4 +15,4 @@
 <p class="has-text-align-center"><?php echo esc_html__( 'This page could not be found. Try searching posts using the field below.', 'curator' ); ?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:search {"label":"","showLabel":false,"placeholder":"<?php echo esc_html__( 'Search', 'curator' ); ?>","buttonUseIcon":true,"borderColor":"foreground"} /-->
\ No newline at end of file
+<!-- wp:pattern {"slug":"curator/search-form"} /-->
\ No newline at end of file
diff --git a/curator/patterns/hidden-post-terms-and-date.php b/curator/patterns/hidden-post-terms-and-date.php
index 6a8133a127..8f2e512b12 100644
--- a/curator/patterns/hidden-post-terms-and-date.php
+++ b/curator/patterns/hidden-post-terms-and-date.php
@@ -7,12 +7,9 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"5px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group">
-<!-- wp:post-terms {"term":"post_tag"} /-->
-<!-- wp:paragraph -->
-<p>·</p>
-<!-- /wp:paragraph -->
 <!-- wp:post-date {"isLink":true} /-->
+<!-- wp:post-terms {"term":"post_tag"} /-->
 </div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/curator/patterns/hidden-search-form.php b/curator/patterns/hidden-search-form.php
new file mode 100644
index 0000000000..63f0070b6e
--- /dev/null
+++ b/curator/patterns/hidden-search-form.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Title: Tags and date
+ * Slug: curator/search-form
+ * Inserter: no
+ */
+
+?>
+
+<!-- wp:search {"label":"","showLabel":false,"placeholder":"<?php echo esc_html__( 'Search', 'curator' ); ?>","buttonUseIcon":true,"borderColor":"foreground"} /-->
\ No newline at end of file
diff --git a/curator/patterns/posts-grid.php b/curator/patterns/posts-grid.php
index dc56602ef3..d12ad8fe93 100644
--- a/curator/patterns/posts-grid.php
+++ b/curator/patterns/posts-grid.php
@@ -10,13 +10,12 @@
 <div class="wp-block-group alignfull"><!-- wp:query {"queryId":0,"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide"} -->
 <div class="wp-block-query alignwide"><!-- wp:post-template -->
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","right":"20px","bottom":"20px","left":"20px"}}},"layout":{"inherit":false}} -->
-<div class="wp-block-group" style="padding-top:20px;padding-right:20px;padding-bottom:20px;padding-left:20px"><!-- wp:post-featured-image {"isLink":true} /-->
-
+<div class="wp-block-group" style="padding-top:20px;padding-right:20px;padding-bottom:20px;padding-left:20px">
+<!-- wp:post-featured-image {"isLink":true} /-->
 <!-- wp:pattern {"slug":"curator/post-terms-and-date"} /-->
-
 <!-- wp:post-title {"isLink":true,"textColor":"foreground"} /-->
-
-<!-- wp:post-excerpt /--></div>
+<!-- wp:post-excerpt {"style":{"spacing":{"margin":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
+</div>
 <!-- /wp:group -->
 <!-- /wp:post-template -->
 
diff --git a/curator/templates/archive.html b/curator/templates/archive.html
index d9641b86f0..5d374a68a5 100644
--- a/curator/templates/archive.html
+++ b/curator/templates/archive.html
@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
-<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
+<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"3rem","bottom":"2.5rem"}}}} -->
+<main class="wp-block-group" style="padding-top:3rem;padding-bottom:2.5rem">
 
 	<!-- wp:group {"layout":{"inherit":true}} -->
 	<div class="wp-block-group"><!-- wp:query-title {"type":"archive","textAlign":"center","align":"wide","style":{"spacing":{"margin":{"bottom":"100px"}}}} /--></div>
diff --git a/curator/templates/search.html b/curator/templates/search.html
index d9641b86f0..9309a10dbd 100644
--- a/curator/templates/search.html
+++ b/curator/templates/search.html
@@ -1,10 +1,15 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"4em","bottom":"2.5em"}}}} -->
-<main class="wp-block-group" style="padding-top:4em;padding-bottom:2.5em">
+<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"3rem","bottom":"2.5rem"}}}} -->
+<main class="wp-block-group" style="padding-top:3rem;padding-bottom:2.5rem">
 
 	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group"><!-- wp:query-title {"type":"archive","textAlign":"center","align":"wide","style":{"spacing":{"margin":{"bottom":"100px"}}}} /--></div>
+	<div class="wp-block-group">
+	<!-- wp:pattern {"slug":"curator/search-form"} /-->
+	<!-- wp:spacer -->
+	<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+	</div>
 	<!-- /wp:group -->
 	
 	<!-- wp:pattern {"slug":"curator/posts-grid"} /-->
diff --git a/curator/theme.json b/curator/theme.json
index 66eedd123a..bbeae6f137 100644
--- a/curator/theme.json
+++ b/curator/theme.json
@@ -263,6 +263,13 @@
 					}
 				}
 			},
+			"core/post-featured-image": {
+				"spacing": {
+					"padding": {
+						"bottom": "1rem"
+					}
+				}
+			},
 			"core/post-title": {
 				"spacing": {
 					"margin": {

From e4ac1570ad5378eae5d674fabd9eb751b7813c44 Mon Sep 17 00:00:00 2001
From: Madhu Dollu <madhusudhan.dollu@gmail.com>
Date: Tue, 24 May 2022 10:49:07 +0530
Subject: [PATCH 4/7] Update post-terms to category

Co-authored-by: Jeff Ong <jonger4@gmail.com>
---
 curator/patterns/hidden-post-terms-and-date.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curator/patterns/hidden-post-terms-and-date.php b/curator/patterns/hidden-post-terms-and-date.php
index 8f2e512b12..d94d5c2407 100644
--- a/curator/patterns/hidden-post-terms-and-date.php
+++ b/curator/patterns/hidden-post-terms-and-date.php
@@ -10,6 +10,6 @@
 <!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group">
 <!-- wp:post-date {"isLink":true} /-->
-<!-- wp:post-terms {"term":"post_tag"} /-->
+<!-- wp:post-terms {"term":"category"} /-->
 </div>
 <!-- /wp:group -->
\ No newline at end of file

From 900d744cc93f43a9e59d486436bfe7f50ca93578 Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Wed, 25 May 2022 10:56:23 -0400
Subject: [PATCH 5/7] Stack terms and date.

---
 curator/patterns/hidden-post-terms-and-date.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/curator/patterns/hidden-post-terms-and-date.php b/curator/patterns/hidden-post-terms-and-date.php
index d94d5c2407..5186049151 100644
--- a/curator/patterns/hidden-post-terms-and-date.php
+++ b/curator/patterns/hidden-post-terms-and-date.php
@@ -7,9 +7,7 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group">
-<!-- wp:post-date {"isLink":true} /-->
-<!-- wp:post-terms {"term":"category"} /-->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+<div class="wp-block-group"><!-- wp:post-terms {"term":"category"} /-->
+<!-- wp:post-date {"isLink":true,"style":{"typography":{"fontStyle":"italic","fontWeight":"400","fontSize":"14px"}}} /--></div>
+<!-- /wp:group -->

From 266f5283577401641064c6b351ffc250fc8d1271 Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Thu, 26 May 2022 09:53:52 -0400
Subject: [PATCH 6/7] Reduce gap between post terms and date to 0.

---
 curator/patterns/hidden-post-terms-and-date.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curator/patterns/hidden-post-terms-and-date.php b/curator/patterns/hidden-post-terms-and-date.php
index 5186049151..a38fd4ca14 100644
--- a/curator/patterns/hidden-post-terms-and-date.php
+++ b/curator/patterns/hidden-post-terms-and-date.php
@@ -7,7 +7,7 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group"><!-- wp:post-terms {"term":"category"} /-->
 <!-- wp:post-date {"isLink":true,"style":{"typography":{"fontStyle":"italic","fontWeight":"400","fontSize":"14px"}}} /--></div>
 <!-- /wp:group -->

From 3f3c21d6d1fcbd6d6ab50776133724e6722755d6 Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Thu, 26 May 2022 10:05:05 -0400
Subject: [PATCH 7/7] Remove text transform on the post terms.

---
 curator/theme.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/curator/theme.json b/curator/theme.json
index bbeae6f137..1ae80bf321 100644
--- a/curator/theme.json
+++ b/curator/theme.json
@@ -239,7 +239,6 @@
 						},
 						"typography": {
 							"textDecoration": "none",
-							"textTransform": "capitalize",
 							"fontWeight":"700"
 						}
 					}