Modified client