Update/ami

merge in AMI changes