Re-commeted out client class