Sample client modifications