updated aws
merge