adapt programm to new A&A