Heads up: Add custom timeout, (2/2)