Synced with linux files. Made the server timeout to 60 secs.