Trying to clean up client's patch method.