Change to dynamic timeout