More work on aws.