removed old code, changed default timeout