added latest client changes