Last changes
Restored standard timeout