Redone A2M and CiM

views