Changes to run on AWS