Finished adding S3 to command line, and remove encryption restriction.