updated for aws