made similar changes to server driver