Back to new code with a small fix
Remove await and augment timeout.