Client Modifications