Updates to AM6 for AM7

[Jakeb203]

I don't see why it is not viable to suggest for AM7. Suggestions may not transfer to immediate producing. They can serve as references and place for discussion.