Merged S3 stuff to v2