Updated plans for atdgen2