code re-org, LCA change