Timeout refactoring. Should work better right now