Add wang jun a2 changes