re-org or client for optimization