Some changes of client for new server