Merging this change, but not the S3 bucket change (Yet)