more client changes