updated anm to new structure