Merged update.[ch] with client.[ch]