Fixing the Client, removed the member variables