modify some value names & change threads in client