minor refactoring
update AMDD