diff --git a/03_Parameters/bucket_name.json b/03_Parameters/bucket_name.json
index 7c5f3e2..7baab78 100644
--- a/03_Parameters/bucket_name.json
+++ b/03_Parameters/bucket_name.json
@@ -1,6 +1,6 @@
 {
 	"EmailRestingPlace": {
-		"Description": "The S3 bucket name where the emails will be stored when they come through AWS SES.",
+		"Description": "The S3 bucket name where the emails will be stored when they come through AWS SES. (This bucket will be made for you)",
 		"Type": "String"
 	}
 }
diff --git a/03_Parameters/code_pipeline_bucket_name.json b/03_Parameters/code_pipeline_bucket_name.json
index a27f78a..b51c4e9 100644
--- a/03_Parameters/code_pipeline_bucket_name.json
+++ b/03_Parameters/code_pipeline_bucket_name.json
@@ -1,6 +1,6 @@
 {
 	"CodePipelineBucketName": {
-		"Description": "The S3 bucket name where CodePipeline will store the artifacts (this is needed only by CP to work, and pass task results to the next stage).",
+		"Description": "The S3 bucket name where CodePipeline will store the artifacts (this is needed only by CP to work, and pass task results to the next stage) - (This bucket needs to exist already in S3)",
 		"Type": "String"
 	}
 }
diff --git a/07_Resources/Repos/converter/CodePipeline/pipe_line.json b/07_Resources/Repos/converter/CodePipeline/_index.json
similarity index 97%
rename from 07_Resources/Repos/converter/CodePipeline/pipe_line.json
rename to 07_Resources/Repos/converter/CodePipeline/_index.json
index c8ec76d..65788c5 100644
--- a/07_Resources/Repos/converter/CodePipeline/pipe_line.json
+++ b/07_Resources/Repos/converter/CodePipeline/_index.json
@@ -25,7 +25,7 @@
 								"Owner": { "Ref": "ParamGitHubAccountName" },
 								"Repo": "0x4447-product-s3-email-lambda-converter",
 								"Branch": { "Ref": "Stage" },
-								"PollForSourceChanges": true,
+								"PollForSourceChanges": false,
 								"OAuthToken": { "Ref": "GitHubToken" }
 							},
 							"OutputArtifacts": [
diff --git a/07_Resources/Repos/converter/CodePipeline/webhook.json b/07_Resources/Repos/converter/CodePipeline/webhook.json
new file mode 100644
index 0000000..da23a81
--- /dev/null
+++ b/07_Resources/Repos/converter/CodePipeline/webhook.json
@@ -0,0 +1,21 @@
+{
+	"PipelineConverterWebhook": {
+		"Type": "AWS::CodePipeline::Webhook",
+		"Properties": {
+			"Authentication": "GITHUB_HMAC",
+			"AuthenticationConfiguration": {
+				"SecretToken": { "Ref": "GitHubToken" }
+			},
+			"Filters": [
+				{
+					"JsonPath": "$.ref",
+					"MatchEquals": "refs/heads/{Branch}"
+				}
+			],
+			"TargetPipeline": { "Ref": "PipelineConverter" },
+			"TargetAction": "Material",
+			"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineConverter", "Version" ]},
+			"RegisterWithThirdParty": true
+		}
+	}
+}
diff --git a/07_Resources/Repos/inbound/CodePipeline/pipe_line.json b/07_Resources/Repos/inbound/CodePipeline/_index.json
similarity index 97%
rename from 07_Resources/Repos/inbound/CodePipeline/pipe_line.json
rename to 07_Resources/Repos/inbound/CodePipeline/_index.json
index b609623..cbf2db6 100644
--- a/07_Resources/Repos/inbound/CodePipeline/pipe_line.json
+++ b/07_Resources/Repos/inbound/CodePipeline/_index.json
@@ -25,7 +25,7 @@
 								"Owner": { "Ref": "ParamGitHubAccountName" },
 								"Repo": "0x4447-product-s3-email-lambda-inbound",
 								"Branch": { "Ref": "Stage" },
