first changes to advanced aams
final changes
Merge pull request #8 from nontas/advanced

Advanced AAMs