timeout changes to protect against crazy usage