changed parameter types to client