Attempt at timeout processing

Timeout API used is deprecated, must update to new API