Some A^n code update