Checked certain senarios with amazon S3 and made changes accordingly