Move changes to template A