changes to S3 part, bu Ritu