Commit 9 s3 change