Improved: Timeout can now be longer