Remaking for AWS