added s2 functionality to s3