Slight mod on webclient