default values fixed
S3 reorganisation