changes to improve AMC module

changes to improve AMC module