Made client changes