sync with AWS
synced and merged with AWS