added client stuff