add logging/timeout