More S3 Changes