Modified for S3 deployment