Changing the client section a bit.