removed old client and changed client2 to client