added client stuff...