Rewrote client section.