Final version of aws-demo