Changed over to use EC2