redesign for CL and php code updates.