revised AMI management