changes to make progress with --provider=aws