Code change in J2