Final commit 1 - Timeout changed