New version with updated timeout info