Updated for aws