A3M and CI updates