Changes to the generation of AMM