Updated for test run on Amazon EC2