Adjusted for AWS