added s3
merged dev into s3