Changes for Archi x2