aws ready - to be tested again...