changes from aws, and logging