updated the timeout
merged the changes