Edits to work on Amazon EC2!