updates from aws
merging