implemented some timeout-stuff