Updated to skip S3 downloads