-								"PollForSourceChanges": true,
+								"PollForSourceChanges": false,
 								"OAuthToken": { "Ref": "GitHubToken" }
 							},
 							"OutputArtifacts": [
diff --git a/07_Resources/Repos/inbound/CodePipeline/webhook.json b/07_Resources/Repos/inbound/CodePipeline/webhook.json
new file mode 100644
index 0000000..e41ffe3
--- /dev/null
+++ b/07_Resources/Repos/inbound/CodePipeline/webhook.json
@@ -0,0 +1,21 @@
+{
+	"PipelineInboundWebhook": {
+		"Type": "AWS::CodePipeline::Webhook",
+		"Properties": {
+			"Authentication": "GITHUB_HMAC",
+			"AuthenticationConfiguration": {
+				"SecretToken": { "Ref": "GitHubToken" }
+			},
+			"Filters": [
+				{
+					"JsonPath": "$.ref",
+					"MatchEquals": "refs/heads/{Branch}"
+				}
+			],
+			"TargetPipeline": { "Ref": "PipelineInbound" },
+			"TargetAction": "Material",
+			"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineInbound", "Version" ]},
+			"RegisterWithThirdParty": true
+		}
+	}
+}
diff --git a/07_Resources/Repos/outbound/CodePipeline/pipe_line.json b/07_Resources/Repos/outbound/CodePipeline/_index.json
similarity index 97%
rename from 07_Resources/Repos/outbound/CodePipeline/pipe_line.json
rename to 07_Resources/Repos/outbound/CodePipeline/_index.json
index 2ae54e4..47fffee 100644
--- a/07_Resources/Repos/outbound/CodePipeline/pipe_line.json
+++ b/07_Resources/Repos/outbound/CodePipeline/_index.json
@@ -25,7 +25,7 @@
 								"Owner": { "Ref": "ParamGitHubAccountName" },
 								"Repo": "0x4447-product-s3-email-lambda-outbound",
 								"Branch": { "Ref": "Stage" },
-								"PollForSourceChanges": true,
+								"PollForSourceChanges": false,
 								"OAuthToken": { "Ref": "GitHubToken" }
 							},
 							"OutputArtifacts": [
diff --git a/07_Resources/Repos/outbound/CodePipeline/webhook.json b/07_Resources/Repos/outbound/CodePipeline/webhook.json
new file mode 100644
index 0000000..dc298bd
--- /dev/null
+++ b/07_Resources/Repos/outbound/CodePipeline/webhook.json
@@ -0,0 +1,21 @@
+{
+	"PipelineOutboundWebhook": {
+		"Type": "AWS::CodePipeline::Webhook",
+		"Properties": {
+			"Authentication": "GITHUB_HMAC",
+			"AuthenticationConfiguration": {
+				"SecretToken": { "Ref": "GitHubToken" }
+			},
+			"Filters": [
+				{
+					"JsonPath": "$.ref",
+					"MatchEquals": "refs/heads/{Branch}"
+				}
+			],
+			"TargetPipeline": { "Ref": "PipelineOutbound" },
+			"TargetAction": "Material",
+			"TargetPipelineVersion": { "Fn::GetAtt": [ "PipelineOutbound", "Version" ]},
+			"RegisterWithThirdParty": true
+		}
+	}
+}
diff --git a/README.md b/README.md
index d73ba05..b0795c9 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ You have to add your domain and confirm that you own it. Follow these steps to d
 
 ### Enable SES Rule Sets
 
-Deployment creates SES `rule sets`. This should be enabled by default, but it doesn't always happen because of a known bug in CloudFormation. Taking the following steps will enable the rule:
+Deployment creates SES `rule sets`. This should be enabled by default on fresh AWS accounts, but on accounts where you already had some rules, this won't work. This behavior is a known bug by AWS in CloudFormation. Taking the following steps will enable the rule:
 
 1. Go to the SES Dashboard.
 1. Click `Rule Sets` on the left side menu.