Modifications from the aws machine