Match client changes