Revisions to ClientPeeker